Skip to content

Commit 3dd033b

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20241114.1 (#225)
[main] Update dependencies from dotnet/arcade
1 parent ee528cf commit 3dd033b

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</Dependency>
1010
</ProductDependencies>
1111
<ToolsetDependencies>
12-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24560.1">
12+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24564.1">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
14+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
1515
</Dependency>
1616
<!-- Intermediate is necessary for source build. -->
17-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24560.1">
17+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24564.1">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
19+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
2020
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2121
</Dependency>
2222
</ToolsetDependencies>

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-rc.2.24474.11"
3+
"dotnet": "9.0.100"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
7-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1"
7+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1"
88
}
99
}

0 commit comments

Comments
 (0)