Update dependencies from https://github.com/dotnet/arcade build 20210118.2 (#9489)
[master] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21059.1 to 1.0.0-beta.21064.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
c379bea673
commit
a27a134848
7 changed files with 33 additions and 27 deletions
|
@ -148,13 +148,13 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21062.10">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21068.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>ff8fec9066eca51a26abf723dd7d92e20926a90e</Sha>
|
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21062.10">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21068.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>ff8fec9066eca51a26abf723dd7d92e20926a90e</Sha>
|
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</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>
|
||||||
|
@ -164,9 +164,9 @@
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>ccdb7ce5e41f26ad4d09c2813fee2eeee0a60480</Sha>
|
<Sha>ccdb7ce5e41f26ad4d09c2813fee2eeee0a60480</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.21059.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="XliffTasks" Version="1.0.0-beta.21064.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>b173a3876e42de2d91cd2b99f0a101a8fed4ca68</Sha>
|
<Sha>e8d6fb33f7e38e49b6e9d76abf6a14131ead29bc</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.21062.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21068.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -16,8 +16,8 @@ param(
|
||||||
|
|
||||||
try {
|
try {
|
||||||
. $PSScriptRoot\post-build-utils.ps1
|
. $PSScriptRoot\post-build-utils.ps1
|
||||||
# Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel
|
|
||||||
$darc = Get-Darc "1.1.0-beta.20418.1"
|
$darc = Get-Darc
|
||||||
|
|
||||||
$optionalParams = [System.Collections.ArrayList]::new()
|
$optionalParams = [System.Collections.ArrayList]::new()
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,11 @@ parameters:
|
||||||
# container and pool.
|
# container and pool.
|
||||||
platform: {}
|
platform: {}
|
||||||
|
|
||||||
|
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
|
||||||
|
# source-build builds run in Docker, including the default managed platform.
|
||||||
|
defaultContainerHostPool:
|
||||||
|
vmImage: ubuntu-20.04
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
|
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
|
||||||
displayName: Source-Build (${{ parameters.platform.name }})
|
displayName: Source-Build (${{ parameters.platform.name }})
|
||||||
|
@ -37,6 +42,9 @@ jobs:
|
||||||
|
|
||||||
${{ if ne(parameters.platform.container, '') }}:
|
${{ if ne(parameters.platform.container, '') }}:
|
||||||
container: ${{ parameters.platform.container }}
|
container: ${{ parameters.platform.container }}
|
||||||
|
|
||||||
|
${{ if eq(parameters.platform.pool, '') }}:
|
||||||
|
pool: ${{ parameters.defaultContainerHostPool }}
|
||||||
${{ if ne(parameters.platform.pool, '') }}:
|
${{ if ne(parameters.platform.pool, '') }}:
|
||||||
pool: ${{ parameters.platform.pool }}
|
pool: ${{ parameters.platform.pool }}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,14 @@ parameters:
|
||||||
|
|
||||||
# Optional: Enable publishing using release pipelines
|
# Optional: Enable publishing using release pipelines
|
||||||
enablePublishUsingPipelines: false
|
enablePublishUsingPipelines: false
|
||||||
|
|
||||||
|
# Optional: Enable running the source-build jobs to build repo from source
|
||||||
|
enableSourceBuild: false
|
||||||
|
|
||||||
|
# Optional: Parameters for source-build template.
|
||||||
|
# See /eng/common/templates/jobs/source-build.yml for options
|
||||||
|
sourceBuildParameters: []
|
||||||
|
|
||||||
graphFileGeneration:
|
graphFileGeneration:
|
||||||
# Optional: Enable generating the graph files at the end of the build
|
# Optional: Enable generating the graph files at the end of the build
|
||||||
enabled: false
|
enabled: false
|
||||||
|
@ -24,13 +31,6 @@ parameters:
|
||||||
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
|
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
|
||||||
runAsPublic: false
|
runAsPublic: false
|
||||||
|
|
||||||
# Optional: Enable running the source-build jobs to build repo from source
|
|
||||||
runSourceBuild: false
|
|
||||||
|
|
||||||
# Optional: Parameters for source-build template.
|
|
||||||
# See /eng/common/templates/jobs/source-build.yml for options
|
|
||||||
sourceBuildParameters: []
|
|
||||||
|
|
||||||
enableSourceIndex: false
|
enableSourceIndex: false
|
||||||
sourceIndexParams: {}
|
sourceIndexParams: {}
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ jobs:
|
||||||
|
|
||||||
name: ${{ job.job }}
|
name: ${{ job.job }}
|
||||||
|
|
||||||
- ${{ if eq(parameters.runSourceBuild, true) }}:
|
- ${{ if eq(parameters.enableSourceBuild, true) }}:
|
||||||
- template: /eng/common/templates/jobs/source-build.yml
|
- template: /eng/common/templates/jobs/source-build.yml
|
||||||
parameters:
|
parameters:
|
||||||
allCompletedJobId: Source_Build_Complete
|
allCompletedJobId: Source_Build_Complete
|
||||||
|
@ -80,7 +80,7 @@ jobs:
|
||||||
- ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
|
- ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
|
||||||
- ${{ each job in parameters.jobs }}:
|
- ${{ each job in parameters.jobs }}:
|
||||||
- ${{ job.job }}
|
- ${{ job.job }}
|
||||||
- ${{ if eq(parameters.runSourceBuild, true) }}:
|
- ${{ if eq(parameters.enableSourceBuild, true) }}:
|
||||||
- Source_Build_Complete
|
- Source_Build_Complete
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: vs2017-win2016
|
||||||
|
|
|
@ -11,16 +11,14 @@ parameters:
|
||||||
# See /eng/common/templates/job/source-build.yml
|
# See /eng/common/templates/job/source-build.yml
|
||||||
jobNamePrefix: 'Source_Build'
|
jobNamePrefix: 'Source_Build'
|
||||||
|
|
||||||
# If changed to true, causes this template to include the default platform for a managed-only
|
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
|
||||||
# repo. The exact Docker image used for this build will be provided by Arcade. This has some risk,
|
|
||||||
# but since the repo is supposed to be managed-only, the risk should be very low.
|
|
||||||
includeDefaultManagedPlatform: false
|
|
||||||
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-7-3e800f1-20190501005343'
|
||||||
|
|
||||||
# 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'.
|
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
|
||||||
|
# one job runs on 'defaultManagedPlatform'.
|
||||||
platforms: []
|
platforms: []
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -32,7 +30,7 @@ jobs:
|
||||||
dependsOn:
|
dependsOn:
|
||||||
- ${{ each platform in parameters.platforms }}:
|
- ${{ each platform in parameters.platforms }}:
|
||||||
- ${{ parameters.jobNamePrefix }}_${{ platform.name }}
|
- ${{ parameters.jobNamePrefix }}_${{ platform.name }}
|
||||||
- ${{ if eq(parameters.includeDefaultManagedPlatform, true) }}:
|
- ${{ if eq(length(parameters.platforms), 0) }}:
|
||||||
- ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}
|
- ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}
|
||||||
|
|
||||||
- ${{ each platform in parameters.platforms }}:
|
- ${{ each platform in parameters.platforms }}:
|
||||||
|
@ -41,7 +39,7 @@ jobs:
|
||||||
jobNamePrefix: ${{ parameters.jobNamePrefix }}
|
jobNamePrefix: ${{ parameters.jobNamePrefix }}
|
||||||
platform: ${{ platform }}
|
platform: ${{ platform }}
|
||||||
|
|
||||||
- ${{ if eq(parameters.includeDefaultManagedPlatform, true) }}:
|
- ${{ if eq(length(parameters.platforms), 0) }}:
|
||||||
- template: /eng/common/templates/job/source-build.yml
|
- template: /eng/common/templates/job/source-build.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobNamePrefix: ${{ parameters.jobNamePrefix }}
|
jobNamePrefix: ${{ parameters.jobNamePrefix }}
|
||||||
|
|
|
@ -8,6 +8,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21062.10"
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21068.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue