diff --git a/NuGet.config b/NuGet.config index dbd29f96e..6d004c295 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e2bec25e..a0e08809b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/winforms - b718d35e98c370ff27249f8f6c57325033a27c7e + 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 - + https://github.com/dotnet/wpf - 8091341440149a2ff67ed5af6efbb43c349ee537 + fd949cc0bee03dece87b7430fbba99f150632b9d - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + 5bdd01cf158a4b214f11025fdd45ac7e4774509f - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + 5bdd01cf158a4b214f11025fdd45ac7e4774509f @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 7971633700e06fdd0a46dbae78908582ee533c2a + a9c49e8b8633005d2d03516693950037a9cf7cc7 diff --git a/eng/Versions.props b/eng/Versions.props index f543144c4..dee08608b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22506.1 + 7.0.0-rtm.22511.7 - 7.0.0-rtm.22506.9 + 7.0.0-rtm.22511.4 @@ -50,46 +50,46 @@ - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 0.2.0 - 7.0.100-rtm.22510.28 - 7.0.100-rtm.22510.28 - 7.0.100-rtm.22510.28 + 7.0.100-rtm.22512.19 + 7.0.100-rtm.22512.19 + 7.0.100-rtm.22512.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22511.4 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 2.1.0 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 + 7.0.0-rtm.22511.3 + 7.0.0-rtm.22511.3 + 7.0.0 + 7.0.0 diff --git a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch b/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch deleted file mode 100644 index 2285f0472..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 16 May 2022 16:29:43 -0700 -Subject: [PATCH] Update nullability constraints for BeginScope in - SimpleConsoleLogger - -Workaround for: https://github.com/dotnet/format/issues/1609 ---- - src/Logging/SimpleConsoleLogger.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index fd8015c..2971595 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -64,7 +64,7 @@ public bool IsEnabled(LogLevel logLevel) - return (int)logLevel >= (int)_minimalLogLevel; - } - -- public IDisposable BeginScope(TState state) -+ public IDisposable? BeginScope(TState state) where TState : notnull - { - return NullScope.Instance; - } diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch deleted file mode 100644 index 1a9573cb5..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 15 Sep 2022 14:46:53 -0500 -Subject: [PATCH] Use the source-built version of ref packs and don't use app - host when building in source-build. - -Backport PR: https://github.com/dotnet/roslyn/pull/64055. - ---- - Directory.Build.targets | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 8f38a48cd95..dfb4fd33c9a 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -1,5 +1,20 @@ - - -+ -+ -+ -+ 6.0.0 -+ -+ -+ 6.0.0 -+ -+ -+ -+ -+ -+ false -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch deleted file mode 100644 index dd0d19c7a..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 20 Sep 2022 10:10:29 -0700 -Subject: [PATCH] Look for msbuild net7.0 artifacts - -Backport: https://github.com/dotnet/sdk/pull/28425 ---- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - -