Update dependencies from https://github.com/dotnet/arcade build 20210524.6 (#10760)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21265.1 to 1.0.0-beta.21272.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
8b9be7e9d3
commit
6f05884ce0
7 changed files with 29 additions and 9 deletions
|
@ -136,14 +136,14 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21271.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21274.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
|
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21271.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21274.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
|
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
@ -153,9 +153,9 @@
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
|
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.21265.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="XliffTasks" Version="1.0.0-beta.21272.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>f4bfde77fb60daf52d8fec738d96d1d54e37dd88</Sha>
|
<Sha>f5321d0c7b3f5e6103440fc017253bcdb50a0a26</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21274.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -15,6 +15,9 @@ parameters:
|
||||||
# nonPortable: false
|
# nonPortable: false
|
||||||
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
|
# 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.
|
||||||
|
# skipPublishValidation: false
|
||||||
|
# Disables publishing validation. By default, a check is performed to ensure no packages are
|
||||||
|
# published by source-build.
|
||||||
# container: ''
|
# container: ''
|
||||||
# A container to use. Runs in docker.
|
# A container to use. Runs in docker.
|
||||||
# pool: {}
|
# pool: {}
|
||||||
|
|
|
@ -40,6 +40,9 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
|
||||||
|
displayName: Warn about v2 Arcade Publishing Usage
|
||||||
|
|
||||||
# This is necessary whenever we want to publish/restore to an AzDO private feed
|
# This is necessary whenever we want to publish/restore to an AzDO private feed
|
||||||
- task: NuGetAuthenticate@0
|
- task: NuGetAuthenticate@0
|
||||||
displayName: 'Authenticate to AzDO Feeds'
|
displayName: 'Authenticate to AzDO Feeds'
|
||||||
|
@ -110,6 +113,9 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
|
||||||
|
displayName: Warn about v2 Arcade Publishing Usage
|
||||||
|
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
|
|
|
@ -42,6 +42,9 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
|
||||||
|
displayName: Warn about v2 Arcade Publishing Usage
|
||||||
|
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
|
@ -109,6 +112,9 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
|
||||||
|
displayName: Warn about v2 Arcade Publishing Usage
|
||||||
|
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
|
|
|
@ -34,9 +34,14 @@ steps:
|
||||||
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
|
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
publishArgs=
|
||||||
|
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
|
||||||
|
publishArgs='--publish'
|
||||||
|
fi
|
||||||
|
|
||||||
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
|
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
|
||||||
--configuration $buildConfig \
|
--configuration $buildConfig \
|
||||||
--restore --build --pack --publish -bl \
|
--restore --build --pack $publishArgs -bl \
|
||||||
$officialBuildArgs \
|
$officialBuildArgs \
|
||||||
$targetRidArgs \
|
$targetRidArgs \
|
||||||
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3",
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
|
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue