Skip to content

Commit bda4229

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#58934)
[main] Update dependencies from dotnet/arcade
1 parent eb68e01 commit bda4229

File tree

7 files changed

+30
-24
lines changed

7 files changed

+30
-24
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,31 +384,31 @@
384384
<Uri>https://github.com/dotnet/runtime</Uri>
385385
<Sha>a9ca41321284c0d1e423bfc240e9c9f8be970b8b</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24562.15">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24564.1">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
389+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24562.15">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24564.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
394+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24562.15">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24564.1">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
399+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24562.15">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24564.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
403+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24562.15">
405+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24564.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
407+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24562.15">
409+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24564.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
411+
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
412412
</Dependency>
413413
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24560.1">
414414
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24562.15</MicrosoftDotNetBuildTasksInstallersVersion>
169-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24562.15</MicrosoftDotNetBuildTasksTemplatingVersion>
170-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24562.15</MicrosoftDotNetRemoteExecutorVersion>
171-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24562.15</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24564.1</MicrosoftDotNetBuildTasksInstallersVersion>
169+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24564.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24564.1</MicrosoftDotNetRemoteExecutorVersion>
171+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24564.1</MicrosoftSourceBuildIntermediatearcadeVersion>
172172
<!-- Packages from dotnet/source-build-externals -->
173173
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24554.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
174174
<!-- Packages from dotnet/source-build-reference-packages -->

‎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
@@ -27,7 +27,7 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24562.15"
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1"
3232
}
3333
}

0 commit comments

Comments
 (0)