Skip to content

Commit dbbacc2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#10069)
* Update dependencies from https://github.com/dotnet/arcade build 20241113.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24562.15 -> To Version 10.0.0-beta.24563.7 * Update dependencies from https://github.com/dotnet/arcade build 20241114.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24562.15 -> To Version 10.0.0-beta.24564.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 466be0c commit dbbacc2

File tree

7 files changed

+25
-19
lines changed

7 files changed

+25
-19
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24562.15">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24564.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
170+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24562.15">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24564.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
174+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24562.15">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24564.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
178+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24562.15">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24564.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
186+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24562.15</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24564.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ parameters:
1212
# The name of the job. This is included in the job ID.
1313
# targetRID: ''
1414
# The name of the target RID to use, instead of the one auto-detected by Arcade.
15-
# nonPortable: false
15+
# portableBuild: false
1616
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
17-
# linux-x64), and compiling against distro-provided packages rather than portable ones.
17+
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
18+
# default is portable mode.
1819
# skipPublishValidation: false
1920
# Disables publishing validation. By default, a check is performed to ensure no packages are
2021
# published by source-build.

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ steps:
7676
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
7777
fi
7878
79+
portableBuildArgs=
80+
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
81+
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
82+
fi
83+
7984
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8085
--configuration $buildConfig \
8186
--restore --build --pack $publishArgs -bl \
@@ -85,7 +90,7 @@ steps:
8590
$targetRidArgs \
8691
$runtimeOsArgs \
8792
$baseOsArgs \
88-
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
93+
$portableBuildArgs \
8994
/p:DotNetBuildSourceOnly=true \
9095
/p:DotNetBuildRepo=true \
9196
/p:AssetManifestFileName=$assetManifestFileName

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

384384
# If the version of msbuild is going to be xcopied,
385385
# use this version. Version matches a package here:
386-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
387-
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
386+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
387+
$defaultXCopyMSBuildVersion = '17.12.0'
388388

389389
if (!$vsRequirements) {
390390
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-rc.2.24474.11",
3+
"dotnet": "9.0.100",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24562.15"
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1"
1717
},
1818
"sdk": {
19-
"version": "9.0.100-rc.2.24474.11"
19+
"version": "9.0.100"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

0 commit comments

Comments
 (0)