diff --git a/NuGet.config b/NuGet.config index fbfd3a625..9fcb5685f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,20 +6,9 @@ - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783b33db9..ecc57947f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e - + https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e https://github.com/dotnet/test-templates @@ -124,57 +124,53 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - d77ef3b1a253a99d0be23cec35e84d2fb3317ac5 + abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/wpf - eb2c28846bd06cc11a0cd432d55639a850a829a3 + 0d629281c49061636a8a161bae6fceedd37acff7 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 507114e990861aec5444df54de1dc77bfe26a310 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 507114e990861aec5444df54de1dc77bfe26a310 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/roslyn - 12b11685a551e0a6a203dcecb584f610f4df1157 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/msbuild - 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22 + 08494c73128451a3f7cfb47a5e9cbd63f5507a1f - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 62c02514a26464c03574137628e33ed3690c06ef https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed - - - https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 1b7f3a6560f6fb5f32b2758603c0376037f555ea @@ -188,9 +184,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 3dc05150cf234f76f6936dcb2853d31a0da1f60e + ed17956dbc31097b7ba6a66be086f4a70a97d84f @@ -209,18 +205,18 @@ - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + 1d451c32dda2314c721adbf8829e1c0cd4e681ff https://github.com/dotnet/arcade-services @@ -234,14 +230,14 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - b4fa7f2e1e65ef49881be2ab2df27624280a8c55 + 7b55da982fc6e71c1776c4de89111aee0eecb45a - + https://github.com/dotnet/xliff-tasks - 73f0850939d96131c28cf6ea6ee5aacb4da0083a + 194f32828726c3f1f63f79f3dc09b9e99c157b11 diff --git a/eng/Versions.props b/eng/Versions.props index f08343dc9..3c0f59f88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) @@ -16,7 +16,7 @@ false release - rtm + preview rtm servicing @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 25)) - $([MSBuild]::Add($(VersionFeature), 14)) + 22 + 11 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -40,7 +40,7 @@ - 8.0.0-beta.23516.4 + 8.0.0-beta.23463.1 @@ -48,11 +48,11 @@ - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23520.14 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23521.1 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 0.2.0 - 8.0.100 - 8.0.100-rtm.23524.25 - 8.0.100-rtm.23524.25 + 8.0.200-preview.23523.30 + 8.0.200-preview.23523.30 + 8.0.200-preview.23523.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.2 + 4.9.0-1.23520.1 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23520.16 - 8.0.0-rtm.23523.12 - 8.0.0-rtm.23523.12 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 2.1.0 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23521.1 + 8.0.0-rtm.23521.1 + 8.0.0-rtm.23521.1 + 8.0.0-rtm.23521.1 @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.9.0-preview.1.17 @@ -232,23 +232,23 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23523-03 + 17.9.0-preview-23519-02 8.0.0-alpha.1.22557.12 8.0.100-rc.1 8.0.0-alpha.23471.13 - 8.0.100-rc.2 - 8.0.0-rc.2.9373 - 34.0.0-rc.2.468 - 16.4.8968-net8-rc2 - 16.4.8968-net8-rc2 - 13.3.8968-net8-rc2 - 16.4.8968-net8-rc2 + 8.0.100-rc.1 + 8.0.0-rc.1.9171 + 34.0.0-rc.1.432 + 16.4.8825-net8-rc1 + 16.4.8825-net8-rc1 + 13.3.8825-net8-rc1 + 16.4.8825-net8-rc1 - 8.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) + 8.0.0-rtm.23511.3 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index 3f2e1c759..dc2873407 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -4,6 +4,10 @@ pr: include: - main - release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx parameters: - name: vmrBranch diff --git a/global.json b/global.json index 10f733dd5..789235dfe 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100-preview.7.23376.3", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23516.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23463.1" } } diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 55b6a212d..7a6756c3e 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -7,6 +7,13 @@ trigger: - main - release/* - internal/release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx pr: branches: