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

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

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell (.NET) <mmitche@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2024-01-18 00:54:27 +00:00 committed by GitHub
parent b9cdb4aae8
commit 4f7697a2da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 28 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -206,18 +206,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24066.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24067.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
<Sha>269a0e658ebd52b02a34072dc99277be43fe58f7</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24066.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24067.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
<Sha>269a0e658ebd52b02a34072dc99277be43fe58f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24066.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24067.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
<Sha>269a0e658ebd52b02a34072dc99277be43fe58f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -227,9 +227,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24066.3">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24067.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
<Sha>269a0e658ebd52b02a34072dc99277be43fe58f7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
<Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24066.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24067.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

3
eng/common/build.ps1
View file

@ -20,6 +20,7 @@ Param(
[switch] $publish,
[switch] $clean,
[switch] $verticalBuild,
[switch][Alias('pb')]$productBuild,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
@ -60,6 +61,7 @@ function Print-Usage() {
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 ""
Write-Host "Advanced settings:"
@ -122,6 +124,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
/p:ArcadeBuildVertical=$verticalBuild `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `

13
eng/common/build.sh
View file

@ -22,6 +22,9 @@ usage()
echo " --sourceBuild Source-build the solution (short: -sb)"
echo " Will additionally trigger the following actions: --restore, --build, --pack"
echo " If --configuration is not set explicitly, will also set it to 'Release'"
echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
echo " Will additionally trigger the following actions: --restore, --build, --pack"
echo " If --configuration is not set explicitly, will also set it to 'Release'"
echo " --rebuild Rebuild solution"
echo " --test Run all unit tests in the solution (short: -t)"
echo " --integrationTest Run all integration tests in the solution"
@ -60,6 +63,7 @@ restore=false
build=false
source_build=false
vertical_build=false
product_build=false
rebuild=false
test=false
integration_test=false
@ -127,12 +131,20 @@ while [[ $# > 0 ]]; do
-sourcebuild|-sb)
build=true
source_build=true
product_build=true
restore=true
pack=true
;;
-productBuild|-pb)
build=true
product_build=true
restore=true
pack=true
;;
-verticalbuild|-vb)
build=true
vertical_build=true
product_build=true
restore=true
pack=true
;;
@ -226,6 +238,7 @@ function Build {
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
/p:Build=$build \
/p:DotNetBuildRepo=$product_build \
/p:ArcadeBuildFromSource=$source_build \
/p:ArcadeBuildVertical=$vertical_build \
/p:Rebuild=$rebuild \

1
eng/common/templates/steps/source-build.yml
View file

@ -94,6 +94,7 @@ steps:
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
displayName: Build

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24066.3",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24066.3"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24067.4",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24067.4"
}
}

33
src/SourceBuild/patches/arcade/0001-Add-S.C.I.-and-S.R.M.-dependencies-14377.patch
View file

@ -1,33 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:07:45 -0800
Subject: [PATCH] Add S.C.I. and S.R.M. dependencies (#14377)
---
eng/Version.Details.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c968ec3d..7d3af34d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -123,9 +123,19 @@
<Sha>39aef81ec6cffa06da9964b46d4b9e3bf2fc9979</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
+ <!-- Transitive dependency needed for source build. -->
+ <Dependency Name="System.Collections.Immutable" Version="7.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+ </Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
</Dependency>
+ <!-- Transitive dependency needed for source build. -->
+ <Dependency Name="System.Reflection.Metadata" Version="7.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+ </Dependency>
</ToolsetDependencies>
</Dependencies>