diff --git a/NuGet.config b/NuGet.config index 840930e36595ed..a08b811af588ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + - 5.0.0-2.26424.122 - 5.0.0-2.26424.122 - 5.0.0-2.26424.122 - 10.0.112 - 10.0.112 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 0.11.5-alpha.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 10.0.0-beta.26424.122 - 2.9.3-beta.26424.122 - 2.9.3-beta.26424.122 - 10.0.0-beta.26424.122 - 5.0.0-2.26424.122 - 10.0.12 - 10.0.112-servicing.26424.122 - 10.0.12 - 10.0.12 - 7.0.3-rc.42522 - 7.0.3-rc.42522 - 7.0.3-rc.42522 - 7.0.3-rc.42522 - 10.0.12 - 2.0.12 - 10.0.12 - 10.0.12 - 10.0.12 + 5.0.0-2.26429.113 + 5.0.0-2.26429.113 + 5.0.0-2.26429.113 + 10.0.113 + 10.0.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 0.11.5-alpha.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 10.0.0-beta.26429.113 + 2.9.3-beta.26429.113 + 2.9.3-beta.26429.113 + 10.0.0-beta.26429.113 + 5.0.0-2.26429.113 + 10.0.13 + 10.0.113-servicing.26429.113 + 10.0.13 + 10.0.13 + 7.0.3-rc.43013 + 7.0.3-rc.43013 + 7.0.3-rc.43013 + 7.0.3-rc.43013 + 10.0.13 + 2.0.13 + 10.0.13 + 10.0.13 + 10.0.13 10.0.0-alpha.0.26202.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 085eb09eea7617..62f466441cc622 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 8dd9b8e6004e22c7b120af0631f0809865ff2088 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 9269cdec2fee60b5914f8085dd26d1679bab9243 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 - + https://github.com/dotnet/dotnet - a6cb35bfde81c73e25feba2fe3d2a39c3fe118fd + e1bf5a0aa13db78aeb5dab00e81248f339656d68 https://github.com/dotnet/node diff --git a/eng/Versions.props b/eng/Versions.props index 1103247eae643e..bba318774e5f1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ 10 0 - 12 + 13 $(MajorVersion).$(MinorVersion).$(PatchVersion) 9.0.$([MSBuild]::Add($(PatchVersion),12)) diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 726c2c1daf9904..15d8c1571e7f6d 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -9,9 +9,8 @@ parameters: GithubPat: $(BotAccount-dotnet-bot-repo-PAT) # Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat). - # When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT. - # All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not - # exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter. + # The `internal` and `DevDiv` System.TeamProject values have same-named, project-scoped + # connections. Other values, and any pipeline that sets this to '', use the CeapexPat parameter. CeapexServiceConnection: 'dnceng-onelocbuild-ceapex' # GitHub App authentication for the OneLoc check-in PR. @@ -89,9 +88,8 @@ jobs: displayName: Generate LocProject.json condition: ${{ parameters.condition }} - # Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only). - # All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal. - - ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + # Acquire an Entra token when System.TeamProject is `internal` or `DevDiv`. + - ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: federatedServiceConnection: ${{ parameters.CeapexServiceConnection }} @@ -130,9 +128,9 @@ jobs: isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth - ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}: patVariable: $(CeapexEntraToken) - ${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}: + ${{ if or(eq(parameters.CeapexServiceConnection, ''), and(ne(variables['System.TeamProject'], 'internal'), ne(variables['System.TeamProject'], 'DevDiv'))) }}: patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} diff --git a/global.json b/global.json index 5553e07d5ca012..cb4d960bcf7c76 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26424.122", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26424.122", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.26424.122", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26429.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26429.113", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.26429.113", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.12" + "Microsoft.NET.Sdk.IL": "10.0.13" } } diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj index f834af089e1ac1..788a792c1a0bd6 100644 --- a/src/installer/pkg/sfx/installers/dotnet-host.proj +++ b/src/installer/pkg/sfx/installers/dotnet-host.proj @@ -7,7 +7,7 @@ Host NetCore.SharedHost true - true + false sharedhost Dotnet_CLI_SharedHost