Update dependencies from https://github.com/dotnet/arcade build 20220923.1 (#278)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
c5b5432dae
Коммит
9ed9b51a90
|
@ -3,9 +3,9 @@
|
||||||
<ProductDependencies>
|
<ProductDependencies>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22466.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22473.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
|
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -26,6 +26,7 @@ Param(
|
||||||
[string] $runtimeSourceFeed = '',
|
[string] $runtimeSourceFeed = '',
|
||||||
[string] $runtimeSourceFeedKey = '',
|
[string] $runtimeSourceFeedKey = '',
|
||||||
[switch] $excludePrereleaseVS,
|
[switch] $excludePrereleaseVS,
|
||||||
|
[switch] $nativeToolsOnMachine,
|
||||||
[switch] $help,
|
[switch] $help,
|
||||||
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
|
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
|
||||||
)
|
)
|
||||||
|
@ -67,6 +68,7 @@ function Print-Usage() {
|
||||||
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
|
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
|
||||||
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
|
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
|
||||||
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
|
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
|
||||||
|
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|
||||||
Write-Host "Command line arguments not listed above are passed thru to msbuild."
|
Write-Host "Command line arguments not listed above are passed thru to msbuild."
|
||||||
|
@ -146,6 +148,9 @@ try {
|
||||||
$nodeReuse = $false
|
$nodeReuse = $false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($nativeToolsOnMachine) {
|
||||||
|
$env:NativeToolsOnMachine = $true
|
||||||
|
}
|
||||||
if ($restore) {
|
if ($restore) {
|
||||||
InitializeNativeTools
|
InitializeNativeTools
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ parameters:
|
||||||
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
|
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
|
||||||
defaultManagedPlatform:
|
defaultManagedPlatform:
|
||||||
name: 'Managed'
|
name: 'Managed'
|
||||||
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
|
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
|
||||||
|
|
||||||
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
|
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
|
||||||
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
|
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
|
||||||
|
|
|
@ -68,6 +68,11 @@ steps:
|
||||||
publishArgs='--publish'
|
publishArgs='--publish'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
assetManifestFileName=SourceBuild_RidSpecific.xml
|
||||||
|
if [ '${{ parameters.platform.name }}' != '' ]; then
|
||||||
|
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
|
||||||
|
fi
|
||||||
|
|
||||||
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
|
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
|
||||||
--configuration $buildConfig \
|
--configuration $buildConfig \
|
||||||
--restore --build --pack $publishArgs -bl \
|
--restore --build --pack $publishArgs -bl \
|
||||||
|
@ -76,7 +81,8 @@ steps:
|
||||||
$internalRestoreArgs \
|
$internalRestoreArgs \
|
||||||
$targetRidArgs \
|
$targetRidArgs \
|
||||||
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
||||||
/p:ArcadeBuildFromSource=true
|
/p:ArcadeBuildFromSource=true \
|
||||||
|
/p:AssetManifestFileName=$assetManifestFileName
|
||||||
displayName: Build
|
displayName: Build
|
||||||
|
|
||||||
# Upload build logs for diagnosis.
|
# Upload build logs for diagnosis.
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "7.0.100-preview.7.22377.5"
|
"dotnet": "7.0.100-rc.1.22431.12"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22466.3"
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче