Skip to content

Commit eedc644

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20251211.4 (#7155)
On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 9.0.0-beta.25608.5 -> To Version 9.0.0-beta.25611.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 35b0c86 commit eedc644

File tree

6 files changed

+24
-17
lines changed

6 files changed

+24
-17
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,17 @@
206206
</Dependency>
207207
</ProductDependencies>
208208
<ToolsetDependencies>
209-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25608.5">
209+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25611.4">
210210
<Uri>https://github.com/dotnet/arcade</Uri>
211-
<Sha>92e45d251889042fd956e18b28d489020298d864</Sha>
211+
<Sha>e9983e548f5b9638784f3b2696eb6cb3e7366548</Sha>
212212
</Dependency>
213-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25608.5">
213+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25611.4">
214214
<Uri>https://github.com/dotnet/arcade</Uri>
215-
<Sha>92e45d251889042fd956e18b28d489020298d864</Sha>
215+
<Sha>e9983e548f5b9638784f3b2696eb6cb3e7366548</Sha>
216216
</Dependency>
217-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25608.5">
217+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25611.4">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>92e45d251889042fd956e18b28d489020298d864</Sha>
219+
<Sha>e9983e548f5b9638784f3b2696eb6cb3e7366548</Sha>
220220
</Dependency>
221221
</ToolsetDependencies>
222222
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<!-- Dependencies from https://github.com/dotnet/efcore -->
8787
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.11</MicrosoftEntityFrameworkCoreSqliteVersion>
8888
<!-- Dependencies from https://github.com/dotnet/arcade -->
89-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25608.5</MicrosoftDotNetBuildTasksTemplatingVersion>
89+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25611.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9090
</PropertyGroup>
9191
<PropertyGroup Label="net10">
9292
<!-- Packages from dotnet/runtime -->

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/tools.ps1

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
266266

267267
Retry({
268268
Write-Host "GET $uri"
269-
Invoke-WebRequest $uri -OutFile $installScript
269+
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
270270
})
271271
}
272272

@@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
499499
Write-Host "Downloading $packageName $packageVersion"
500500
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
501501
Retry({
502-
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
502+
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
503503
})
504504

505505
if (!(Test-Path $packagePath)) {
@@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){
543543
Create-Directory $vsWhereDir
544544
Write-Host 'Downloading vswhere'
545545
Retry({
546-
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
546+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
547547
})
548548
}
549549

550-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
550+
if (!$vsRequirements) {
551+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
552+
$vsRequirements = $GlobalJson.tools.vs
553+
} else {
554+
$vsRequirements = $null
555+
}
556+
}
557+
551558
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
552559

553560
if (!$excludePrereleaseVS) {
554561
$args += '-prerelease'
555562
}
556563

557-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
564+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
558565
$args += '-version'
559566
$args += $vsRequirements.version
560567
}
561568

562-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
569+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
563570
foreach ($component in $vsRequirements.components) {
564571
$args += '-requires'
565572
$args += $component

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"msbuild-sdks": {
2121
"Microsoft.Build.NoTargets": "3.7.0",
2222
"Microsoft.Build.Traversal": "3.2.0",
23-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5",
24-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5"
23+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25611.4",
24+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25611.4"
2525
}
2626
}

0 commit comments

Comments
 (0)