diff --git a/NuGet.config b/NuGet.config
index f9a5688a957..b906029b62f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,6 @@
-
@@ -21,7 +20,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 366ea28c7ea..999612958b3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 834d09f0c963da37c88aed7ba3a83acafe582948
+ 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3
-
+
https://github.com/dotnet/arcade
- 834d09f0c963da37c88aed7ba3a83acafe582948
+ 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3
-
+
https://github.com/dotnet/arcade
- 834d09f0c963da37c88aed7ba3a83acafe582948
+ 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3
-
+
https://github.com/dotnet/arcade
- 834d09f0c963da37c88aed7ba3a83acafe582948
+ 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3
-
+
https://github.com/dotnet/arcade
- 834d09f0c963da37c88aed7ba3a83acafe582948
+ 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3
diff --git a/eng/Versions.props b/eng/Versions.props
index ecab55ac3fd..e6ee38898bd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,8 +49,8 @@
- 7.0.0-beta.24171.6
- 7.0.0-beta.24171.6
+ 7.0.0-beta.24209.2
+ 7.0.0-beta.24209.2
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index a1bb79c43a7..ecaa096b8a6 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/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-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml
index beab7d1bfba..1f308b24efc 100644
--- a/eng/common/templates-official/variables/pool-providers.yml
+++ b/eng/common/templates-official/variables/pool-providers.yml
@@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
-# image: 1es-windows-2022-pt
+# image: 1es-windows-2022
variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
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 694d70127db..99a24b28f9a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "7.0.117",
+ "dotnet": "7.0.118",
"runtimes": {
"dotnet": [
"2.1.7",
@@ -12,11 +12,11 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.6"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2"
},
"sdk": {
- "version": "7.0.117"
+ "version": "7.0.118"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",