From b9688fbc325c2a04a2f1ca61c70f1f7596611553 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 23:11:41 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#16173) [main] Update dependencies from dotnet/sdk - Remove backported roslyn-analyzers source-build patch --- eng/Version.Details.xml | 16 ++++----- eng/Versions.props | 6 ++-- ...e-syntax-lists-with-the-correct-type.patch | 34 ------------------- 3 files changed, 11 insertions(+), 45 deletions(-) delete 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 a8b59c02c..86285f4e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ <Uri>https://github.com/dotnet/test-templates</Uri> <Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23220.4"> + <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23220.8"> <Uri>https://github.com/dotnet/sdk</Uri> - <Sha>ddd34099073c212b5a8148737d93de8e0a458936</Sha> + <Sha>d10b3542facf2c12b82eb470df661be903354f0f</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23220.4"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23220.8"> <Uri>https://github.com/dotnet/sdk</Uri> - <Sha>ddd34099073c212b5a8148737d93de8e0a458936</Sha> + <Sha>d10b3542facf2c12b82eb470df661be903354f0f</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23220.4"> + <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23220.8"> <Uri>https://github.com/dotnet/sdk</Uri> - <Sha>ddd34099073c212b5a8148737d93de8e0a458936</Sha> + <Sha>d10b3542facf2c12b82eb470df661be903354f0f</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23220.4"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23220.8"> <Uri>https://github.com/dotnet/sdk</Uri> - <Sha>ddd34099073c212b5a8148737d93de8e0a458936</Sha> + <Sha>d10b3542facf2c12b82eb470df661be903354f0f</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.4.23213.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index caffbc76b..6b31e9e45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23220.4</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23220.4</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23220.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23220.8</MicrosoftDotNetCommonItemTemplatesPackageVersion> + <MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23220.8</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23220.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> 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 deleted file mode 100644 index 3ba45ee7b..000000000 --- a/src/SourceBuild/patches/roslyn-analyzers/0002-Generate-syntax-lists-with-the-correct-type.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Sam Harwell <Sam.Harwell@microsoft.com> -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<Document> 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)); - });