diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 236af4e4c0d8..798e492c3935 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 - 116821454672913952976f17ce10d0685894357d + 4ed65d6624b13fdf801fb85804f807429bc7ce20 - + https://github.com/dotnet/windowsdesktop - 116821454672913952976f17ce10d0685894357d + 4ed65d6624b13fdf801fb85804f807429bc7ce20 - + https://github.com/dotnet/windowsdesktop - 116821454672913952976f17ce10d0685894357d + 4ed65d6624b13fdf801fb85804f807429bc7ce20 - + https://github.com/dotnet/windowsdesktop - 116821454672913952976f17ce10d0685894357d + 4ed65d6624b13fdf801fb85804f807429bc7ce20 - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/aspnetcore - f9744859cf4a15c3511f28dba17e6dab00f0a378 + 1b268bfa2099f2dd9a2f05e2f7d1476eaeda71af - + https://github.com/dotnet/sdk - 1b1dd4fe88903afed0bc4ac78872885c45588f5a + 6ec60a5af97b77c583cadbd0e51c8919423dc76a - + https://github.com/dotnet/sdk - 1b1dd4fe88903afed0bc4ac78872885c45588f5a + 6ec60a5af97b77c583cadbd0e51c8919423dc76a - + https://github.com/dotnet/sdk - 1b1dd4fe88903afed0bc4ac78872885c45588f5a + 6ec60a5af97b77c583cadbd0e51c8919423dc76a - + https://github.com/dotnet/sdk - 1b1dd4fe88903afed0bc4ac78872885c45588f5a + 6ec60a5af97b77c583cadbd0e51c8919423dc76a https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - acf62113e20e57628e1330d0e8025bf64220073e + 9fe6e141ce98c9a7b2940d5743b165982aa242b5 - + https://github.com/dotnet/wpf - b6e229ca91e46c85a8c4aae7100181581e10b1fe + ecefb59b844ce9b63db0cb0c53efa48466f04ffc - + https://github.com/dotnet/fsharp - 6fac58b8cbc070f02e8682337dc12b4fd72fd39f + 767ffa73e8147418ecf54df376e6685b03efd6e4 - + https://github.com/dotnet/fsharp - 6fac58b8cbc070f02e8682337dc12b4fd72fd39f + 767ffa73e8147418ecf54df376e6685b03efd6e4 @@ -146,18 +146,18 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/roslyn - ce677a52cd2093e772c83a92ffd1ee1cb7975c2e + f455ada21c49a7b0d07d1a451b450e1129745e46 - + https://github.com/dotnet/msbuild - 1b84c9b5c6d264bab83114c6749def66d5656e6b + 60ae06f6d20616f524a751373aea071df8c2ae48 @@ -174,15 +174,15 @@ 1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc - + https://github.com/dotnet/deployment-tools - 850f61abed37b617a41fd59b63a37c284af6801d + 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/deployment-tools - 850f61abed37b617a41fd59b63a37c284af6801d + 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 diff --git a/eng/Versions.props b/eng/Versions.props index 23fcfe6ec059..ae3f3cf674ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.0-rc.2.23468.7 + 8.0.0-rc.2.23468.13 - 8.0.0-rc.2.23468.2 + 8.0.0-rtm.23469.3 @@ -71,50 +71,50 @@ - 8.0.0-rtm.23468.24 - 8.0.0-rtm.23468.24 - 8.0.0-rtm.23468.24 - 8.0.0-rtm.23468.24 - 8.0.0-rtm.23468.24 - 8.0.0-rtm.23468.24 - 8.0.0-rtm.23468.24 + 8.0.0-rtm.23470.8 + 8.0.0-rtm.23470.8 + 8.0.0-rtm.23470.8 + 8.0.0-rtm.23470.8 + 8.0.0-rtm.23470.8 + 8.0.0-rtm.23470.8 + 8.0.0-rtm.23470.8 0.2.0 - 8.0.100-rc.2.23469.3 - 8.0.100-rc.2.23469.3 - 8.0.100-rc.2.23469.3 + 8.0.100-rc.2.23470.19 + 8.0.100-rc.2.23470.19 + 8.0.100-rc.2.23470.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23468.1 + 4.8.0-3.23470.1 - 8.0.0-rc.2.23466.4 + 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 + 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23469.9 2.1.0 - 8.0.0-rc.2.23468.1 - 8.0.0-rc.2.23468.1 - 8.0.0-rc.2.23468.1 - 8.0.0-rc.2.23468.1 + 8.0.0-rtm.23469.2 + 8.0.0-rtm.23469.2 + 8.0.0-rtm.23469.2 + 8.0.0-rtm.23469.2 @@ -130,7 +130,7 @@ - 1.0.0-preview.6.23407.1 + 2.0.0-preview.1.23463.1 diff --git a/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch b/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch deleted file mode 100644 index f8a5bc0de04e..000000000000 --- a/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Fri, 11 Aug 2023 12:03:41 -0500 -Subject: [PATCH] Disable trimmable for DotNet.Releases project - -Backport: https://github.com/dotnet/deployment-tools/issues/288 ---- - .../src/Microsoft.Deployment.DotNet.Releases.csproj | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj -index ee19600..2e50a3a 100644 ---- a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj -+++ b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj -@@ -5,8 +5,8 @@ - 0 - 6 - true -- true -- true -+ false -+ false - - -