Skip to content

Commit 3fe97a1

Browse files
[main] Update dependencies from dotnet/arcade (#5393)
[main] Update dependencies from dotnet/arcade
1 parent 50525f5 commit 3fe97a1

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24054.2">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24058.6">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>574b28f9639dbd60738c6662d44f47b4abf5bba1</Sha>
9+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24054.2">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24058.6">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>574b28f9639dbd60738c6662d44f47b4abf5bba1</Sha>
13+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24054.2">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24058.6">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>574b28f9639dbd60738c6662d44f47b4abf5bba1</Sha>
17+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24054.2</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24054.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24058.6</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24058.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

eng/common/cross/build-rootfs.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ while :; do
182182
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
183183
__QEMUArch=riscv64
184184
__UbuntuArch=riscv64
185-
__UbuntuRepo="http://deb.debian.org/debian-ports"
185+
__UbuntuRepo="http://deb.debian.org/debian"
186186
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
187187
unset __LLDB_Package
188188

189-
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
190-
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
189+
if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
190+
__Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
191191
fi
192192
;;
193193
ppc64le)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deb http://deb.debian.org/debian-ports sid main
1+
deb http://deb.debian.org/debian sid main

eng/common/templates/job/publish-build-assets.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ jobs:
6363

6464
steps:
6565
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
66+
- checkout: self
67+
fetchDepth: 3
68+
clean: true
69+
6670
- task: DownloadBuildArtifacts@0
6771
displayName: Download artifact
6872
inputs:

eng/common/tools.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,15 @@ function InitializeBuildTool() {
596596
ExitWithExitCode 1
597597
}
598598
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
599-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' }
599+
600+
# Use override if it exists - commonly set by source-build
601+
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
602+
$initializeBuildToolFramework="net9.0"
603+
} else {
604+
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
605+
}
606+
607+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
600608
} elseif ($msbuildEngine -eq "vs") {
601609
try {
602610
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "9.0.100-alpha.1.23615.4"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24054.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24058.6",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)