diff --git a/NuGet.config b/NuGet.config index e514446a91d..b1922c34161 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -25,7 +24,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af19584c5cd..4affc99e8f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d diff --git a/eng/Versions.props b/eng/Versions.props index 0aeb1c7c847..981f5387937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,9 +57,9 @@ - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 17.4.0-preview-20220707-01 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd51..abe80a2a0e0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b16..f70261ed689 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index 4a5d58a92fc..982d5e365c9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.106", + "dotnet": "9.0.107", "runtimes": { "dotnet/x64": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -11,12 +11,12 @@ } }, "sdk": { - "version": "9.0.106" + "version": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.6" },