Skip to content

Commit 9b2749d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#58863)
[main] Update dependencies from dotnet/arcade - Fix path to MicrosoftDotNetBuildTasksInstallersTaskAssembly
1 parent da8ea1e commit 9b2749d

File tree

7 files changed

+35
-44
lines changed

7 files changed

+35
-44
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,31 +384,31 @@
384384
<Uri>https://github.com/dotnet/runtime</Uri>
385385
<Sha>a9ca41321284c0d1e423bfc240e9c9f8be970b8b</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24560.1">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
389+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24551.1">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24560.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
394+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24551.1">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24560.1">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
399+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24551.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24560.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
403+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24551.1">
405+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24560.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
407+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24551.1">
409+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24560.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
411+
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
412412
</Dependency>
413413
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24560.1">
414414
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24551.1</MicrosoftDotNetBuildTasksInstallersVersion>
169-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24551.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24551.1</MicrosoftDotNetRemoteExecutorVersion>
171-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24551.1</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24560.1</MicrosoftDotNetBuildTasksInstallersVersion>
169+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24560.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24560.1</MicrosoftDotNetRemoteExecutorVersion>
171+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24560.1</MicrosoftSourceBuildIntermediatearcadeVersion>
172172
<!-- Packages from dotnet/source-build-externals -->
173173
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24554.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
174174
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/native/install-dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ case "$os" in
2424
apt update
2525

2626
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
27-
libssl-dev libkrb5-dev zlib1g-dev pigz
27+
libssl-dev libkrb5-dev zlib1g-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
3030
elif [ "$ID" = "fedora" ]; then
31-
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
3232
elif [ "$ID" = "alpine" ]; then
33-
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
33+
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

‎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
@@ -27,7 +27,7 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24551.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24560.1"
3232
}
3333
}

‎src/Installers/Windows/Wix.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
</ItemGroup>
3636

3737
<PropertyGroup>
38-
<MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
39-
<MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
38+
<MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
39+
<MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netframework\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
4040
</PropertyGroup>
4141

4242
<UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />

0 commit comments

Comments
 (0)