Skip to content

Commit 1a4acf7

Browse files
radicaljoperezr
andauthored
[release/13.1] Add installer publishing updates for 13.1.3 (#15158)
* Update dotnet/arcade to 10.0.0-beta.26160.1 * Add 13.1.3 installer publishing changes * Add back change to eng/common/build.sh to support maui Source of the original change: ``` commit c3d88e2 Author: Jose Perez Rodriguez <joperezr@microsoft.com> Date: Tue Feb 24 09:34:40 2026 -0800 Revert "Fix port mismatch for bait-and-switch resources in Kubernetes publish…" (#14649) This reverts commit 63ff050. ``` --------- Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
1 parent 895a2f0 commit 1a4acf7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3242
-477
lines changed

NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-fad253f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-fad253f5/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-dotnet-fad253f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-fad253f5/nuget/v3/index.json" />
97
<!-- End: Package sources from dotnet-dotnet -->
108
<!-- Begin: Package sources from dotnet-aspnetcore -->
119
<!-- End: Package sources from dotnet-aspnetcore -->
1210
<!-- Begin: Package sources from dotnet-efcore -->
1311
<!-- End: Package sources from dotnet-efcore -->
1412
<!-- Begin: Package sources from dotnet-extensions -->
15-
<add key="darc-pub-dotnet-extensions-9e8d935" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-9e8d935c/nuget/v3/index.json" />
1613
<!-- End: Package sources from dotnet-extensions -->
1714
<!-- Begin: Package sources from dotnet-runtime -->
1815
<!-- End: Package sources from dotnet-runtime -->
@@ -50,7 +47,6 @@
5047
<disabledPackageSources>
5148
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
5249
<!-- Begin: Package sources from dotnet-dotnet -->
53-
<add key="darc-int-dotnet-dotnet-fad253f" value="true" />
5450
<!-- End: Package sources from dotnet-dotnet -->
5551
<!-- Begin: Package sources from dotnet-aspnetcore -->
5652
<!-- End: Package sources from dotnet-aspnetcore -->

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,33 +183,33 @@
183183
</Dependency>
184184
</ProductDependencies>
185185
<ToolsetDependencies>
186-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
186+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26160.1">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
188+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25509.1">
190+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.26160.1">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
192+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25509.1">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26160.1">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
196+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25509.1">
198+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26160.1">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
200+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25509.1">
202+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26160.1">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
204+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25509.1">
206+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26160.1">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
208+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25509.1">
210+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26160.1">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
212+
<Sha>8b0ca8dba65be0853690ce98ae8f950a25ff8421</Sha>
213213
</Dependency>
214214
</ToolsetDependencies>
215215
</Dependencies>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- This repo version -->
44
<MajorVersion>13</MajorVersion>
55
<MinorVersion>1</MinorVersion>
6-
<PatchVersion>2</PatchVersion>
6+
<PatchVersion>3</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
88
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
99
<DefaultTargetFramework>net8.0</DefaultTargetFramework>
@@ -37,9 +37,9 @@
3737
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.20.7</MicrosoftDeveloperControlPlanewindowsamd64Version>
3838
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.20.7</MicrosoftDeveloperControlPlanewindowsarm64Version>
3939
<!-- Other -->
40-
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25509.1</MicrosoftDotNetRemoteExecutorVersion>
41-
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25509.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42-
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25509.1</MicrosoftDotNetBuildTasksArchivesVersion>
40+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.26160.1</MicrosoftDotNetRemoteExecutorVersion>
41+
<MicrosoftDotNetXUnitV3ExtensionsVersion>10.0.0-beta.26160.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.26160.1</MicrosoftDotNetBuildTasksArchivesVersion>
4343
<MicrosoftExtensionsFileSystemGlobbingVersion>10.0.1</MicrosoftExtensionsFileSystemGlobbingVersion>
4444
<!-- dotnet/extensions -->
4545
<MicrosoftExtensionsAIVersion>10.1.0</MicrosoftExtensionsAIVersion>

eng/common/SetupNugetSources.ps1

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3-
# disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
45
#
56
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
67
#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
173174
}
174175
}
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179+
if ($dotnetEngSource -ne $null) {
180+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181+
}
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185+
if ($dotnetToolsSource -ne $null) {
186+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187+
}
188+
176189
$doc.Save($filename)

