diff --git a/NuGet.config b/NuGet.config
index 228058c58a7..59cc6e76c2e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,6 @@
-
@@ -19,7 +18,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 94748846b6e..dc106f52ef2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 100394106fe203c112ab72bcc1576fb3753f7910
+ bd9b4590681e602535ed414e98a17e6ba121dca4
-
+
https://github.com/dotnet/arcade
- 100394106fe203c112ab72bcc1576fb3753f7910
+ bd9b4590681e602535ed414e98a17e6ba121dca4
-
+
https://github.com/dotnet/arcade
- 100394106fe203c112ab72bcc1576fb3753f7910
+ bd9b4590681e602535ed414e98a17e6ba121dca4
-
+
https://github.com/dotnet/arcade
- 100394106fe203c112ab72bcc1576fb3753f7910
+ bd9b4590681e602535ed414e98a17e6ba121dca4
-
+
https://github.com/dotnet/arcade
- 100394106fe203c112ab72bcc1576fb3753f7910
+ bd9b4590681e602535ed414e98a17e6ba121dca4
diff --git a/eng/Versions.props b/eng/Versions.props
index eac500de8cb..977f43a0139 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,9 +56,9 @@
- 6.0.0-beta.24163.13
- 6.0.0-beta.24163.13
- 6.0.0-beta.24163.13
+ 6.0.0-beta.24204.4
+ 6.0.0-beta.24204.4
+ 6.0.0-beta.24204.4
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 616bfc38696..21945ebdc9e 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -116,7 +116,7 @@ jobs:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- - task: MicroBuildSigningPlugin@3
+ - task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
@@ -124,6 +124,7 @@ jobs:
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
env:
TeamName: $(_TeamName)
+ MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml
index e0e9a4bc512..08df5637599 100644
--- a/eng/common/templates-official/job/onelocbuild.yml
+++ b/eng/common/templates-official/job/onelocbuild.yml
@@ -43,7 +43,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
variables:
diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml
index 9498aa412db..1d84eb301c4 100644
--- a/eng/common/templates-official/job/publish-build-assets.yml
+++ b/eng/common/templates-official/job/publish-build-assets.yml
@@ -80,14 +80,16 @@ jobs:
inputs:
targetType: inline
script: |
- Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
- Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
- Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
+ New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
+ $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
+ Add-Content -Path $filePath -Value $(BARBuildId)
+ Add-Content -Path $filePath -Value "$(DefaultChannels)"
+ Add-Content -Path $filePath -Value $(IsStableBuild)
- task: 1ES.PublishBuildArtifacts@1
displayName: Publish ReleaseConfigs Artifact
inputs:
- PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
+ PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
PublishLocation: Container
ArtifactName: ReleaseConfigs
diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml
index 96be5e6e115..f5fa09f4151 100644
--- a/eng/common/templates-official/job/source-build.yml
+++ b/eng/common/templates-official/job/source-build.yml
@@ -50,7 +50,7 @@ jobs:
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-mariner-2-pt
+ image: 1es-mariner-2
os: linux
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml
index 3d8b0b966cb..e96ec3cbe0e 100644
--- a/eng/common/templates-official/job/source-index-stage1.yml
+++ b/eng/common/templates-official/job/source-index-stage1.yml
@@ -7,7 +7,7 @@ parameters:
binlogPath: artifacts/log/Debug/Build.binlog
pool:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
condition: ''
dependsOn: ''
diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml
index 669ccd48f7f..c124aa99578 100644
--- a/eng/common/templates-official/jobs/jobs.yml
+++ b/eng/common/templates-official/jobs/jobs.yml
@@ -92,7 +92,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
runAsPublic: ${{ parameters.runAsPublic }}
diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml
index 80bfa4946c6..fce0d0bf5ce 100644
--- a/eng/common/templates-official/post-build/post-build.yml
+++ b/eng/common/templates-official/post-build/post-build.yml
@@ -103,7 +103,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
@@ -137,12 +137,13 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
+ image: 1ESPT-Windows2022
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
@@ -205,7 +206,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
@@ -251,12 +252,13 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
+ image: 1ESPT-Windows2022
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml
index babc2757d8d..12527b80ea9 100644
--- a/eng/common/templates-official/steps/component-governance.yml
+++ b/eng/common/templates-official/steps/component-governance.yml
@@ -3,7 +3,7 @@ parameters:
steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+ - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml
index babc2757d8d..12527b80ea9 100644
--- a/eng/common/templates/steps/component-governance.yml
+++ b/eng/common/templates/steps/component-governance.yml
@@ -3,7 +3,7 @@ parameters:
steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+ - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
diff --git a/global.json b/global.json
index b5d9d152982..f04a0fc35ad 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24163.13"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4"
},
"sdk": {
"version": "6.0.128"