diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 897a2a959..6f8dd7582 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 55c6dd1bed96897df770f35421346f473d553e06 + 641c98fca050b954af9aa9b5dc5dfd0ca7f81730 - + https://github.com/dotnet/windowsdesktop - 55c6dd1bed96897df770f35421346f473d553e06 + 641c98fca050b954af9aa9b5dc5dfd0ca7f81730 - + https://github.com/dotnet/windowsdesktop - 55c6dd1bed96897df770f35421346f473d553e06 + 641c98fca050b954af9aa9b5dc5dfd0ca7f81730 - + https://github.com/dotnet/windowsdesktop - 55c6dd1bed96897df770f35421346f473d553e06 + 641c98fca050b954af9aa9b5dc5dfd0ca7f81730 - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + f107566c2ef1c9dd648b04509249838d656ac72b https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - 0a10b5cdd440e665cefad6f42b37e11f5d2f7712 + dff005cfa5943f677858ec3d6e29b27574e25a12 - + https://github.com/dotnet/sdk - 0a10b5cdd440e665cefad6f42b37e11f5d2f7712 + dff005cfa5943f677858ec3d6e29b27574e25a12 - + https://github.com/dotnet/sdk - 0a10b5cdd440e665cefad6f42b37e11f5d2f7712 + dff005cfa5943f677858ec3d6e29b27574e25a12 - + https://github.com/dotnet/sdk - 0a10b5cdd440e665cefad6f42b37e11f5d2f7712 + dff005cfa5943f677858ec3d6e29b27574e25a12 - + https://github.com/dotnet/winforms - 6678f53fcd0b31d5ec14a5e38f1daa8bbe2cdef2 + 53dafcaae009f9f26f5d66ec6d11d29e2ec5c029 - + https://github.com/dotnet/wpf - 6404669f90d721fb1f062f1e781a0d3512a7f996 + e0cb5f70135b87373e737977d5cc882faa90cad9 - + https://github.com/dotnet/fsharp - f9ee9af59817df5782425534bf2cce40904fed61 + d55c3ef1b3dc620a5b6e4ad061633139f06ee44e - + https://github.com/dotnet/fsharp - f9ee9af59817df5782425534bf2cce40904fed61 + d55c3ef1b3dc620a5b6e4ad061633139f06ee44e @@ -142,18 +142,18 @@ 919ec8358820228cc5fa77ef000051c1d6875399 - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + 30db9b78c8c21aea74a945332bda649e14b6b52d - + https://github.com/dotnet/roslyn - 3ce621cff1833477316d49712730f09e9a820679 + f5b6c715a742c56b7cc672e47385508fb4df98cc - + https://github.com/dotnet/msbuild - 24ee0c75a7c5a9924c68157ae7f8e0ce6c9adca3 + e2e438ef48eec8cf83d81cfc66cf3bb363ff5513 @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 1f68fcee45ca75a2cb780edaff1e695af4d4f787 + 3a52d07cd6a500d81d9cee79cbc8f0b9a90e1dbf diff --git a/eng/Versions.props b/eng/Versions.props index 75c16f619..156b0731f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-rc.1.23376.4 + 8.0.0-rc.1.23379.1 - 8.0.0-rc.1.23376.1 + 8.0.0-rc.1.23379.1 @@ -68,50 +68,50 @@ - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 + 8.0.0-rc.1.23378.7 + 8.0.0-rc.1.23378.7 + 8.0.0-rc.1.23378.7 + 8.0.0-rc.1.23378.7 + 8.0.0-rc.1.23378.7 + 8.0.0-rc.1.23378.7 + 8.0.0-rc.1.23378.7 0.2.0 - 8.0.100-rc.1.23378.3 - 8.0.100-rc.1.23378.3 - 8.0.100-rc.1.23378.3 + 8.0.100-rc.1.23381.2 + 8.0.100-rc.1.23381.2 + 8.0.100-rc.1.23381.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-1.23376.7 + 4.8.0-1.23378.8 - 8.0.0-rc.1.23376.5 + 8.0.0-rc.1.23380.3 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23376.5 + 8.0.0-rc.1.23380.3 + 8.0.0-rc.1.23380.3 + 8.0.0-rc.1.23380.3 + 8.0.0-rc.1.23380.3 + 8.0.0-rc.1.23380.3 + 8.0.0-rc.1.23380.3 2.1.0 - 8.0.0-rc.1.23377.2 - 8.0.0-rc.1.23377.2 - 8.0.0-rc.1.23377.2 - 8.0.0-rc.1.23377.2 + 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23380.1 @@ -241,7 +241,7 @@ 13.3.8646-net8-p6 16.4.8646-net8-p6 - 8.0.0-rc.1.23368.3 + 8.0.0-rc.1.23377.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/runtime/0002-Update-API-compat-suppressions.patch b/src/SourceBuild/patches/runtime/0002-Update-API-compat-suppressions.patch deleted file mode 100644 index 896a3f103..000000000 --- a/src/SourceBuild/patches/runtime/0002-Update-API-compat-suppressions.patch +++ /dev/null @@ -1,371 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Mon, 24 Jul 2023 15:38:58 -0500 -Subject: [PATCH] Update API compat suppressions - -Backport: https://github.com/dotnet/runtime/issues/89206 ---- - .../src/CompatibilitySuppressions.xml | 306 ------------------ - .../src/CompatibilitySuppressions.xml | 8 + - 2 files changed, 8 insertions(+), 306 deletions(-) - -diff --git a/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml b/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml -index 8186f7b52a9..00e095e354e 100644 ---- a/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml -+++ b/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml -@@ -24,78 +24,6 @@ - ref/net8.0/System.Linq.Expressions.dll - lib/net8.0/System.Linq.Expressions.dll - -- -- CP0001 -- T:System.Linq.Expressions.Interpreter.LightLambda -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.CallSiteOps -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.Closure -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.RuntimeOps -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Linq.Expressions.Interpreter.LightLambda -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.CallSiteOps -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.Closure -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.RuntimeOps -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Linq.Expressions.Interpreter.LightLambda -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.CallSiteOps -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.Closure -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0001 -- T:System.Runtime.CompilerServices.RuntimeOps -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- - - CP0002 - M:System.Linq.Expressions.ElementInit.get_ArgumentCount -@@ -168,244 +96,10 @@ - ref/net8.0/System.Linq.Expressions.dll - lib/net8.0/System.Linq.Expressions.dll - -- -- CP0002 -- M:System.Linq.Expressions.ElementInit.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.ElementInit.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.IndexExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.IndexExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.InvocationExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.InvocationExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.LambdaExpression.get_CanCompileToIL -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.LambdaExpression.get_CanInterpret -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.MethodCallExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.MethodCallExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.NewExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.NewExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.ElementInit.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.ElementInit.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.IndexExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.IndexExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.InvocationExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.InvocationExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.LambdaExpression.get_CanCompileToIL -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.LambdaExpression.get_CanInterpret -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.MethodCallExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.MethodCallExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.NewExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.NewExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.ElementInit.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.ElementInit.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.IndexExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.IndexExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.InvocationExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.InvocationExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.LambdaExpression.get_CanCompileToIL -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.LambdaExpression.get_CanInterpret -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.MethodCallExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.MethodCallExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.NewExpression.get_ArgumentCount -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0002 -- M:System.Linq.Expressions.NewExpression.GetArgument(System.Int32) -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- - - CP0020 - M:System.Linq.Expressions.DynamicExpressionVisitor.#ctor - ref/net8.0/System.Linq.Expressions.dll - lib/net8.0/System.Linq.Expressions.dll - -- -- CP0020 -- M:System.Linq.Expressions.DynamicExpressionVisitor.#ctor -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/ios/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0020 -- M:System.Linq.Expressions.DynamicExpressionVisitor.#ctor -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/maccatalyst/lib/net8.0/System.Linq.Expressions.dll -- -- -- CP0020 -- M:System.Linq.Expressions.DynamicExpressionVisitor.#ctor -- ref/net8.0/System.Linq.Expressions.dll -- runtimes/tvos/lib/net8.0/System.Linq.Expressions.dll -- - -\ No newline at end of file -diff --git a/src/libraries/System.Private.CoreLib/src/CompatibilitySuppressions.xml b/src/libraries/System.Private.CoreLib/src/CompatibilitySuppressions.xml -index 6ee3efba01f..e4ba9d6bbb8 100644 ---- a/src/libraries/System.Private.CoreLib/src/CompatibilitySuppressions.xml -+++ b/src/libraries/System.Private.CoreLib/src/CompatibilitySuppressions.xml -@@ -4,17 +4,25 @@ - - CP0001 - T:Internal.Console -+ ref/net8.0/System.Private.CoreLib.dll -+ lib/net8.0/System.Private.CoreLib.dll - - - CP0001 - T:System.Runtime.CompilerServices.ICastable -+ ref/net8.0/System.Private.CoreLib.dll -+ lib/net8.0/System.Private.CoreLib.dll - - - CP0002 - F:System.Resources.ResourceManager.BaseNameField -+ ref/net8.0/System.Private.CoreLib.dll -+ lib/net8.0/System.Private.CoreLib.dll - - - CP0002 - F:System.Resources.ResourceSet.Reader -+ ref/net8.0/System.Private.CoreLib.dll -+ lib/net8.0/System.Private.CoreLib.dll - - -\ No newline at end of file