From 28b0d23f12f5dfef0db1dd2acf3f2b9b530af71b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 08:49:04 -0500 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#16033) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marek Safar Co-authored-by: Michael Simons Co-authored-by: Dan Moseley --- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 50 ++++---- .../content/repo-projects/dotnet.proj | 3 +- .../content/repo-projects/sdk.proj | 3 +- ...e-syntax-lists-with-the-correct-type.patch | 34 +++++ ...CompilersToolsetVersion-instead-of-M.patch | 4 +- 6 files changed, 123 insertions(+), 87 deletions(-) create mode 100644 src/SourceBuild/patches/roslyn-analyzers/0002-Generate-syntax-lists-with-the-correct-type.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c96724546e93..74bd3acff660 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 + ccda873ce237812c455471f2a392ebc661aabc01 - + https://github.com/dotnet/windowsdesktop - e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 + ccda873ce237812c455471f2a392ebc661aabc01 - + https://github.com/dotnet/windowsdesktop - e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 + ccda873ce237812c455471f2a392ebc661aabc01 - + https://github.com/dotnet/windowsdesktop - e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 + ccda873ce237812c455471f2a392ebc661aabc01 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a - + https://github.com/dotnet/aspnetcore - 8968058c9e5fdfdd1242426a03dc80609997edab + 03e670f9854651b9995d57f8e87cef16022e739a https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - f0709ec5dc5ef9f7c61f383ef2ce3d2b85af77a2 + c7b5cc64c4b5e52e2d6c48998ecdcaac6275d423 - + https://github.com/dotnet/sdk - f0709ec5dc5ef9f7c61f383ef2ce3d2b85af77a2 + c7b5cc64c4b5e52e2d6c48998ecdcaac6275d423 - + https://github.com/dotnet/sdk - f0709ec5dc5ef9f7c61f383ef2ce3d2b85af77a2 + c7b5cc64c4b5e52e2d6c48998ecdcaac6275d423 - + https://github.com/dotnet/sdk - f0709ec5dc5ef9f7c61f383ef2ce3d2b85af77a2 + c7b5cc64c4b5e52e2d6c48998ecdcaac6275d423 - + https://github.com/dotnet/winforms - d5c99d71d02787c42753807e2271d42a01d5b2ca + f3a6aa1d4313472705cf3f00515a496c44552b10 - + https://github.com/dotnet/wpf - 599cce2fff315dd2c6d712436e890837cdc3ff3e + 1d410ee10c6ab3add926e47c08c5b4bd722a7968 - + https://github.com/dotnet/fsharp - 5b37dd5fea143baefbef2bd83836188af0815a30 + 4db8caad416fbf9f37b42ae76c82a47341c3ca8a - + https://github.com/dotnet/fsharp - 5b37dd5fea143baefbef2bd83836188af0815a30 + 4db8caad416fbf9f37b42ae76c82a47341c3ca8a @@ -142,13 +142,13 @@ 1541fc31ead99a358c649e7e9fa203e0dd4d20a5 - + https://github.com/dotnet/runtime - 048467b13160399d493b97a90b2117f58f01ac51 + db7ca5d87eb3cd83bbc77487eb97dec07f74abf8 - + https://github.com/dotnet/roslyn - d78a163b525fd73efb768f4f0095590f9ade3469 + a6a78dd64fc1eb466113ece272747a72d497aad7 @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e4089ed2abe29bdc25bab2c261940175d0846824 + 2327f6b63d887979222f5bcf15f3322f800b9695 diff --git a/eng/Versions.props b/eng/Versions.props index ef255685d3fc..a6bf98b5a87e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.4.23177.3 + 8.0.0-preview.4.23213.11 - 8.0.0-preview.4.23178.1 + 8.0.0-preview.5.23218.2 @@ -65,50 +65,50 @@ - 8.0.0-preview.4.23214.15 - 8.0.0-preview.4.23214.15 - 8.0.0-preview.4.23214.15 - 8.0.0-preview.4.23214.15 - 8.0.0-preview.4.23214.15 - 8.0.0-preview.4.23214.15 - 8.0.0-preview.4.23214.15 + 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23219.8 0.2.0 - 8.0.100-preview.4.23217.22 - 8.0.100-preview.4.23217.22 - 8.0.100-preview.4.23217.22 + 8.0.100-preview.4.23220.3 + 8.0.100-preview.4.23220.3 + 8.0.100-preview.4.23220.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-3.23212.2 + 4.7.0-1.23219.11 - 8.0.0-preview.4.23217.4 + 8.0.0-preview.4.23219.11 - 8.0.0-preview.4.23217.4 - 8.0.0-preview.4.23217.4 - 8.0.0-preview.4.23217.4 - 8.0.0-preview.4.23217.4 - 8.0.0-preview.4.23217.4 - 8.0.0-preview.4.23217.4 + 8.0.0-preview.4.23219.11 + 8.0.0-preview.4.23219.11 + 8.0.0-preview.4.23219.11 + 8.0.0-preview.4.23219.11 + 8.0.0-preview.4.23219.11 + 8.0.0-preview.4.23219.11 2.1.0 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23218.3 + 8.0.0-preview.4.23218.3 + 8.0.0-preview.4.23218.3 + 8.0.0-preview.4.23218.3 @@ -231,7 +231,7 @@ 13.1.462-net8-p3 16.1.1250-net8-p3 - 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23218.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 0a9a4ececb8a..9191da3fd609 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -32,7 +32,8 @@ - + + diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 050dabf285d1..e5d60dd8c352 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -26,7 +26,8 @@ - + + diff --git a/src/SourceBuild/patches/roslyn-analyzers/0002-Generate-syntax-lists-with-the-correct-type.patch b/src/SourceBuild/patches/roslyn-analyzers/0002-Generate-syntax-lists-with-the-correct-type.patch new file mode 100644 index 000000000000..3ba45ee7b947 --- /dev/null +++ b/src/SourceBuild/patches/roslyn-analyzers/0002-Generate-syntax-lists-with-the-correct-type.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Sam Harwell +Date: Wed, 19 Apr 2023 16:21:45 -0500 +Subject: [PATCH] Generate syntax lists with the correct type + +Backport: https://github.com/dotnet/roslyn-analyzers/pull/6596 +--- + .../CSharpDynamicInterfaceCastableImplementation.Fixer.cs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDynamicInterfaceCastableImplementation.Fixer.cs b/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDynamicInterfaceCastableImplementation.Fixer.cs +index a82b96d21..289f6f8ba 100644 +--- a/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDynamicInterfaceCastableImplementation.Fixer.cs ++++ b/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDynamicInterfaceCastableImplementation.Fixer.cs +@@ -163,8 +163,8 @@ SyntaxNode GeneratePropertyImplementation(IPropertySymbol property) + SyntaxFactory.List( + new[] + { +- generator.WithStatements(generator.GetAccessor(eventDeclaration, DeclarationKind.AddAccessor), defaultMethodBodyStatements), +- generator.WithStatements(generator.GetAccessor(eventDeclaration, DeclarationKind.RemoveAccessor), defaultMethodBodyStatements), ++ (AccessorDeclarationSyntax)generator.WithStatements(generator.GetAccessor(eventDeclaration, DeclarationKind.AddAccessor), defaultMethodBodyStatements), ++ (AccessorDeclarationSyntax)generator.WithStatements(generator.GetAccessor(eventDeclaration, DeclarationKind.RemoveAccessor), defaultMethodBodyStatements), + }))); + } + +@@ -249,7 +249,7 @@ protected override async Task MakeMemberDeclaredOnImplementationTypeSt + var currentInvocation = (InvocationExpressionSyntax)node; + + var newArgList = currentInvocation.ArgumentList.WithArguments( +- SyntaxFactory.SingletonSeparatedList(generator.Argument(invocation.target)) ++ SyntaxFactory.SingletonSeparatedList((ArgumentSyntax)generator.Argument(invocation.target)) + .AddRange(currentInvocation.ArgumentList.Arguments)); + return currentInvocation.WithArgumentList(newArgList).WithExpression(SyntaxFactory.IdentifierName(symbol.Name)); + }); diff --git a/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch b/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch index 73945fa63716..d4869c8a8ff5 100644 --- a/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch +++ b/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch @@ -33,8 +33,8 @@ index 3d3d3a47d3..03e06be78d 100644 $(OutputPath)/Roslyn -- -+ +- ++