Skip to content

Commit 7033aef

Browse files
committed
Split off built-in code fixes into separate assembly
1 parent 164ae54 commit 7033aef

File tree

7 files changed

+29
-2
lines changed

7 files changed

+29
-2
lines changed

Analyzers.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<ProjectReference Include="..\Funcky.Analyzers\Funcky.Analyzers\Funcky.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
55
<ProjectReference Include="..\Funcky.Analyzers\Funcky.Analyzers.CodeFixes\Funcky.Analyzers.CodeFixes.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
66
<ProjectReference Include="..\Funcky.Analyzers\Funcky.BuiltinAnalyzers\Funcky.BuiltinAnalyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
7+
<ProjectReference Include="..\Funcky.Analyzers\Funcky.BuiltinAnalyzers.CodeFixes\Funcky.BuiltinAnalyzers.CodeFixes.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
78
</ItemGroup>
89
</Project>

Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<ProjectReference Include="..\Funcky.Analyzers.CodeFixes\Funcky.Analyzers.CodeFixes.csproj" />
2727
<ProjectReference Include="..\Funcky.Analyzers\Funcky.Analyzers.csproj" />
2828
<ProjectReference Include="..\Funcky.BuiltinAnalyzers\Funcky.BuiltinAnalyzers.csproj" />
29+
<ProjectReference Include="..\Funcky.BuiltinAnalyzers.CodeFixes\Funcky.BuiltinAnalyzers.CodeFixes.csproj" />
2930
</ItemGroup>
3031

3132
<ItemGroup>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<IsPackable>false</IsPackable>
5+
<LangVersion>preview</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
8+
<RootNamespace>Funcky.BuiltinAnalyzers</RootNamespace>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<!-- We use 2.7.0 for compatibility with VS 2019 and .NET Core SDK 3.x.
12+
See https://docs.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support for VS compatibility.-->
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="3.7.0" />
14+
</ItemGroup>
15+
<ItemGroup>
16+
<Compile Include="..\Funcky.BuiltinAnalyzers\CompilationExtensions.cs" />
17+
<Compile Include="..\Funcky.BuiltinAnalyzers\WellKnownMemberNames.cs" />
18+
</ItemGroup>
19+
</Project>

Funcky.Analyzers/Funcky.BuiltinAnalyzers/OptionNoneInvocationCodeFix.cs renamed to Funcky.Analyzers/Funcky.BuiltinAnalyzers.CodeFixes/OptionNoneInvocationCodeFix.cs

File renamed without changes.

Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
<LangVersion>preview</LangVersion>
66
<Nullable>enable</Nullable>
77
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
8-
<NoWarn>$(NoWarn);RS1038</NoWarn><!-- TODO: Split Funcky.BuiltinAnalyzers -->
98
</PropertyGroup>
109
<ItemGroup>
1110
<!-- We use 2.7.0 for compatibility with VS 2019 and .NET Core SDK 3.x.
1211
See https://docs.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support for VS compatibility.-->
1312
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="3.7.0" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="3.7.0" />
1513
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
1614
</ItemGroup>
1715
</Project>

Funcky.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Funcky.FsCheck", "Funcky.Fs
6262
EndProject
6363
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funcky.TrimmingTest", "Funcky.TrimmingTest\Funcky.TrimmingTest.csproj", "{F35DB62D-22A8-41E8-B3BB-CD9064974190}"
6464
EndProject
65+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funcky.BuiltinAnalyzers.CodeFixes", "Funcky.Analyzers\Funcky.BuiltinAnalyzers.CodeFixes\Funcky.BuiltinAnalyzers.CodeFixes.csproj", "{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}"
66+
EndProject
6567
Global
6668
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6769
Debug|Any CPU = Debug|Any CPU
@@ -136,6 +138,10 @@ Global
136138
{F35DB62D-22A8-41E8-B3BB-CD9064974190}.Debug|Any CPU.Build.0 = Debug|Any CPU
137139
{F35DB62D-22A8-41E8-B3BB-CD9064974190}.Release|Any CPU.ActiveCfg = Release|Any CPU
138140
{F35DB62D-22A8-41E8-B3BB-CD9064974190}.Release|Any CPU.Build.0 = Release|Any CPU
141+
{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142+
{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
143+
{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
144+
{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Release|Any CPU.Build.0 = Release|Any CPU
139145
EndGlobalSection
140146
GlobalSection(SolutionProperties) = preSolution
141147
HideSolutionNode = FALSE
@@ -149,6 +155,7 @@ Global
149155
{1EE94F73-967E-49D1-BA68-EA2783EA0244} = {18ED7503-3198-455D-861E-84841C48069C}
150156
{C1412F64-1D24-4245-8DC7-F4AF01815F58} = {18ED7503-3198-455D-861E-84841C48069C}
151157
{539432B9-1257-4237-91FD-5D237855765E} = {BBE35279-7416-4B9D-B89D-B6D1FF369681}
158+
{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2} = {BBE35279-7416-4B9D-B89D-B6D1FF369681}
152159
EndGlobalSection
153160
GlobalSection(ExtensibilityGlobals) = postSolution
154161
SolutionGuid = {1F800283-D010-4227-94C9-09C02B0411DE}

Funcky/Funcky.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<None Include="build/Funcky.targets" Pack="true" PackagePath="buildTransitive" />
5151
<None Include="..\README.md" Pack="true" PackagePath="\" />
5252
<None Include="$(ArtifactsPath)\bin\Funcky.BuiltinAnalyzers\$(Configuration.ToLowerInvariant())\Funcky.BuiltinAnalyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Link="analyzers/dotnet/cs/%(Filename)%(Extension)" />
53+
<None Include="$(ArtifactsPath)\bin\Funcky.BuiltinAnalyzers.CodeFixes\$(Configuration.ToLowerInvariant())\Funcky.BuiltinAnalyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Link="analyzers/dotnet/cs/%(Filename)%(Extension)" />
5354
<None Include="..\Funcky.Analyzers\Funcky.Analyzers.Package\tools\*.ps1" Pack="true" PackagePath="tools\%(FileName)%(Extension)" Link="analyzers/dotnet/cs/%(Filename)%(Extension)" />
5455
</ItemGroup>
5556
<ItemGroup>

0 commit comments

Comments
 (0)