diff --git a/NuGet.config b/NuGet.config index 04c60be9de534f..b539231b1b50c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7874d9da666f8..1d8e72889f59ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 53915f585ca3dc5deff5c09c9492f7c5b7d925ca + cda39b50d316241f6c9dea44ed241a83aaccdfac https://github.com/dotnet/msquic @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 https://github.com/dotnet/command-line-api @@ -54,34 +54,34 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - 711eabb98b62ab3ddf6ab59c879713cd6e4f5982 + 1f9985e482df7a0dee94854226d0aecad102ac15 - + https://github.com/dotnet/cecil - 711eabb98b62ab3ddf6ab59c879713cd6e4f5982 + 1f9985e482df7a0dee94854226d0aecad102ac15 - + https://github.com/dotnet/emsdk - b9d2b36b975626fa0c56441f071dee954385a83a + c66fdc1df74783ebdae3c67033c5a9b41aae3bd3 - + https://github.com/dotnet/emsdk - b9d2b36b975626fa0c56441f071dee954385a83a + c66fdc1df74783ebdae3c67033c5a9b41aae3bd3 - + https://github.com/dotnet/emsdk - b9d2b36b975626fa0c56441f071dee954385a83a + c66fdc1df74783ebdae3c67033c5a9b41aae3bd3 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + a9cadb09ddcc99b1e535efb0648047634f0c4f40 @@ -92,195 +92,195 @@ - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 - + https://github.com/dotnet/llvm-project - 4e9be0648863c94e45c31df8e2e7524fcad27f35 + c373980dd30f821fbbdeeb316b839d6efbf688b1 https://github.com/dotnet/runtime @@ -320,21 +320,21 @@ https://github.com/dotnet/runtime b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/xharness - 31e0b8e08f57890f7b7004b93361d69cd4b21079 + c26361a23526ea459ca0a19b34b285eda1bffecb - + https://github.com/dotnet/xharness - 31e0b8e08f57890f7b7004b93361d69cd4b21079 + c26361a23526ea459ca0a19b34b285eda1bffecb - + https://github.com/dotnet/xharness - 31e0b8e08f57890f7b7004b93361d69cd4b21079 + c26361a23526ea459ca0a19b34b285eda1bffecb - + https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -352,13 +352,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://github.com/dotnet/hotreload-utils - 3f4893bee30a42b1041149c9b50b7a49224fcb68 + 6eb504148b667c521f41d18dca072f1d2d8eae07 - + https://github.com/dotnet/runtime-assets - 45c55b97e4006bac84d19a382ace44ef3dcb8d94 + 70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 37ede4532785ea..045ad89db20dc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 9.0.12 + 9.0.14 9 0 - 12 + 14 9.0.100 8.0.$([MSBuild]::Add($(PatchVersion),11)) 7.0.20 @@ -18,7 +18,6 @@ release -$(PreReleaseVersionLabel) -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(SdkBandVersion)$(WorkloadVersionSuffix) $(MajorVersion).$(MinorVersion).0.0 @@ -85,22 +84,22 @@ 9.0.109 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 2.9.0-beta.26063.2 - 9.0.0-beta.26063.2 - 2.9.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 - 9.0.0-beta.26063.2 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 2.9.0-beta.26070.1 + 9.0.0-beta.26070.1 + 2.9.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 + 9.0.0-beta.26070.1 1.4.0 @@ -147,20 +146,20 @@ 8.0.0 4.5.4 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 - 9.0.0-beta.26071.2 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 + 9.0.0-beta.25625.4 1.0.0-prerelease.24462.2 1.0.0-prerelease.24462.2 @@ -191,11 +190,11 @@ 1.4.0 17.4.0-preview-20220707-01 - 11.0.0-prerelease.26064.3 - 11.0.0-prerelease.26064.3 - 11.0.0-prerelease.26064.3 + 9.0.0-prerelease.25615.2 + 9.0.0-prerelease.25615.2 + 9.0.0-prerelease.25615.2 - 9.0.0-alpha.0.26104.3 + 9.0.0-alpha.0.25625.4 3.12.0 4.5.0 6.0.0 @@ -223,54 +222,63 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.26075.3 + 0.11.5-alpha.25628.2 9.0.0-rtm.24511.16 - 9.0.0-rtm.26078.1 + 9.0.0-rtm.25627.1 9.0.0-rtm.24466.4 - 2.4.16 + 2.4.8 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 - 9.0.12-servicing.25626.4 - 9.0.12 + 9.0.14-servicing.26102.1 + 9.0.14 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) + + + <_GlobalJsonContent>$([System.IO.File]::ReadAllText('$([MSBuild]::GetPathOfFileAbove('global.json', '$(MSBuildThisFileDirectory)'))')) + <_GlobalJsonSdkVersion Condition="'$(_GlobalJsonContent)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(_GlobalJsonContent), '"sdk"\s*:\s*\{[^\}]*"version"\s*:\s*"([^"]+)"', System.Text.RegularExpressions.RegexOptions.Singleline).Groups[1].Value) + <_DotnetSdkVersion>$(MicrosoftDotNetApiCompatTaskVersion) + $(_DotnetSdkVersion) + $(_GlobalJsonSdkVersion) + $(SdkBandVersion)$(WorkloadVersionSuffix) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 - 19.1.0-alpha.1.25625.1 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 + 19.1.0-alpha.1.26071.2 3.1.7 1.0.406601 - - - 9.0.112 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index cadab9bdda2344..e5139469b7332e 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -28,7 +28,13 @@ jobs: - job: evaluate_paths displayName: Evaluate Paths pool: - vmImage: 'ubuntu-latest' + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals build.azurelinux.3.amd64.open + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals build.azurelinux.3.amd64 + os: linux steps: - checkout: self diff --git a/global.json b/global.json index 9d1e6e3db9c573..866982aaa042f9 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.112", + "version": "9.0.113", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.112" + "dotnet": "9.0.113" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26063.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26070.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26070.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26070.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"