Skip to content

[main] Update dependencies from dotnet/arcade #107746

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.

Sign up for GitHub

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

Merged
lewing merged 2 commits into from
Sep 13, 2024
Merged

[main] Update dependencies from dotnet/arcade #107746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
295f1e0
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 12, 2024
cda82a4
Updaet SdkVersionForWorkloadTesting manually for now
lewing Sep 12, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,87 +88,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24459.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -324,9 +324,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>df9b6509e6b3976d158e46c23d72d6acd9f0d326</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24461.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24461.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a1d1655b4d03677263fe9d5b8ec5edcb7be49044</Sha>
<Sha>40c58ff6773f488c247c3ad5067e2aae6b072b54</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24409.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
35 changes: 18 additions & 17 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.2.24459.4</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24461.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24461.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24461.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24461.3</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24461.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24461.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24461.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24461.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24461.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24461.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24461.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24461.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24461.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24461.5</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24461.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24461.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24461.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24461.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24461.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24461.5</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down Expand Up @@ -254,7 +254,8 @@
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- sdk version, for testing workloads -->
<SdkVersionForWorkloadTesting>9.0.100-rc.1.24419.1</SdkVersionForWorkloadTesting>
<!-- pin temporarily to work around sdk flow in net10 channel, must be >= global.json sdk version -->
<SdkVersionForWorkloadTesting>9.0.100-rc.1.24452.12</SdkVersionForWorkloadTesting>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/init-distro-rid.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ initDistroRidGlobal()
if [ -n "${rootfsDir}" ]; then
# We may have a cross build. Check for the existence of the rootfsDir
if [ ! -e "${rootfsDir}" ]; then
echo "Error: rootfsDir has been passed (${rootfsDir}), but the location is not valid."
echo "Error: rootfsDir has been passed, but the location is not valid."
exit 1
fi
fi
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "9.0.100-preview.7.24407.12",
"version": "9.0.100-rc.1.24452.12",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.100-preview.7.24407.12"
"dotnet": "9.0.100-rc.1.24452.12"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24461.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24461.3",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24461.3",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24461.5",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24461.5",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24461.5",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24410.5"
Expand Down