diff --git a/NuGet.config b/NuGet.config index db6d7b18c19d..1ea5b4e25974 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -32,10 +30,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4887049b06d6..3aff45adc270 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + 2e2298e9cdec79ef907be5246d725c97661a946a - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + 2e2298e9cdec79ef907be5246d725c97661a946a - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + 2e2298e9cdec79ef907be5246d725c97661a946a - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + 2e2298e9cdec79ef907be5246d725c97661a946a - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + 2e2298e9cdec79ef907be5246d725c97661a946a - + https://github.com/dotnet/arcade - efce34e9f9f25af27e2b471fbbf8c21f1ac2e318 + 2e2298e9cdec79ef907be5246d725c97661a946a https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 5a9ca3284d60..d76b68dff8fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -165,10 +165,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.26301.4 - 9.0.0-beta.26301.4 - 9.0.0-beta.26301.4 - 9.0.0-beta.26301.4 + 9.0.0-beta.26379.3 + 9.0.0-beta.26379.3 + 9.0.0-beta.26379.3 + 9.0.0-beta.26379.3 9.0.0-alpha.1.26309.11 diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index edefa789d360..79386ab08638 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,6 +8,12 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex 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. + CeapexServiceConnection: 'dnceng-onelocbuild-ceapex' + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false @@ -73,6 +79,16 @@ 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')) }}: + - template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + federatedServiceConnection: ${{ parameters.CeapexServiceConnection }} + outputVariableName: 'CeapexEntraToken' + condition: ${{ parameters.condition }} + - task: OneLocBuild@2 displayName: OneLocBuild env: @@ -89,7 +105,10 @@ jobs: ${{ if eq(parameters.RepoType, 'gitHub') }}: isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} + ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + patVariable: $(CeapexEntraToken) + ${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}: + patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 0623ac6e1123..917827999cc9 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -30,7 +30,6 @@ steps: -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' - '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' '$(microsoft-symbol-server-pat)' '$(symweb-symbol-server-pat)' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a06513a59407..d89aa48781b1 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -727,7 +727,7 @@ function InitializeToolset() { '' | Set-Content $proj - MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile + MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile /p:RestoreIgnoreFailedSources=true $path = Get-Content $toolsetLocationFile -Encoding UTF8 -TotalCount 1 if (!(Test-Path $path)) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 01b09b65796c..c412703d1bae 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -410,7 +410,7 @@ function InitializeToolset { fi echo '' > "$proj" - MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" + MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" /p:RestoreIgnoreFailedSources=true local toolset_build_proj=`cat "$toolset_location_file"` diff --git a/global.json b/global.json index 750f0dcc501d..670244cb4c4f 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26301.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26301.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26379.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26379.3" } }