Skip to content

Commit ec0a0f2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20251211.2 (#37375)
[release/8.0] Update dependencies from dotnet/arcade
1 parent 06fd951 commit ec0a0f2

File tree

13 files changed

+24
-26
lines changed

13 files changed

+24
-26
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-a2266c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a2266c72/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
109
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +18,6 @@
1918
<clear />
2019
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2120
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-a2266c7" value="true" />
2321
<!-- End: Package sources from dotnet-runtime -->
2422
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2523
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@
6060
</Dependency>
6161
</ProductDependencies>
6262
<ToolsetDependencies>
63-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25611.2">
6464
<Uri>https://github.com/dotnet/arcade</Uri>
65-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
65+
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25562.3">
67+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25611.2">
6868
<Uri>https://github.com/dotnet/arcade</Uri>
69-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
69+
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25562.3">
71+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25611.2">
7272
<Uri>https://github.com/dotnet/arcade</Uri>
73-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
73+
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
7474
</Dependency>
7575
</ToolsetDependencies>
7676
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.22-servicing.25527.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25562.3</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25611.2</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

‎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/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: 1es-azurelinux-3
6565
os: linux
6666

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

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

Lines changed: 1 addition & 1 deletion
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

‎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)