mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#19538)

Browse source
This commit is contained in:
Michael Yanni 2024-04-19 14:22:11 -07:00 committed by GitHub
commit bf738fd99f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -238,17 +238,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24217.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6eb545ab682b04dc72cf574252b7843ec657dd99</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24217.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6eb545ab682b04dc72cf574252b7843ec657dd99</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24217.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6eb545ab682b04dc72cf574252b7843ec657dd99</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24210.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -258,14 +258,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>9ec07c3673acf5602234c244d9465bca48f49969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24217.5">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6eb545ab682b04dc72cf574252b7843ec657dd99</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24217.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6eb545ab682b04dc72cf574252b7843ec657dd99</Sha>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24217.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
eng/common/build.ps1
View file

@ -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,
@ -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 ""
@ -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 `

8
eng/common/build.sh
View file

@ -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
@ -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
;;

4
global.json
View file

@ -11,8 +11,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.5",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.5",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.1",
"Microsoft.Build.NoTargets": "3.7.0"
}
}