diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 453db5a..65e8257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,38 +207,38 @@ https://github.com/dotnet/llvm-project 04376bba06a48f109738bf36dc8070e2757bc29c - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 diff --git a/eng/Versions.props b/eng/Versions.props index 896a21c..b76337b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,10 +50,10 @@ release - 9.0.0-beta.24172.4 - 9.0.0-beta.24172.4 - 9.0.0-beta.24172.4 - 9.0.0-beta.24172.4 + 9.0.0-beta.24179.6 + 9.0.0-beta.24179.6 + 9.0.0-beta.24179.6 + 9.0.0-beta.24179.6 1.1.87-gba258badda diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 5dcbfd7..228be0b 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -20,7 +20,7 @@ getNonPortableDistroRid() # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then . "${rootfsDir}/etc/os-release" - if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then + if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros fi diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 16727e2..c63e17e 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -136,6 +136,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 ba9ba49..52b4d05 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d72e4ea..38340d3 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50f04e6..50d4b98 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 5c98fe1..da1f409 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1..1f308b2 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/global.json b/global.json index f24fe7f..dad14b4 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24172.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6", "Microsoft.Build.Traversal": "3.4.0" } }