mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/sdk (#16173)

Browse source 
[main] Update dependencies from dotnet/sdk


 - Remove backported roslyn-analyzers source-build patch
This commit is contained in:
dotnet-maestro[bot] 2023-04-20 23:11:41 +00:00 committed by GitHub
parent cc52435c9b
commit b9688fbc32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -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">

6
eng/Versions.props
View file

@ -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>

34
src/SourceBuild/patches/roslyn-analyzers/0002-Generate-syntax-lists-with-the-correct-type.patch
View file

@ -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));
});