diff --git a/NuGet.config b/NuGet.config
index 03d3587a6..ad69301d0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,16 +7,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,12 +51,22 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 84ad42357..35620a293 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 75c9b26383d5e6908e8b07d68d134f115c696324
+ d0dfc3119d2aa9f601fcbdc56717b2f49781898e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 75c9b26383d5e6908e8b07d68d134f115c696324
+ d0dfc3119d2aa9f601fcbdc56717b2f49781898e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 75c9b26383d5e6908e8b07d68d134f115c696324
+ d0dfc3119d2aa9f601fcbdc56717b2f49781898e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 75c9b26383d5e6908e8b07d68d134f115c696324
+ d0dfc3119d2aa9f601fcbdc56717b2f49781898e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 189fbbd88d97dd6d65515ba2da05b62eab4e5039
+ 97d8f4cade971b93794a3805e7d72ee388f14c9b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 189fbbd88d97dd6d65515ba2da05b62eab4e5039
+ 97d8f4cade971b93794a3805e7d72ee388f14c9b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 189fbbd88d97dd6d65515ba2da05b62eab4e5039
+ 97d8f4cade971b93794a3805e7d72ee388f14c9b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 189fbbd88d97dd6d65515ba2da05b62eab4e5039
+ 97d8f4cade971b93794a3805e7d72ee388f14c9b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 189fbbd88d97dd6d65515ba2da05b62eab4e5039
+ 97d8f4cade971b93794a3805e7d72ee388f14c9b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 189fbbd88d97dd6d65515ba2da05b62eab4e5039
+ 97d8f4cade971b93794a3805e7d72ee388f14c9b
@@ -52,30 +52,30 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
189fbbd88d97dd6d65515ba2da05b62eab4e5039
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c83354d42e63d2bb07e6b24b7c67ef91e434f359
+ 1d696053fcd6735aaac1902afdb0b92edbf43e71
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c83354d42e63d2bb07e6b24b7c67ef91e434f359
+ 1d696053fcd6735aaac1902afdb0b92edbf43e71
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c83354d42e63d2bb07e6b24b7c67ef91e434f359
+ 1d696053fcd6735aaac1902afdb0b92edbf43e71
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c83354d42e63d2bb07e6b24b7c67ef91e434f359
+ 1d696053fcd6735aaac1902afdb0b92edbf43e71
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c83354d42e63d2bb07e6b24b7c67ef91e434f359
+ 1d696053fcd6735aaac1902afdb0b92edbf43e71
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c83354d42e63d2bb07e6b24b7c67ef91e434f359
+ 1d696053fcd6735aaac1902afdb0b92edbf43e71
https://github.com/dotnet/test-templates
@@ -90,36 +90,36 @@
9388790ba9ed8fef11584b2c74fe6789782a1592
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586
+ 086db5520af132ac32dcf8cce8ad4d561b868363
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586
+ 086db5520af132ac32dcf8cce8ad4d561b868363
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586
+ 086db5520af132ac32dcf8cce8ad4d561b868363
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- e35ea426ec2ee54f57501b661ec7d656caf480d6
+ b47e9d314726020921851f007797b479a5f6905e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- e35ea426ec2ee54f57501b661ec7d656caf480d6
+ b47e9d314726020921851f007797b479a5f6905e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 6525c5174ef1b8ee5b29c397e8a4b76e76487927
+ 431a1dcb7d4eafa215951499ad374ffde8622e61
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc
+ dee47a1e2958aa9b97d3c5edf9433312cc5a4634
https://github.com/dotnet/fsharp
@@ -146,14 +146,14 @@
41a5af9d2c459a06c0795bf21a1c046200f375bf
-
- https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted
- 561848881bab01749e6d8b03be2869a18ca944f7
+
+ https://github.com/dotnet/msbuild
+ a400405ba8c43976eda92a70d4adf72f9d292a22
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- 5e444458a8c4a2dac9806fc1d387b7f157669540
+ 5ec7c4dd0086f968a8bc5a20d5cc77b1454469f3
@@ -166,9 +166,9 @@
698fdad58fa64a55f16cd9562c90224cc498ed02
-
+
https://github.com/dotnet/emsdk
- 5a6205aabc468d65922f79266532e0eea9ca97ec
+ 3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca
https://github.com/dotnet/source-build
diff --git a/eng/Versions.props b/eng/Versions.props
index b5ee42a0a..c5470a925 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
- 6.0.29-servicing.24171.6
+ 6.0.30-servicing.24216.19
- 6.0.29-servicing.24171.7
+ 6.0.30-servicing.24216.7
- 6.0.421
+ 6.0.422
@@ -43,20 +43,20 @@
- 6.0.29
- 6.0.29
- 6.0.29-servicing.24171.8
- 6.0.29-servicing.24171.8
- 6.0.29-servicing.24171.8
- 6.0.29-servicing.24171.8
+ 6.0.30
+ 6.0.30
+ 6.0.30-servicing.24216.19
+ 6.0.30-servicing.24216.19
+ 6.0.30-servicing.24216.19
+ 6.0.30-servicing.24216.19
0.2.0
- 6.0.421-servicing.24172.16
- 6.0.421-servicing.24172.16
+ 6.0.422-servicing.24229.15
+ 6.0.422-servicing.24229.15
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -67,20 +67,20 @@
- 6.0.29-servicing.24171.5
- 6.0.29-servicing.24171.5
- 6.0.29
- 6.0.29
- 6.0.29
- 6.0.29
+ 6.0.30-servicing.24215.25
+ 6.0.30-servicing.24215.25
+ 6.0.30
+ 6.0.30
+ 6.0.30
+ 6.0.30
2.1.0
- 6.0.29-servicing.24171.9
- 6.0.29-servicing.24171.9
- 6.0.29
- 6.0.29
+ 6.0.30-servicing.24217.3
+ 6.0.30-servicing.24217.3
+ 6.0.30
+ 6.0.30
@@ -97,7 +97,7 @@
- 17.3.2
+ 17.3.4
$(MicrosoftNETCoreAppRuntimePackageVersion)
@@ -115,7 +115,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.421
+ 6.0.422
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
@@ -155,7 +155,7 @@
12.3.303
15.4.303
6.0.5
- 6.0.29
+ 6.0.30
$(MicrosoftNETWorkloadEmscriptenManifest60400Version)
diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch
deleted file mode 100644
index 3176d939b..000000000
--- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nikola Milosavljevic
-Date: Mon, 26 Jun 2023 23:46:46 +0000
-Subject: [PATCH] Add explicit System.Text.Json dependency
-
-Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up
-from PSB, via Microsoft.Build package.
-
-Backport: https://github.com/dotnet/format/pull/1887
----
- Directory.Packages.props | 1 +
- eng/Version.Details.xml | 4 ++++
- eng/Versions.props | 2 ++
- src/dotnet-format.csproj | 6 ++++++
- 4 files changed, 13 insertions(+)
-
-diff --git a/Directory.Packages.props b/Directory.Packages.props
-index 6b628c22..c9f86593 100644
---- a/Directory.Packages.props
-+++ b/Directory.Packages.props
-@@ -36,5 +36,6 @@
-
-
-
-+
-
-
-\ No newline at end of file
-diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
-index cdfa5f5e..86f02b44 100644
---- a/eng/Version.Details.xml
-+++ b/eng/Version.Details.xml
-@@ -13,6 +13,10 @@
- https://github.com/dotnet/command-line-api
- c776cd4e906b669b9cce1017fee7d0ba9845d163
-
-+
-+ https://github.com/dotnet/runtime
-+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991
-+
-
-
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index 27582078..bccaf176 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -20,6 +20,8 @@
-
- 2.0.0-beta4.22504.1
- 0.4.0-alpha.22504.1
-+
-+ 6.0.8
-
-
-+
-
-
-