From e5e13246465018945e92dfd32ad3c80757fec80f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 12:43:02 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210428.3 (#804)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 4 ++--
eng/common/templates/job/onelocbuild.yml | 8 +++++---
global.json | 6 +++---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3d7cf8277..d8ec37c47 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ e1044f09e18638a98a9f0448086a7295f3d16834
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index d2b271ec1..b27d6faf3 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -17,6 +17,7 @@ parameters:
LclSource: lclFilesInRepo
LclPackageId: ''
RepoType: gitHub
+ condition: ''
jobs:
- job: OneLocBuild
@@ -44,6 +45,7 @@ jobs:
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
arguments: $(_GenerateLocProjectArguments)
displayName: Generate LocProject.json
+ condition: ${{ parameters.condition }}
- task: OneLocBuild@2
displayName: OneLocBuild
@@ -62,7 +64,7 @@ jobs:
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}"
- condition: always()
+ condition: ${{ parameters.condition }}
- task: PublishBuildArtifacts@1
displayName: Publish Localization Files
@@ -70,7 +72,7 @@ jobs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
PublishLocation: Container
ArtifactName: Loc
- condition: always()
+ condition: ${{ parameters.condition }}
- task: PublishBuildArtifacts@1
displayName: Publish LocProject.json
@@ -78,4 +80,4 @@ jobs:
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
PublishLocation: Container
ArtifactName: Loc
- condition: always()
\ No newline at end of file
+ condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/global.json b/global.json
index ea6efb805..31e7ed350 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "6.0.100-preview.2.21155.3",
+ "version": "6.0.100-preview.3.21202.5",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.100-preview.2.21155.3",
+ "dotnet": "6.0.100-preview.3.21202.5",
"runtimes": {
"dotnet": [
"3.1.0"
@@ -17,6 +17,6 @@
"xcopy-msbuild": "16.8.0-preview2.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3"
}
}