eng/common/SetupNugetSources.sh

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5-
# disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
67
#
78
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
89
#
@@ -66,10 +67,8 @@ EnableInternalPackageSource() {
6667
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6768
if [ "$?" == "0" ]; then
6869
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
70+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
71+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7372

7473
# Add the source name to PackageSources for credential handling
7574
PackageSources+=("$PackageSourceName")
@@ -175,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
175174
fi
176175
done
177176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179+
if [ "$?" == "0" ]; then
180+
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181+
fi
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185+
if [ "$?" == "0" ]; then
186+
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187+
fi
188+
178189
# I want things split line by line
179190
PrevIFS=$IFS
180191
IFS=$'\n'

eng/common/build.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Param(
3030
[string] $runtimeSourceFeedKey = '',
3131
[switch] $excludePrereleaseVS,
3232
[switch] $nativeToolsOnMachine,
33-
[switch] $restoreMaui,
3433
[switch] $help,
3534
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3635
)
@@ -77,7 +76,6 @@ function Print-Usage() {
7776
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
7877
Write-Host " -buildCheck Sets /check msbuild parameter"
7978
Write-Host " -fromVMR Set when building from within the VMR"
80-
Write-Host " -restoreMaui Restore the MAUI workload after restore (only on Windows/macOS)"
8179
Write-Host ""
8280

8381
Write-Host "Command line arguments not listed above are passed thru to msbuild."

eng/common/build.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ usage()
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
4545
echo " --buildCheck <value> Sets /check msbuild parameter"
4646
echo " --fromVMR Set when building from within the VMR"
47-
echo " --restoreMaui Restore the MAUI workload after restore (only on macOS)"
4847
echo ""
4948
echo "Command line arguments not listed above are passed thru to msbuild."
5049
echo "Arguments can also be passed in with a single hyphen."
@@ -77,7 +76,6 @@ sign=false
7776
public=false
7877
ci=false
7978
clean=false
80-
restore_maui=false
8179

8280
warn_as_error=true
8381
node_reuse=true
@@ -94,7 +92,7 @@ runtime_source_feed=''
9492
runtime_source_feed_key=''
9593

9694
properties=()
97-
while [[ $# -gt 0 ]]; do
95+
while [[ $# > 0 ]]; do
9896
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9997
case "$opt" in
10098
-help|-h)
@@ -185,9 +183,6 @@ while [[ $# -gt 0 ]]; do
185183
-buildcheck)
186184
build_check=true
187185
;;
188-
-restoremaui|-restore-maui)
189-
restore_maui=true
190-
;;
191186
-runtimesourcefeed)
192187
runtime_source_feed=$2
193188
shift

eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22-
enablePreviewMicrobuild: false
23-
microbuildPluginVersion: 'latest'
2422
enableMicrobuildForMacAndLinux: false
2523
microbuildUseESRP: true
2624
enablePublishBuildArtifacts: false
@@ -130,8 +128,6 @@ jobs:
130128
- template: /eng/common/core-templates/steps/install-microbuild.yml
131129
parameters:
132130
enableMicrobuild: ${{ parameters.enableMicrobuild }}
133-
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
134-
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
135131
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
136132
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
137133
continueOnError: ${{ parameters.continueOnError }}
@@ -157,8 +153,6 @@ jobs:
157153
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
158154
parameters:
159155
enableMicrobuild: ${{ parameters.enableMicrobuild }}
160-
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
161-
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
162156
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
163157
continueOnError: ${{ parameters.continueOnError }}
164158

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -120,6 +120,14 @@ jobs:
120120

121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
128+
129+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
130+
123131
- task: AzureCLI@2
124132
displayName: Publish Build Assets
125133
inputs:
@@ -132,6 +140,9 @@ jobs:
132140
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133141
/p:MaestroApiEndpoint=https://maestro.dot.net
134142
/p:OfficialBuildId=$(OfficialBuildId)
143+
-runtimeSourceFeed https://ci.dot.net/internal
144+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
145+
135146
condition: ${{ parameters.condition }}
136147
continueOnError: ${{ parameters.continueOnError }}
137148

eng/common/core-templates/job/source-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-mariner-2
66+
image: build.azurelinux.3.amd64
6767
os: linux
6868
${{ else }}:
6969
pool:
7070
${{ if eq(variables['System.TeamProject'], 'public') }}:
7171
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
72-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
72+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
7373
${{ if eq(variables['System.TeamProject'], 'internal') }}:
7474
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
75-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
75+
demands: ImageOverride -equals build.azurelinux.3.amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

0 commit comments

Comments
 (0)