[main] Update dependencies from dotnet/arcade (#16503)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
parent
fcb7e475f8
commit
766d1fe6dc
7 changed files with 27 additions and 17 deletions
|
@ -193,18 +193,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23269.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23274.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>792c346a52b2388152c2fad6f626b88ed8736d6f</Sha>
|
<Sha>ab7df8826d2978b5660d75b33059e25666f4def3</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23269.2">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23274.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>792c346a52b2388152c2fad6f626b88ed8736d6f</Sha>
|
<Sha>ab7df8826d2978b5660d75b33059e25666f4def3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23269.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23274.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>792c346a52b2388152c2fad6f626b88ed8736d6f</Sha>
|
<Sha>ab7df8826d2978b5660d75b33059e25666f4def3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23269.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23274.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -64,7 +64,7 @@ try {
|
||||||
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
||||||
}
|
}
|
||||||
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
||||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
|
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
|
||||||
}
|
}
|
||||||
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
||||||
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
||||||
|
|
|
@ -75,6 +75,10 @@ jobs:
|
||||||
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
|
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
|
||||||
- name: EnableRichCodeNavigation
|
- name: EnableRichCodeNavigation
|
||||||
value: 'true'
|
value: 'true'
|
||||||
|
# Retry signature validation up to three times, waiting 2 seconds between attempts.
|
||||||
|
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
|
||||||
|
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
|
||||||
|
value: 3,2000
|
||||||
- ${{ each variable in parameters.variables }}:
|
- ${{ each variable in parameters.variables }}:
|
||||||
# handle name-value variable syntax
|
# handle name-value variable syntax
|
||||||
# example:
|
# example:
|
||||||
|
@ -83,7 +87,7 @@ jobs:
|
||||||
- ${{ if ne(variable.name, '') }}:
|
- ${{ if ne(variable.name, '') }}:
|
||||||
- name: ${{ variable.name }}
|
- name: ${{ variable.name }}
|
||||||
value: ${{ variable.value }}
|
value: ${{ variable.value }}
|
||||||
|
|
||||||
# handle variable groups
|
# handle variable groups
|
||||||
- ${{ if ne(variable.group, '') }}:
|
- ${{ if ne(variable.group, '') }}:
|
||||||
- group: ${{ variable.group }}
|
- group: ${{ variable.group }}
|
||||||
|
@ -169,7 +173,7 @@ jobs:
|
||||||
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
|
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
|
||||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
- task: MicroBuildCleanup@1
|
- task: MicroBuildCleanup@1
|
||||||
displayName: Execute Microbuild cleanup tasks
|
displayName: Execute Microbuild cleanup tasks
|
||||||
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
|
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
|
||||||
continueOnError: ${{ parameters.continueOnError }}
|
continueOnError: ${{ parameters.continueOnError }}
|
||||||
env:
|
env:
|
||||||
|
@ -219,7 +223,7 @@ jobs:
|
||||||
displayName: Publish XUnit Test Results
|
displayName: Publish XUnit Test Results
|
||||||
inputs:
|
inputs:
|
||||||
testResultsFormat: 'xUnit'
|
testResultsFormat: 'xUnit'
|
||||||
testResultsFiles: '*.xml'
|
testResultsFiles: '*.xml'
|
||||||
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
|
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
|
||||||
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
|
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
|
||||||
mergeTestResults: ${{ parameters.mergeTestResults }}
|
mergeTestResults: ${{ parameters.mergeTestResults }}
|
||||||
|
@ -230,7 +234,7 @@ jobs:
|
||||||
displayName: Publish TRX Test Results
|
displayName: Publish TRX Test Results
|
||||||
inputs:
|
inputs:
|
||||||
testResultsFormat: 'VSTest'
|
testResultsFormat: 'VSTest'
|
||||||
testResultsFiles: '*.trx'
|
testResultsFiles: '*.trx'
|
||||||
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
|
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
|
||||||
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
|
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
|
||||||
mergeTestResults: ${{ parameters.mergeTestResults }}
|
mergeTestResults: ${{ parameters.mergeTestResults }}
|
||||||
|
|
|
@ -68,6 +68,11 @@ steps:
|
||||||
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
|
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
baseOsArgs=
|
||||||
|
if [ '${{ parameters.platform.baseOS }}' != '' ]; then
|
||||||
|
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
|
||||||
|
fi
|
||||||
|
|
||||||
publishArgs=
|
publishArgs=
|
||||||
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
|
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
|
||||||
publishArgs='--publish'
|
publishArgs='--publish'
|
||||||
|
@ -86,6 +91,7 @@ steps:
|
||||||
$internalRestoreArgs \
|
$internalRestoreArgs \
|
||||||
$targetRidArgs \
|
$targetRidArgs \
|
||||||
$runtimeOsArgs \
|
$runtimeOsArgs \
|
||||||
|
$baseOsArgs \
|
||||||
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
||||||
/p:ArcadeBuildFromSource=true \
|
/p:ArcadeBuildFromSource=true \
|
||||||
/p:AssetManifestFileName=$assetManifestFileName
|
/p:AssetManifestFileName=$assetManifestFileName
|
||||||
|
|
|
@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
||||||
|
|
||||||
# If the version of msbuild is going to be xcopied,
|
# If the version of msbuild is going to be xcopied,
|
||||||
# use this version. Version matches a package here:
|
# use this version. Version matches a package here:
|
||||||
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
|
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
|
||||||
$defaultXCopyMSBuildVersion = '17.4.1'
|
$defaultXCopyMSBuildVersion = '17.6.0-2'
|
||||||
|
|
||||||
if (!$vsRequirements) {
|
if (!$vsRequirements) {
|
||||||
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "8.0.100-preview.3.23178.7",
|
"dotnet": "8.0.100-preview.4.23260.5",
|
||||||
"runtimes": {
|
"runtimes": {
|
||||||
"dotnet": [
|
"dotnet": [
|
||||||
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
|
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23269.2",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23274.6",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23269.2"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23274.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue