Skip to content

Commit e46b808

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240112.5 (#6957)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23628.1 -> To Version 9.0.0-beta.24062.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b824ed2 commit e46b808

File tree

10 files changed

+39
-22
lines changed

10 files changed

+39
-22
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23628.1">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24062.5">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
12+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23628.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24062.5">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
16+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.23628.1">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24062.5">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
20+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23628.1">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24062.5">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
24+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.23628.1">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24062.5">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
28+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23628.1">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24062.5">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
44+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>
@@ -63,9 +63,9 @@
6363
<Uri>https://github.com/dotnet/symreader-converter</Uri>
6464
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23628.1">
66+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24062.5">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
68+
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
6969
</Dependency>
7070
</ToolsetDependencies>
7171
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<DotNetRuntime80Version>8.0.0</DotNetRuntime80Version>
8282
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8383
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
84-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23628.1</MicrosoftDotNetXUnitExtensionsVersion>
84+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24062.5</MicrosoftDotNetXUnitExtensionsVersion>
8585
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8686
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8787
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

‎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/helixpublish.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
12
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
23

34
<PropertyGroup>

‎eng/common/internal/Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
22
<Project>
3+
34
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
5+
46
</Project>

‎eng/common/internal/Tools.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
22
<Project Sdk="Microsoft.NET.Sdk">
3+
34
<PropertyGroup>
45
<TargetFramework>net472</TargetFramework>
56
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
@@ -27,4 +28,5 @@
2728

2829
<!-- Repository extensibility point -->
2930
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
31+
3032
</Project>

‎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
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23628.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5",
1818
"Microsoft.Build.Traversal": "3.2.0",
1919
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
2020
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"

0 commit comments

Comments
 (0)