diff --git a/NuGet.config b/NuGet.config index b1a2c374a..fc6bffb0f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,22 @@ - + + + + + + @@ -39,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92fdf2ceb..b336bf629 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + ecb34f85ec92e1b3c814edf7da83337e199e7f66 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 70048beee894074e9718206a0017d9b080ee66ff https://github.com/dotnet/test-templates @@ -98,82 +98,82 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 66db733312de7bd21ed3e73cee0b27fb75d91b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/microsoft/vstest - bc17bb9693cfc4778ded51aa0ab7f1065433f989 + 76fea143ffe5e3883dcd04e0923b4b8e1e158145 - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker - + https://github.com/dotnet/roslyn - dad7898acd6372d4380612b9f225db0c2cbfa1e9 + 43b0b05cc4f492fd5de00f6f6717409091df8daa - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/nuget/nuget.client - 13f2b6af6e9864711e815cfbffd7aa5015c52cec + b46f5f64159a81d930ac8cdfde96e76f90796c62 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8ed38a112..1358c5e77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.11-servicing.23425.2 - 7.0.10-servicing.23364.4 + 7.0.11-servicing.23425.6 @@ -56,29 +56,29 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.11 + 7.0.11 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 0.2.0 - 7.0.400 - 7.0.400-rtm.23369.15 - 7.0.400-rtm.23369.15 + 7.0.401 + 7.0.401-servicing.23425.43 + 7.0.401-servicing.23425.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23366.1 + 4.7.0-3.23416.9 @@ -86,20 +86,20 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23424.27 + 7.0.11-servicing.23424.27 + 7.0.11 + 7.0.11 + 7.0.11 + 7.0.11 2.1.0 - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23425.5 + 7.0.11-servicing.23425.5 + 7.0.11 + 7.0.11 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview-23364-03 + 17.7.1-release-23418-01 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 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 7cbb79538..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 - - -+ - - -