Skip to content

Commit 16f752c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#105866)
* Update dependencies from https://github.com/dotnet/arcade build 20240801.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24379.1 -> To Version 9.0.0-beta.24401.1 * Update dependencies from https://github.com/dotnet/arcade build 20240801.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24379.1 -> To Version 9.0.0-beta.24401.1 * Update dependencies from https://github.com/dotnet/arcade build 20240801.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24379.1 -> To Version 9.0.0-beta.24401.1 * Update dependencies from https://github.com/dotnet/arcade build 20240801.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24379.1 -> To Version 9.0.0-beta.24401.1 * Update dependencies from https://github.com/dotnet/arcade build 20240805.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24401.1 -> To Version 9.0.0-beta.24405.1 * Update dependencies from https://github.com/dotnet/arcade build 20240808.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24405.1 -> To Version 9.0.0-beta.24408.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a0c783d commit 16f752c

File tree

4 files changed

+81
-97
lines changed

4 files changed

+81
-97
lines changed

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -88,87 +88,87 @@
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24379.1">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24408.1">
9292
<Uri>https://github.com/dotnet/arcade</Uri>
93-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
93+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
9494
</Dependency>
9595
<!-- Intermediate is necessary for source build. -->
96-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24379.1">
96+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24408.1">
9797
<Uri>https://github.com/dotnet/arcade</Uri>
98-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
98+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
9999
<SourceBuild RepoName="arcade" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24379.1">
101+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24408.1">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
103+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24379.1">
105+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24408.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
107+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24379.1">
109+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24408.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
111+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24379.1">
113+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24408.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
115+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24379.1">
117+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24408.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
119+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24379.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24408.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
123+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24379.1">
125+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24408.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
127+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24379.1">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24408.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
131+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24379.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24408.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
135+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24379.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24408.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
139+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24379.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24408.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
143+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24379.1">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24408.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
147+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24379.1">
149+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24408.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
151+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24379.1">
153+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24408.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
155+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24379.1">
157+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24408.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
159+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24379.1">
161+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24408.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
163+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24379.1">
165+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24408.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
167+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24379.1">
169+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24408.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
171+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
172172
</Dependency>
173173
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24379.1">
174174
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -328,9 +328,9 @@
328328
<Uri>https://github.com/dotnet/xharness</Uri>
329329
<Sha>9794254fa909ff5adc46326e9b54009793f61dcd</Sha>
330330
</Dependency>
331-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24379.1">
331+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24408.1">
332332
<Uri>https://github.com/dotnet/arcade</Uri>
333-
<Sha>4f5a4ad88d27b56ceeaa43ced670999c33bd2598</Sha>
333+
<Sha>610e251fc34686333b98188320ca1eecd7e6af6c</Sha>
334334
</Dependency>
335335
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24376.4">
336336
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@
8383
<!-- SDK dependencies (also used in wasm build tests -->
8484
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-rc.1.24378.3</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24379.1</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24379.1</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24379.1</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24379.1</MicrosoftDotNetXUnitAssertVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24379.1</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24379.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24379.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24379.1</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24379.1</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24379.1</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24408.1</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24408.1</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24408.1</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24408.1</MicrosoftDotNetXUnitAssertVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24408.1</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24408.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24408.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24408.1</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24408.1</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24408.1</MicrosoftDotNetPackageTestingVersion>
102102
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
103103
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
104104
<!-- NuGet dependencies -->

‎eng/common/native/init-compiler.sh

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ case "$compiler" in
1919
# clangx.y or clang-x.y
2020
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
2121
majorVersion="${version%%.*}"
22-
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
2322

24-
if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then
25-
minorVersion=0;
26-
fi
23+
# LLVM based on v18 released in early 2024, with two releases per year
24+
maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))"
2725
compiler=clang
2826
;;
2927

3028
gcc*|-gcc*|--gcc*)
3129
# gccx.y or gcc-x.y
3230
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
3331
majorVersion="${version%%.*}"
34-
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
32+
33+
# GCC based on v14 released in early 2024, with one release per year
34+
maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))"
3535
compiler=gcc
3636
;;
3737
esac
@@ -49,12 +49,10 @@ check_version_exists() {
4949
desired_version=-1
5050

5151
# Set up the environment to be used for building with the desired compiler.
52-
if command -v "$compiler-$1.$2" > /dev/null; then
53-
desired_version="-$1.$2"
54-
elif command -v "$compiler$1$2" > /dev/null; then
55-
desired_version="$1$2"
56-
elif command -v "$compiler-$1$2" > /dev/null; then
57-
desired_version="-$1$2"
52+
if command -v "$compiler-$1" > /dev/null; then
53+
desired_version="-$1"
54+
elif command -v "$compiler$1" > /dev/null; then
55+
desired_version="$1"
5856
fi
5957

6058
echo "$desired_version"
@@ -75,7 +73,7 @@ set_compiler_version_from_CC() {
7573
fi
7674

7775
# gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
78-
IFS=. read -r majorVersion minorVersion _ <<EOF
76+
IFS=. read -r majorVersion _ <<EOF
7977
$version
8078
EOF
8179
}
@@ -84,43 +82,29 @@ if [ -z "$CLR_CC" ]; then
8482

8583
# Set default versions
8684
if [ -z "$majorVersion" ]; then
87-
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
88-
if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
89-
elif [ "$compiler" = "gcc" ]; then versions="14 13 12 11 10 9 8 7 6 5 4.9"; fi
90-
91-
for version in $versions; do
92-
_major="${version%%.*}"
93-
[ -z "${version##*.*}" ] && _minor="${version#*.}"
94-
desired_version="$(check_version_exists "$_major" "$_minor")"
95-
if [ "$desired_version" != "-1" ]; then majorVersion="$_major"; break; fi
85+
minVersion=8
86+
maxVersion="$((maxVersion + 1))" # +1 for headspace
87+
i="$maxVersion"
88+
while [ "$i" -ge $minVersion ]; do
89+
desired_version="$(check_version_exists "$i")"
90+
if [ "$desired_version" != "-1" ]; then majorVersion="$i"; break; fi
91+
i=$((i - 1))
9692
done
9793

9894
if [ -z "$majorVersion" ]; then
9995
if ! command -v "$compiler" > /dev/null; then
100-
echo "Error: No usable version of $compiler found."
96+
echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables."
10197
exit 1
10298
fi
10399

104100
CC="$(command -v "$compiler" 2> /dev/null)"
105101
CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
106102
set_compiler_version_from_CC
107-
else
108-
if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
109-
# If a major version was provided explicitly, and it was too old, find a newer compiler instead
110-
if ! command -v "$compiler" > /dev/null; then
111-
echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
112-
exit 1
113-
fi
114-
115-
CC="$(command -v "$compiler" 2> /dev/null)"
116-
CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
117-
set_compiler_version_from_CC
118-
fi
119103
fi
120104
else
121-
desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
105+
desired_version="$(check_version_exists "$majorVersion")"
122106
if [ "$desired_version" = "-1" ]; then
123-
echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
107+
echo "Error: Could not find specific version of $compiler: $majorVersion."
124108
exit 1
125109
fi
126110
fi

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "9.0.100-preview.6.24328.19"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24379.1",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24379.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24379.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.1",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24408.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24378.5"

0 commit comments

Comments
 (0)