Skip to content

Commit 031a7b5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240108.6 (#8662)
[main] Update dependencies from dotnet/arcade
1 parent e4e05b6 commit 031a7b5

File tree

7 files changed

+28
-16
lines changed

7 files changed

+28
-16
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24055.2">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24058.6">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
162+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24055.2">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24058.6">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
166+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24055.2">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24058.6">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
170+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
171171
</Dependency>
172172
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174174
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24055.2">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24058.6">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
178+
<Sha>05493e05d4bbf262f1be1bd517ac95f5bff3a2ef</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
5151
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24055.2</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24058.6</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<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)

‎eng/common/cross/riscv64/sources.list.sid

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: 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": "9.0.0-beta.24055.2",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24055.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24058.6",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24058.6"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-alpha.1.23615.4"

0 commit comments

Comments
 (0)