Skip to content

Commit 0b0c6c4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4096)
* Update dependencies from https://github.com/dotnet/arcade build 20251127.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25571.1 -> To Version 8.0.0-beta.25577.1 * Update dependencies from https://github.com/dotnet/arcade build 20251205.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25571.1 -> To Version 8.0.0-beta.25605.4 * Update dependencies from https://github.com/dotnet/arcade build 20251211.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25571.1 -> To Version 8.0.0-beta.25611.2 * Update dependencies from https://github.com/dotnet/arcade build 20260217.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25571.1 -> To Version 8.0.0-beta.26117.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 27d379f commit 0b0c6c4

19 files changed

Lines changed: 41 additions & 34 deletions

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25571.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26117.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>be61e5dbdc68d586c5a479486c2342f0f4161c38</Sha>
8+
<Sha>53f3357c00780a514a5b7b69e6f58880b3ada28e</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎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://raw.githubusercontent.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-azurelinux-3
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

‎eng/common/templates-official/post-build/setup-maestro-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
$apiHeaders.Add('Accept', 'application/json')
3838
$apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
3939
40-
$buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
40+
$buildInfo = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
4141
4242
$BarId = $Env:BARBuildId
4343
$Channels = $Env:PromoteToMaestroChannels -split ","

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
# in the default public locations.
4848
internalRuntimeDownloadArgs=
4949
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
50-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
50+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
5151
fi
5252
5353
buildConfig=Release

0 commit comments

Comments
 (0)