Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (dotnet#101234)
Browse files Browse the repository at this point in the history 
* Update dependencies from https://github.com/dotnet/arcade build 20240417.5

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.24217.1 -> To Version 9.0.0-beta.24217.5

* Update dependencies from https://github.com/dotnet/arcade build 20240419.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.24217.1 -> To Version 9.0.0-beta.24219.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro @matouskozak
2 people authored and matouskozak committed Apr 30, 2024
1 parent 9c11992 commit 1befbb8
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 72 deletions.
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
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.24217.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24217.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24217.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24215.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>50b43ece7daf9f8a88ac16a95a4f8647a4c71c4b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24217.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24106.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.4.24215.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24217.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24217.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24217.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24217.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24217.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24217.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24217.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24217.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24217.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24219.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24219.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24219.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24219.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24219.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24219.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24219.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24219.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24219.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
4 changes: 1 addition & 3 deletions eng/common/build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Param(
[switch] $pack,
[switch] $publish,
[switch] $clean,
[switch] $verticalBuild,
[switch][Alias('pb')]$productBuild,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
Expand Down Expand Up @@ -60,7 +59,6 @@ function Print-Usage() {
Write-Host " -sign Sign build outputs"
Write-Host " -publish Publish artifacts (e.g. symbols)"
Write-Host " -clean Clean the solution"
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
Write-Host ""

Expand Down Expand Up @@ -124,7 +122,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
/p:DotNetBuildRepo=$productBuild `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `
Expand Down
8 changes: 0 additions & 8 deletions eng/common/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
restore=false
build=false
source_build=false
vertical_build=false
product_build=false
rebuild=false
test=false
Expand Down Expand Up @@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do
restore=true
pack=true
;;
-verticalbuild|-vb)
build=true
vertical_build=true
product_build=true
restore=true
pack=true
;;
-test|-t)
test=true
;;
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
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.24217.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24217.1",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24219.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24215.1"
Expand Down

0 comments on commit 1befbb8

Please sign in to comment.