Skip to content

Commit 3a1f918

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241104.2 (#10034)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24551.1 -> To Version 10.0.0-beta.24554.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a94a3af commit 3a1f918

File tree

5 files changed

+23
-32
lines changed

5 files changed

+23
-32
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24554.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
170+
<Sha>5f327d7fb29852de22fb857d2b4a44e0cced9f41</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24551.1">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24554.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
174+
<Sha>5f327d7fb29852de22fb857d2b4a44e0cced9f41</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24551.1">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24554.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
178+
<Sha>5f327d7fb29852de22fb857d2b4a44e0cced9f41</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24551.1">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24554.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
186+
<Sha>5f327d7fb29852de22fb857d2b4a44e0cced9f41</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- Packages that come from https://github.com/dotnet/arcade -->
5252
<PropertyGroup>
5353
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
54-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24551.1</MicrosoftDotNetCodeAnalysisPackageVersion>
54+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24554.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5555
</PropertyGroup>
5656
<!-- Sourcelink -->
5757
<PropertyGroup>

‎eng/common/tools.ps1‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,7 @@ function InitializeBuildTool() {
604604
}
605605
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
606606

607-
# Use override if it exists - commonly set by source-build
608-
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
609-
$initializeBuildToolFramework="net9.0"
610-
} else {
611-
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
612-
}
613-
614-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
607+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' }
615608
} elseif ($msbuildEngine -eq "vs") {
616609
try {
617610
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -620,7 +613,7 @@ function InitializeBuildTool() {
620613
ExitWithExitCode 1
621614
}
622615

623-
$buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
616+
$buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS }
624617
} else {
625618
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
626619
ExitWithExitCode 1
@@ -779,8 +772,10 @@ function MSBuild() {
779772
# new scripts need to work with old packages, so we need to look for the old names/versions
780773
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
781774
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
782-
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
783-
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
775+
776+
# This list doesn't need to be updated anymore and can eventually be removed.
777+
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
778+
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
784779
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
785780
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
786781
)

‎eng/common/tools.sh‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,12 +339,6 @@ function InitializeBuildTool {
339339
# return values
340340
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
341341
_InitializeBuildToolCommand="msbuild"
342-
# use override if it exists - commonly set by source-build
343-
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
344-
_InitializeBuildToolFramework="net9.0"
345-
else
346-
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
347-
fi
348342
}
349343

350344
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -454,10 +448,12 @@ function MSBuild {
454448
# new scripts need to work with old packages, so we need to look for the old names/versions
455449
local selectedPath=
456450
local possiblePaths=()
457-
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
458-
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
459-
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
460-
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
451+
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" )
452+
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" )
453+
454+
# This list doesn't need to be updated anymore and can eventually be removed.
455+
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" )
456+
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" )
461457
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
462458
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
463459
for path in "${possiblePaths[@]}"; do

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24551.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24554.2",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24554.2"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-rc.2.24474.11"

0 commit comments

Comments
 (0)