Skip to content

Commit c23d7c3

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240118.1 (#8701)
[main] Update dependencies from dotnet/arcade
1 parent a826eec commit c23d7c3

File tree

6 files changed

+28
-11
lines changed

6 files changed

+28
-11
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24066.3">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24068.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
162+
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24066.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24068.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
166+
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24066.3">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24068.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
170+
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
171171
</Dependency>
172172
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174174
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24066.3">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24068.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
178+
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
5151
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24066.3</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24068.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>

eng/common/build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Param(
2020
[switch] $publish,
2121
[switch] $clean,
2222
[switch] $verticalBuild,
23+
[switch][Alias('pb')]$productBuild,
2324
[switch][Alias('bl')]$binaryLog,
2425
[switch][Alias('nobl')]$excludeCIBinarylog,
2526
[switch] $ci,
@@ -60,6 +61,7 @@ function Print-Usage() {
6061
Write-Host " -publish Publish artifacts (e.g. symbols)"
6162
Write-Host " -clean Clean the solution"
6263
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
64+
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6365
Write-Host ""
6466

6567
Write-Host "Advanced settings:"
@@ -122,6 +124,7 @@ function Build {
122124
/p:Deploy=$deploy `
123125
/p:Test=$test `
124126
/p:Pack=$pack `
127+
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
125128
/p:ArcadeBuildVertical=$verticalBuild `
126129
/p:IntegrationTest=$integrationTest `
127130
/p:PerformanceTest=$performanceTest `

eng/common/build.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ usage()
2222
echo " --sourceBuild Source-build the solution (short: -sb)"
2323
echo " Will additionally trigger the following actions: --restore, --build, --pack"
2424
echo " If --configuration is not set explicitly, will also set it to 'Release'"
25+
echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
26+
echo " Will additionally trigger the following actions: --restore, --build, --pack"
27+
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2528
echo " --rebuild Rebuild solution"
2629
echo " --test Run all unit tests in the solution (short: -t)"
2730
echo " --integrationTest Run all integration tests in the solution"
@@ -60,6 +63,7 @@ restore=false
6063
build=false
6164
source_build=false
6265
vertical_build=false
66+
product_build=false
6367
rebuild=false
6468
test=false
6569
integration_test=false
@@ -127,12 +131,20 @@ while [[ $# > 0 ]]; do
127131
-sourcebuild|-sb)
128132
build=true
129133
source_build=true
134+
product_build=true
135+
restore=true
136+
pack=true
137+
;;
138+
-productBuild|-pb)
139+
build=true
140+
product_build=true
130141
restore=true
131142
pack=true
132143
;;
133144
-verticalbuild|-vb)
134145
build=true
135146
vertical_build=true
147+
product_build=true
136148
restore=true
137149
pack=true
138150
;;
@@ -226,6 +238,7 @@ function Build {
226238
/p:RepoRoot="$repo_root" \
227239
/p:Restore=$restore \
228240
/p:Build=$build \
241+
/p:DotNetBuildRepo=$product_build \
229242
/p:ArcadeBuildFromSource=$source_build \
230243
/p:ArcadeBuildVertical=$vertical_build \
231244
/p:Rebuild=$rebuild \

eng/common/templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ steps:
9494
$baseOsArgs \
9595
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
9696
/p:ArcadeBuildFromSource=true \
97+
/p:DotNetBuildRepo=true \
9798
/p:AssetManifestFileName=$assetManifestFileName
9899
displayName: Build
99100

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24066.3",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24066.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24068.1",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24068.1"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-alpha.1.23615.4"

0 commit comments

Comments
 (0)