Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #101842

Merged
merged 1 commit into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24229.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24229.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ff14b0c0b6d72bf4447d57758a40dbf9494f1ac0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24227.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24229.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24229.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24229.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24229.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24229.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24229.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24229.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24229.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24229.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24253.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24253.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24253.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24253.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24253.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24253.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24253.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24253.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24253.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/init-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if [ -z "$CLR_CC" ]; then
if [ -z "$majorVersion" ]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
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"
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
elif [ "$compiler" = "gcc" ]; then versions="14 13 12 11 10 9 8 7 6 5 4.9"; fi

for version in $versions; do
_major="${version%%.*}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ steps:
${{ if parameters.args.artifactName }}:
artifactName: ${{ parameters.args.artifactName }}
${{ if parameters.args.properties }}:
properties: ${{ properties.args.properties }}
properties: ${{ parameters.args.properties }}
2 changes: 1 addition & 1 deletion eng/common/templates/steps/publish-pipeline-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ steps:
${{ if parameters.args.parallelCount }}:
parallelCount: ${{ parameters.args.parallelCount }}
${{ if parameters.args.properties }}:
properties: ${{ properties.args.properties }}
properties: ${{ parameters.args.properties }}
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.100-preview.3.24204.13"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24229.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24229.1",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24253.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24253.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24253.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24229.1"
Expand Down
Loading