Skip to content

Commit e21098f

Browse files
dotnet-maestro[bot]ViktorHoferJason Zhai
authored
[main] Update dependencies from dotnet/arcade (#44638)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Jason Zhai <[email protected]>
1 parent f542dd4 commit e21098f

File tree

7 files changed

+33
-67
lines changed

7 files changed

+33
-67
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -597,34 +597,34 @@
597597
</Dependency>
598598
</ProductDependencies>
599599
<ToolsetDependencies>
600-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
600+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24555.1">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
602+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24551.1">
604+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24555.1">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
606+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24551.1">
608+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24555.1">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
610+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24551.1">
612+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24555.1">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
614+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
615615
</Dependency>
616-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24551.1">
616+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24555.1">
617617
<Uri>https://github.com/dotnet/arcade</Uri>
618-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
618+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
619619
</Dependency>
620-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24551.1">
620+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24555.1">
621621
<Uri>https://github.com/dotnet/arcade</Uri>
622-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
622+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
623623
</Dependency>
624624
<!-- Intermediate is necessary for source build. -->
625-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24551.1">
625+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24555.1">
626626
<Uri>https://github.com/dotnet/arcade</Uri>
627-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
627+
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
628628
<SourceBuild RepoName="arcade" ManagedOnly="true" />
629629
</Dependency>
630630
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@
284284
</PropertyGroup>
285285
<PropertyGroup>
286286
<!-- Dependencies from https://github.com/dotnet/arcade -->
287-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24551.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
288-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24551.1</MicrosoftDotNetSignToolVersion>
289-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24551.1</MicrosoftDotNetXliffTasksVersion>
290-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24551.1</MicrosoftDotNetXUnitExtensionsVersion>
287+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24555.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
288+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24555.1</MicrosoftDotNetSignToolVersion>
289+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24555.1</MicrosoftDotNetXliffTasksVersion>
290+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24555.1</MicrosoftDotNetXUnitExtensionsVersion>
291291
</PropertyGroup>
292292
<PropertyGroup>
293293
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24551.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24555.1",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24555.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/content/repo-projects/Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@
265265
</Target>
266266

267267
<!-- TODO: Remove when all repos use a consistent set of eng/common files: https://github.com/dotnet/source-build/issues/3710. -->
268-
<Target Name="UpdateEngCommonFiles"
269-
Condition="'$(UpdateEngCommonFiles)' == 'true' or '$(DotNetBuildSourceOnly)' != 'true'">
268+
<Target Name="UpdateEngCommonFiles">
270269
<ItemGroup>
271270
<OrchestratorEngCommonFile Include="$(RepositoryEngineeringDir)common\**\*" />
272271
</ItemGroup>

‎src/SourceBuild/patches/arcade/0001-Update-workaround-for-STJ-8.0.0.4-version.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)