Skip to content

Commit 528f673

Browse files
dotnet-maestro[bot]jeffhandleylewing
authored
[release/8.0-staging] Update dependencies from dotnet/arcade (#122396)
This pull request updates the following dependencies [marker]: <> (Begin:f3ed209d-980c-4076-a437-08dbcfd61a5a) ## From https://github.com/dotnet/arcade - **Subscription**: [f3ed209d-980c-4076-a437-08dbcfd61a5a](https://maestro.dot.net/subscriptions?search=f3ed209d-980c-4076-a437-08dbcfd61a5a) - **Build**: [20251211.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2858916) ([294298](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/294298)) - **Date Produced**: December 11, 2025 11:57:29 AM UTC - **Commit**: [4b01306353c43c151d713d152f48a4d523c41960](dotnet/arcade@4b01306) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [8.0.0-beta.25562.3 to 8.0.0-beta.25611.2][2] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Archives - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.Build.Tasks.Installers - Microsoft.DotNet.Build.Tasks.Packaging - Microsoft.DotNet.Build.Tasks.TargetFramework - Microsoft.DotNet.Build.Tasks.Templating - Microsoft.DotNet.Build.Tasks.Workloads - Microsoft.DotNet.CodeAnalysis - Microsoft.DotNet.GenAPI - Microsoft.DotNet.GenFacades - Microsoft.DotNet.Helix.Sdk - Microsoft.DotNet.PackageTesting - Microsoft.DotNet.RemoteExecutor - Microsoft.DotNet.SharedFramework.Sdk - Microsoft.DotNet.VersionTools.Tasks - Microsoft.DotNet.XUnitExtensions - From [2.5.1-beta.25562.3 to 2.5.1-beta.25611.2][2] - Microsoft.DotNet.XUnitConsoleRunner [2]: dotnet/arcade@e8483fe...4b01306 [DependencyUpdate]: <> (End) [marker]: <> (End:f3ed209d-980c-4076-a437-08dbcfd61a5a) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com> Co-authored-by: Larry Ewing <lewing@microsoft.com>
1 parent f200da3 commit 528f673

20 files changed

Lines changed: 106 additions & 91 deletions

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26112.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
116+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25562.3">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.26112.1">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
126+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25562.3">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.26112.1">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
130+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25562.3">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.26112.1">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
134+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25562.3">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.26112.1">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
138+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25562.3">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.26112.1">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
142+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25562.3">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.26112.1">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
146+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25562.3">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.26112.1">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
150+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25562.3">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.26112.1">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
154+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25562.3">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.26112.1">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
158+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25562.3">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.26112.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
162+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25562.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.26112.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
166+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25562.3">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.26112.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
170+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25562.3">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.26112.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
174+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25562.3">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.26112.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
178+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25562.3">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.26112.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
182+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25562.3">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.26112.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
186+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25625.3">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>402df9c4f5abe6ee8519181dfb5481e04099fab0</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25562.3">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.26112.1">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
339+
<Sha>9751be9e9065b01a745e1b9e26bfe46ac55d5f82</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2020
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionIteration)' == ''">-$(PreReleaseVersionLabel)</WorkloadVersionSuffix>
2121
<WorkloadVersionSuffix Condition="'$(WorkloadVersionSuffix)' == '' and '$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
22-
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
2322
<!-- set to false for release branches -->
2423
<WorkloadsTestPreviousVersions Condition="'$(WorkloadsTestPreviousVersions)' == ''">false</WorkloadsTestPreviousVersions>
2524
<!-- Set assembly version to align with major and minor version,
@@ -89,21 +88,21 @@
8988
<!-- SDK dependencies -->
9089
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
9190
<!-- Arcade dependencies -->
92-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksFeedVersion>
93-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25562.3</MicrosoftDotNetCodeAnalysisVersion>
94-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25562.3</MicrosoftDotNetGenAPIVersion>
95-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25562.3</MicrosoftDotNetGenFacadesVersion>
96-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25562.3</MicrosoftDotNetXUnitExtensionsVersion>
97-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25562.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
98-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksArchivesVersion>
99-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksInstallersVersion>
100-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksPackagingVersion>
101-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
102-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksTemplatingVersion>
103-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
104-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25562.3</MicrosoftDotNetRemoteExecutorVersion>
105-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25562.3</MicrosoftDotNetVersionToolsTasksVersion>
106-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25562.3</MicrosoftDotNetPackageTestingVersion>
91+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksFeedVersion>
92+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.26112.1</MicrosoftDotNetCodeAnalysisVersion>
93+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.26112.1</MicrosoftDotNetGenAPIVersion>
94+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.26112.1</MicrosoftDotNetGenFacadesVersion>
95+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.26112.1</MicrosoftDotNetXUnitExtensionsVersion>
96+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.26112.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
97+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksArchivesVersion>
98+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksInstallersVersion>
99+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksPackagingVersion>
100+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
101+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksTemplatingVersion>
102+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
103+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.26112.1</MicrosoftDotNetRemoteExecutorVersion>
104+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.26112.1</MicrosoftDotNetVersionToolsTasksVersion>
105+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.26112.1</MicrosoftDotNetPackageTestingVersion>
107106
<!-- NuGet dependencies -->
108107
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
109108
<!-- Installer dependencies -->
@@ -256,6 +255,18 @@
256255
-->
257256
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.25</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
258257
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
258+
<!-- SdkVersionForWorkloadTesting is used to compute the sdk band and version for workload testing.
259+
The published manifests are built in dotnet/sdk so these values are for testing purposes only.
260+
We use $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) unless it is lower
261+
than the sdk version specified in global.json
262+
-->
263+
<!-- NETCoreSdkVersion is normally set by the SDK, but for non-SDK projects we need extract from global.json -->
264+
<_GlobalJsonContent>$([System.IO.File]::ReadAllText('$([MSBuild]::GetPathOfFileAbove('global.json', '$(MSBuildThisFileDirectory)'))'))</_GlobalJsonContent>
265+
<_GlobalJsonSdkVersion Condition="'$(_GlobalJsonContent)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(_GlobalJsonContent), '"sdk"\s*:\s*\{[^\}]*"version"\s*:\s*"([^"]+)"', System.Text.RegularExpressions.RegexOptions.Singleline).Groups[1].Value)</_GlobalJsonSdkVersion>
266+
<_DotnetSdkVersion>$(MicrosoftDotNetApiCompatTaskVersion)</_DotnetSdkVersion>
267+
<SdkVersionForWorkloadTesting Condition="$([System.String]::Compare('$(_GlobalJsonSdkVersion)', '$(_DotnetSdkVersion)')) &lt;= 0">$(_DotnetSdkVersion)</SdkVersionForWorkloadTesting>
268+
<SdkVersionForWorkloadTesting Condition="'$(SdkVersionForWorkloadTesting)' == ''">$(_GlobalJsonSdkVersion)</SdkVersionForWorkloadTesting>
269+
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
259270
<!-- workloads -->
260271
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
261272
<!-- JIT Tools -->
@@ -270,9 +281,6 @@
270281
<!-- BrowserDebugProxy libs -->
271282
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
272283
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
273-
<!-- installer version, for testing workloads must be greater than or equal to global.json sdk version -->
274-
<MicrosoftDotnetSdkInternalVersion>8.0.122</MicrosoftDotnetSdkInternalVersion>
275-
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
276284
</PropertyGroup>
277285
<PropertyGroup>
278286
<!--

‎eng/common/internal-feed-operations.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetupCredProvider {
2626
$url = 'https://github.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
2727

2828
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
29-
Invoke-WebRequest $url -OutFile installcredprovider.ps1
29+
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
3030

3131
Write-Host 'Installing plugin...'
3232
.\installcredprovider.ps1 -Force

‎eng/common/post-build/nuget-verification.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
6565
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
6666
$ProgressPreference = 'SilentlyContinue'
6767
try {
68-
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
68+
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
6969
$ProgressPreference = 'Continue'
7070
} catch {
7171
$ProgressPreference = 'Continue'

‎eng/common/post-build/post-build-utils.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Get-MaestroChannel([int]$ChannelId) {
2626
$apiHeaders = Create-MaestroApiRequestHeaders
2727
$apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion"
2828

29-
$result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
29+
$result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
3030
return $result
3131
}
3232

@@ -36,7 +36,7 @@ function Get-MaestroBuild([int]$BuildId) {
3636
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
3737
$apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion"
3838

39-
$result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
39+
$result = try { return Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
4040
return $result
4141
}
4242

@@ -47,7 +47,7 @@ function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) {
4747
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
4848
$apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion"
4949

50-
$result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
50+
$result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
5151
return $result
5252
}
5353

@@ -56,15 +56,15 @@ function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) {
5656

5757
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
5858
$apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion"
59-
Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null
59+
Invoke-WebRequest -UseBasicParsing -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null
6060
}
6161

6262
function Trigger-Subscription([string]$SubscriptionId) {
6363
Validate-MaestroVars
6464

6565
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
6666
$apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion"
67-
Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null
67+
Invoke-WebRequest -UseBasicParsing -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null
6868
}
6969

7070
function Validate-MaestroVars {

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
# If it's not devdiv, it's dnceng
7171
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
7272
name: NetCore1ESPool-Publishing-Internal
73-
image: windows.vs2019.amd64
73+
image: windows.vs2022.amd64
7474
os: windows
7575
steps:
7676
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎eng/common/templates-official/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161

6262
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6363
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')]
64-
image: 1es-mariner-2
64+
image: build.azurelinux.3.amd64
6565
os: linux
6666

6767
${{ if ne(parameters.platform.pool, '') }}:

‎eng/common/templates-official/job/source-index-stage1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []
88
binlogPath: artifacts/log/Debug/Build.binlog
9-
condition: ''
9+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
1010
dependsOn: ''
1111
pool: ''
1212

@@ -31,7 +31,7 @@ jobs:
3131
pool:
3232
${{ if eq(variables['System.TeamProject'], 'public') }}:
3333
name: $(DncEngPublicBuildPool)
34-
demands: ImageOverride -equals windows.vs2019.amd64.open
34+
demands: ImageOverride -equals windows.vs2022.amd64.open
3535
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
name: $(DncEngInternalBuildPool)
3737
image: windows.vs2022.amd64

‎eng/common/templates-official/post-build/post-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ stages:
261261
# If it's not devdiv, it's dnceng
262262
${{ else }}:
263263
name: NetCore1ESPool-Publishing-Internal
264-
image: windows.vs2019.amd64
264+
image: windows.vs2022.amd64
265265
os: windows
266266
steps:
267267
- template: setup-maestro-vars.yml

0 commit comments

Comments
 (0)