[main] Update dependencies from dotnet/arcade (#14563)

* Update dependencies from https://github.com/dotnet/arcade build 20220920.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.22469.2 -> To Version 8.0.0-beta.22470.3

Dependency coherency updates

Microsoft.SourceLink.GitHub
 From Version 1.2.0-beta-22468-01 -> To Version 1.2.0-beta-22469-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20220921.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.22469.2 -> To Version 8.0.0-beta.22471.2

Dependency coherency updates

Microsoft.SourceLink.GitHub
 From Version 1.2.0-beta-22468-01 -> To Version 1.2.0-beta-22469-02 (parent: Microsoft.DotNet.Arcade.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2022-09-22 11:04:50 -04:00 committed by GitHub
parent 7a3950c465
commit 0b3e25a00a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 12 deletions

View file

@ -193,18 +193,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22469.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22471.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>066a2b54285aa1ab82418edd66201dea2dbc0a54</Sha> <Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22469.2"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22471.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>066a2b54285aa1ab82418edd66201dea2dbc0a54</Sha> <Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22469.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22471.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>066a2b54285aa1ab82418edd66201dea2dbc0a54</Sha> <Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2"> <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -219,9 +219,9 @@
<Sha>7024c140e5954ca2d27eb6dc0285b939407ddb42</Sha> <Sha>7024c140e5954ca2d27eb6dc0285b939407ddb42</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" /> <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22468-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22469-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>e2d938cd694feb0d09bae5928ffe4ea1a4dfa9f2</Sha> <Sha>25eb369a3b05519745e69e58668f5489400afff8</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" /> <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

View file

@ -26,7 +26,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22469.2</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22471.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

View file

@ -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
} }

View file

@ -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.

View file

@ -11,7 +11,7 @@
"cmake": "3.21.0" "cmake": "3.21.0"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22469.2", "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22471.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22469.2" "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22471.2"
} }
} }