Update dependencies from https://github.com/dotnet/arcade build 20241114.1 (#2306)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
66a62a9859
Коммит
f02d53662b
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24560.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24564.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
|
||||
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
|
||||
<SourceBuildId>6471</SourceBuildId>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
|
|
|
@ -12,9 +12,10 @@ parameters:
|
|||
# The name of the job. This is included in the job ID.
|
||||
# targetRID: ''
|
||||
# The name of the target RID to use, instead of the one auto-detected by Arcade.
|
||||
# nonPortable: false
|
||||
# portableBuild: false
|
||||
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
|
||||
# linux-x64), and compiling against distro-provided packages rather than portable ones.
|
||||
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
|
||||
# default is portable mode.
|
||||
# skipPublishValidation: false
|
||||
# Disables publishing validation. By default, a check is performed to ensure no packages are
|
||||
# published by source-build.
|
||||
|
|
|
@ -76,6 +76,11 @@ steps:
|
|||
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
|
||||
fi
|
||||
|
||||
portableBuildArgs=
|
||||
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
|
||||
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
|
||||
fi
|
||||
|
||||
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
|
||||
--configuration $buildConfig \
|
||||
--restore --build --pack $publishArgs -bl \
|
||||
|
@ -85,7 +90,7 @@ steps:
|
|||
$targetRidArgs \
|
||||
$runtimeOsArgs \
|
||||
$baseOsArgs \
|
||||
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
||||
$portableBuildArgs \
|
||||
/p:DotNetBuildSourceOnly=true \
|
||||
/p:DotNetBuildRepo=true \
|
||||
/p:AssetManifestFileName=$assetManifestFileName
|
||||
|
|
|
@ -64,7 +64,7 @@ try {
|
|||
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
||||
}
|
||||
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
|
||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
|
||||
}
|
||||
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
||||
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
||||
|
|
|
@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
|||
|
||||
# If the version of msbuild is going to be xcopied,
|
||||
# use this version. Version matches a package here:
|
||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
|
||||
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
|
||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
|
||||
$defaultXCopyMSBuildVersion = '17.12.0'
|
||||
|
||||
if (!$vsRequirements) {
|
||||
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "9.0.100-rc.2.24474.11"
|
||||
"dotnet": "9.0.100"
|
||||
},
|
||||
"sdk": {
|
||||
"version": "9.0.100-rc.2.24474.11",
|
||||
"version": "9.0.100",
|
||||
"allowPrerelease": true,
|
||||
"rollForward": "latestMajor"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче