diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bdc86fad7..8fdfb58f6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -160,7 +160,7 @@ stages:
XUnitPublishTargetFramework: net6.0
IncludeDotNetCli: true
DotNetCliPackageType: sdk
- DotNetCliVersion: 6.0.100-preview.2.21155.3
+ DotNetCliVersion: 6.0.100-preview.3.21202.5
EnableXUnitReporter: true
WaitForWorkItemCompletion: true
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1cc3b8b0e..547ec3f17 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,13 +3,13 @@
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 67737ae294375c867bea72de19a66149785881e5
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 67737ae294375c867bea72de19a66149785881e5
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 44e797700..8900fa5ae 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.100-preview.2.21155.3",
+ "dotnet": "6.0.100-preview.3.21202.5",
"runtimes": {
"dotnet": [
"2.1.11"
@@ -12,7 +12,7 @@
"cmake-test": "3.11.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21227.11",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21227.11"
}
}