Skip to content

Commit 068b070

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240206.2 (#371)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24102.4 -> To Version 9.0.0-beta.24106.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5b9be3d commit 068b070

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
</Dependency>
1010
</ProductDependencies>
1111
<ToolsetDependencies>
12-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
12+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24106.2">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
14+
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
16+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24106.2">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
18+
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
1919
</Dependency>
2020
<!-- Intermediate is necessary for source build. -->
21-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24102.4">
21+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24106.2">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
23+
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
2424
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2525
</Dependency>
2626
</ToolsetDependencies>

eng/common/native/init-os-and-arch.sh

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ fi
3535
case "$CPUName" in
3636
arm64|aarch64)
3737
arch=arm64
38+
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
39+
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
40+
arch=arm
41+
fi
3842
;;
3943

4044
loongarch64)

eng/common/tools.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
379379

380380
# If the version of msbuild is going to be xcopied,
381381
# use this version. Version matches a package here:
382-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5
382+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.8.5
383383
$defaultXCopyMSBuildVersion = '17.8.5'
384384

385385
if (!$vsRequirements) {
@@ -445,7 +445,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
445445
if ($xcopyMSBuildVersion.Trim() -ine "none") {
446446
$vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install
447447
if ($vsInstallDir -eq $null) {
448-
throw "Could not xcopy msbuild. Please check that package 'RoslynTools.MSBuild @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'."
448+
throw "Could not xcopy msbuild. Please check that package 'Microsoft.DotNet.Arcade.MSBuild.Xcopy @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'."
449449
}
450450
}
451451
if ($vsInstallDir -eq $null) {
@@ -482,7 +482,7 @@ function InstallXCopyMSBuild([string]$packageVersion) {
482482
}
483483

484484
function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
485-
$packageName = 'RoslynTools.MSBuild'
485+
$packageName = 'Microsoft.DotNet.Arcade.MSBuild.Xcopy'
486486
$packageDir = Join-Path $ToolsDir "msbuild\$packageVersion"
487487
$packagePath = Join-Path $packageDir "$packageName.$packageVersion.nupkg"
488488

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
}
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4"
19+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24106.2"
2020
}
2121
}

0 commit comments

Comments
 (0)