Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#45137)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/arcade


 - Delete src/SourceBuild/patches/arcade/0002-allow-build-order-for-project-to-build.patch

 - Merge branch 'main' into darc-main-24e04270-16da-47cd-850c-5d1e06f3bd97
  • Loading branch information
dotnet-maestro[bot] authored Nov 26, 2024
1 parent d66dc53 commit f88eb82
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 263 deletions.
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -589,34 +589,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24572.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24575.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<Sha>2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24570.9">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24572.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24572.3</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24572.3</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24572.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24575.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24575.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24575.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24575.1</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24572.3",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24575.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24575.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down

This file was deleted.

0 comments on commit f88eb82

Please sign in to comment.