diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d8c8bc217c0805..62253ff9842a02 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,75 +8,75 @@ This file should be imported by eng/Versions.props 11.0.0-alpha.1.26063.1 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 - 19.1.0-alpha.1.25625.2 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 + 19.1.0-alpha.1.26104.1 - 5.4.0-2.26069.103 - 5.4.0-2.26069.103 - 5.4.0-2.26069.103 - 11.0.100-preview.1.26069.103 - 11.0.100-preview.1.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 0.11.5-preview.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 11.0.0-beta.26069.103 - 2.9.3-beta.26069.103 - 2.9.3-beta.26069.103 - 11.0.0-beta.26069.103 - 5.4.0-2.26069.103 - 11.0.0-preview.1.26069.103 - 11.0.100-preview.1.26069.103 - 11.0.0-preview.1.26069.103 - 11.0.0-preview.1.26069.103 - 7.3.0-preview.1.7003 - 7.3.0-preview.1.7003 - 7.3.0-preview.1.7003 - 7.3.0-preview.1.7003 - 11.0.0-preview.1.26069.103 - 3.0.0-preview.1.26069.103 - 11.0.0-preview.1.26069.103 - 11.0.0-preview.1.26069.103 - 11.0.0-preview.1.26069.103 + 5.5.0-2.26110.116 + 5.5.0-2.26110.116 + 5.5.0-2.26110.116 + 11.0.100-preview.2.26110.116 + 11.0.100-preview.2.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 0.11.5-preview.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 11.0.0-beta.26110.116 + 2.9.3-beta.26110.116 + 2.9.3-beta.26110.116 + 11.0.0-beta.26110.116 + 5.5.0-2.26110.116 + 11.0.0-preview.2.26110.116 + 11.0.100-preview.2.26110.116 + 11.0.0-preview.2.26110.116 + 11.0.0-preview.2.26110.116 + 7.5.0-rc.11116 + 7.5.0-rc.11116 + 7.5.0-rc.11116 + 7.5.0-rc.11116 + 11.0.0-preview.2.26110.116 + 3.0.0-preview.2.26110.116 + 11.0.0-preview.2.26110.116 + 11.0.0-preview.2.26110.116 + 11.0.0-preview.2.26110.116 11.0.0-beta.26071.1 11.0.0-beta.26071.1 @@ -108,14 +108,14 @@ This file should be imported by eng/Versions.props 11.0.0-alpha.0.25625.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 - 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 + 11.0.0-alpha.1.26104.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d2d04ca06a09f..e519668c1e0647 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,127 +1,127 @@ - + https://github.com/dotnet/icu b12b32d4177efa391c10895fc2ef3b7a21fb1d4d - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 https://github.com/dotnet/runtime-assets @@ -175,117 +175,117 @@ https://github.com/dotnet/runtime-assets 2497df9ce6db7a2b4082cb45b203983f977c6d5b - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/llvm-project - 90a3b767fd10543cbaed7308406e0059dec0ffb7 + d236ab665a39b0dadec765bf1fdbbff11c648be6 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 31e0b8e08f57890f7b7004b93361d69cd4b21079 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -327,29 +327,29 @@ https://github.com/dotnet/runtime-assets 2497df9ce6db7a2b4082cb45b203983f977c6d5b - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -361,53 +361,53 @@ - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/dotnet - adf42f5dcec99a409a6f63355f5b52147bfaf043 + 72217c0d2d275adb380979be6f366a38292cf053 - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f - + https://github.com/dotnet/node - 7a708d1adab0930c09ef65586d354aafb2ab27cf + a3c48e4c5cdc3096257f984739ec30f5fd2eb77f https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index bfa35f15609e3b..fef3eb3975714e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 7.0.20 6.0.36 preview - 1 + 2 false release diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 8b5c635fe807e1..c9ee8ffd8f1d29 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 9d820f9742117b..1997c2ae00d76a 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,19 +60,19 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2204.amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ 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-azurelinux-3 + image: build.azurelinux.3.amd64 os: linux ${{ else }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ 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')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 06864cd1feb8e8..3bed9cdb49d87e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9b7eede4e50f60..ef97671fe6cbdb 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -295,9 +295,7 @@ while :; do ;; noble) # Ubuntu 24.04 __CodeName=noble - if [[ -z "$__LLDB_Package" ]]; then - __LLDB_Package="liblldb-19-dev" - fi + __LLDB_Package="liblldb-19-dev" ;; stretch) # Debian 9 __CodeName=stretch diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 11f81cbd40d4a9..abb47beacfa081 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -24,16 +24,16 @@ case "$os" in apt update apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ - libssl-dev libkrb5-dev pigz cpio + libssl-dev libkrb5-dev pigz cpio ninja-build localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" - $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build elif [ "$ID" = "amzn" ]; then - dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build elif [ "$ID" = "alpine" ]; then - apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio + apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio ninja else echo "Unsupported distro. distro: $ID" exit 1 @@ -54,6 +54,7 @@ brew "openssl@3" brew "pkgconf" brew "python3" brew "pigz" +brew "ninja" EOF ;; diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a073c6..18693ea120d57b 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index c6b5ccd859954c..3983566eba52d3 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "11.0.100-alpha.1.26064.118", + "version": "11.0.100-preview.1.26078.121", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "11.0.100-alpha.1.26064.118" + "dotnet": "11.0.100-preview.1.26078.121" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26069.103", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26069.103", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26069.103", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26110.116", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26110.116", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26110.116", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.1.26069.103" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.2.26110.116" } } diff --git a/src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj b/src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj index 6017f95a8bc3fc..35615c89eda9c6 100644 --- a/src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj +++ b/src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/tests/build.proj b/src/tests/build.proj index 79065c98a1d9c4..06bc7babfa4cd1 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -209,7 +209,7 @@ <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild) - <_ConfigurationProperties Condition="'$(UseLocalAppHostPack)' == 'true'">$(_ConfigurationProperties) -p:EnableAppHostPackDownload=false -p:EnableTargetingPackDownload=false -p:EnableRuntimePackDownload=false + <_ConfigurationProperties Condition="'$(UseLocalAppHostPack)' == 'true' or '$(TargetOS)' == 'browser'">$(_ConfigurationProperties) -p:EnableAppHostPackDownload=false -p:EnableTargetingPackDownload=false -p:EnableRuntimePackDownload=false <_ForceRestore Condition="'$(_ForceRestore)' == 'true'">-f "$(DotNetTool)" restore $(_ForceRestore) -r $(RuntimeIdentifier) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true /p:RuntimeIdentifier=$(RuntimeIdentifier) $(_ConfigurationProperties)