Update dependencies from https://github.com/dotnet/arcade build 20210112.10 (#9414)
[master] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21055-03 to 1.1.0-beta-21061-02 (parent: Microsoft.DotNet.Arcade.Sdk) - XliffTasks: from 1.0.0-beta.20631.1 to 1.0.0-beta.21059.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
984447e0b6
commit
3e392d143b
5 changed files with 23 additions and 11 deletions
|
@ -144,25 +144,25 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21058.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21062.10">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1571d6b095014ad63fdb48b10f5dea912f96872e</Sha>
|
<Sha>ff8fec9066eca51a26abf723dd7d92e20926a90e</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21058.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21062.10">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1571d6b095014ad63fdb48b10f5dea912f96872e</Sha>
|
<Sha>ff8fec9066eca51a26abf723dd7d92e20926a90e</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>
|
||||||
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
|
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21055-03" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21061-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>5935ccd670197b059b98d299e5537ad1f10adecb</Sha>
|
<Sha>ccdb7ce5e41f26ad4d09c2813fee2eeee0a60480</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.20631.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="XliffTasks" Version="1.0.0-beta.21059.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>c71b2197c16684cea8b0372b0eff7f22b320786b</Sha>
|
<Sha>b173a3876e42de2d91cd2b99f0a101a8fed4ca68</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.21058.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21062.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -3,6 +3,7 @@ parameters:
|
||||||
sourceIndexPackageVersion: 1.0.0-beta5
|
sourceIndexPackageVersion: 1.0.0-beta5
|
||||||
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
|
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
|
||||||
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
|
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
|
||||||
|
preSteps: []
|
||||||
binlogPath: artifacts/log/Debug/Build.binlog
|
binlogPath: artifacts/log/Debug/Build.binlog
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: vs2017-win2016
|
||||||
|
@ -21,12 +22,20 @@ jobs:
|
||||||
|
|
||||||
pool: ${{ parameters.pool }}
|
pool: ${{ parameters.pool }}
|
||||||
steps:
|
steps:
|
||||||
|
- ${{ each preStep in parameters.preSteps }}:
|
||||||
|
- ${{ preStep }}
|
||||||
|
|
||||||
- task: UseDotNet@2
|
- task: UseDotNet@2
|
||||||
displayName: Use .NET Core sdk 3.1
|
displayName: Use .NET Core sdk 3.1
|
||||||
inputs:
|
inputs:
|
||||||
packageType: sdk
|
packageType: sdk
|
||||||
version: 3.1.x
|
version: 3.1.x
|
||||||
|
|
||||||
|
- task: UseDotNet@2
|
||||||
|
displayName: Use .NET Core sdk
|
||||||
|
inputs:
|
||||||
|
useGlobalJson: true
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
|
dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
|
||||||
dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
|
dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
|
||||||
|
@ -38,9 +47,12 @@ jobs:
|
||||||
|
|
||||||
- script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
|
- script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
|
||||||
displayName: Process Binlog into indexable sln
|
displayName: Process Binlog into indexable sln
|
||||||
|
env:
|
||||||
|
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
|
||||||
|
|
||||||
- ${{ 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')) }}:
|
||||||
- script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
|
- script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
|
||||||
displayName: Upload stage1 artifacts to source index
|
displayName: Upload stage1 artifacts to source index
|
||||||
env:
|
env:
|
||||||
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
|
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
|
||||||
|
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
|
||||||
|
|
|
@ -224,7 +224,7 @@ stages:
|
||||||
- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
|
- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
|
||||||
- stage: publish_using_darc
|
- stage: publish_using_darc
|
||||||
${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
|
${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
|
||||||
dependsOn: Validate
|
dependsOn: ${{ parameters.publishDependsOn }}
|
||||||
${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
|
${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
|
||||||
dependsOn: ${{ parameters.validateDependsOn }}
|
dependsOn: ${{ parameters.validateDependsOn }}
|
||||||
displayName: Publish using Darc
|
displayName: Publish using Darc
|
||||||
|
|
|
@ -8,6 +8,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21058.3"
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21062.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue