Revert "refactor: smash together analyzers and code-fixes"

This reverts commit 1ef7b31.
earloc · Oct 26, 2024 · 8b0f023 · 8b0f023
1 parent 1ef7b31
commit 8b0f023
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 13 deletions.
diff --git a/TypealizR.sln b/TypealizR.sln
@@ -36,9 +36,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TypealizeR.Analyzers", "src\TypealizeR.Analyzers\TypealizeR.Analyzers.csproj", "{9900F54D-8EAB-470F-9936-BC14B24081F3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TypealizeR.Analyzers.CodeFixes", "src\TypealizeR.Analyzers.CodeFixes\TypealizeR.Analyzers.CodeFixes.csproj", "{9729BAAA-29C7-471A-A3EE-9F9409477E16}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TypealizeR.Analyzers.Tests", "src\TypealizeR.Analyzers.Test\TypealizeR.Analyzers.Tests.csproj", "{4B7D4786-87BE-45B5-A8F3-D3BD33E46AB0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F1ACB111-3C06-4CB5-B08B-3560F625EF7C}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\codeql.yml = .github\workflows\codeql.yml
+		.github\workflows\publish.yml = .github\workflows\publish.yml
+		.github\workflows\samples_lts.yml = .github\workflows\samples_lts.yml
+		.github\workflows\samples_sts.yml = .github\workflows\samples_sts.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -78,6 +87,10 @@ Global
 		{9900F54D-8EAB-470F-9936-BC14B24081F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9900F54D-8EAB-470F-9936-BC14B24081F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9900F54D-8EAB-470F-9936-BC14B24081F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9729BAAA-29C7-471A-A3EE-9F9409477E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9729BAAA-29C7-471A-A3EE-9F9409477E16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9729BAAA-29C7-471A-A3EE-9F9409477E16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9729BAAA-29C7-471A-A3EE-9F9409477E16}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B7D4786-87BE-45B5-A8F3-D3BD33E46AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B7D4786-87BE-45B5-A8F3-D3BD33E46AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B7D4786-87BE-45B5-A8F3-D3BD33E46AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,6 +104,7 @@ Global
 		{CFFB0876-CC7C-466C-9D76-FB1F025E2B80} = {38D4BAEB-9CA0-4868-B8A0-6CBADCB198AC}
 		{0E9B0505-3680-40A2-A0AC-31C9117D1A24} = {38D4BAEB-9CA0-4868-B8A0-6CBADCB198AC}
 		{9900F54D-8EAB-470F-9936-BC14B24081F3} = {9E311478-C17A-4D93-90BE-D94993A7020D}
+		{9729BAAA-29C7-471A-A3EE-9F9409477E16} = {9E311478-C17A-4D93-90BE-D94993A7020D}
 		{4B7D4786-87BE-45B5-A8F3-D3BD33E46AB0} = {9E311478-C17A-4D93-90BE-D94993A7020D}
 		{F1ACB111-3C06-4CB5-B08B-3560F625EF7C} = {0C8376C6-E8F7-40E2-959A-210C515B06E0}
 	EndGlobalSection

diff --git a/src/Playground.Console/Playground.Console.csproj b/src/Playground.Console/Playground.Console.csproj
@@ -11,6 +11,7 @@
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Playground.Common\Playground.Common.csproj" />
+        <ProjectReference Include="..\TypealizeR.Analyzers.CodeFixes\TypealizeR.Analyzers.CodeFixes.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\TypealizeR.Analyzers\TypealizeR.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\TypealizR\TypealizR.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
     </ItemGroup>

diff --git a/...eR.Analyzers/CodeFixResources.Designer.cs → ...rs.CodeFixes/CodeFixResources.Designer.cs b/...eR.Analyzers/CodeFixResources.Designer.cs → ...rs.CodeFixes/CodeFixResources.Designer.cs
diff --git a/...ypealizeR.Analyzers/CodeFixResources.resx → ...Analyzers.CodeFixes/CodeFixResources.resx b/...ypealizeR.Analyzers/CodeFixResources.resx → ...Analyzers.CodeFixes/CodeFixResources.resx
diff --git a/src/TypealizeR.Analyzers/ICodeFixer.cs → ...ealizeR.Analyzers.CodeFixes/ICodeFixer.cs b/src/TypealizeR.Analyzers/ICodeFixer.cs → ...ealizeR.Analyzers.CodeFixes/ICodeFixer.cs
diff --git a/src/TypealizeR.Analyzers.CodeFixes/TypealizeR.Analyzers.CodeFixes.csproj b/src/TypealizeR.Analyzers.CodeFixes/TypealizeR.Analyzers.CodeFixes.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>TypealizeR.Analyzers</RootNamespace>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PackageId>TypealizR.Analyzers.CodeFixes</PackageId>
+        <IsPackable>true</IsPackable>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <Title>TypealizR.Analyzers.CodeFixes</Title>
+        <Authors>earloc</Authors>
+        <Product>TypealizR</Product>
+        <PackageProjectUrl>https://github.com/earloc/TypealizR</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/earloc/TypealizR</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageOutputPath>../../bin</PackageOutputPath>
+        <DevelopmentDependency>true</DevelopmentDependency>
+        <IsRoslynComponent>true</IsRoslynComponent>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <IncludeBuildOutput>false</IncludeBuildOutput>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="../../README.md" Pack="true" PackagePath="\" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\TypealizeR.Analyzers\TypealizeR.Analyzers.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Update="CodeFixResources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="CodeFixResources.resx" />
+        <EmbeddedResource Update="CodeFixResources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="CodeFixResources.Designer.cs" />
+    </ItemGroup>
+
+</Project>
diff --git a/...eR.Analyzers/TypealizeRCodeFixProvider.cs → ...rs.CodeFixes/TypealizeRCodeFixProvider.cs b/...eR.Analyzers/TypealizeRCodeFixProvider.cs → ...rs.CodeFixes/TypealizeRCodeFixProvider.cs
diff --git a/...pealizeR.Analyzers/UseIndexerCodeFixer.cs → ...nalyzers.CodeFixes/UseIndexerCodeFixer.cs b/...pealizeR.Analyzers/UseIndexerCodeFixer.cs → ...nalyzers.CodeFixes/UseIndexerCodeFixer.cs
diff --git a/src/TypealizeR.Analyzers.Test/TypealizeR.Analyzers.Tests.csproj b/src/TypealizeR.Analyzers.Test/TypealizeR.Analyzers.Tests.csproj
@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\TypealizeR.Analyzers.CodeFixes\TypealizeR.Analyzers.CodeFixes.csproj" />
     <ProjectReference Include="..\TypealizeR.Analyzers\TypealizeR.Analyzers.csproj" />
   </ItemGroup>
 

diff --git a/src/TypealizeR.Analyzers/TypealizeR.Analyzers.csproj b/src/TypealizeR.Analyzers/TypealizeR.Analyzers.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
+
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     </PropertyGroup>
 
@@ -36,8 +37,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
-
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -46,17 +45,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Update="CodeFixResources.Designer.cs">
-          <DependentUpon>CodeFixResources.resx</DependentUpon>
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-        </Compile>
-        <Compile Update="Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
-        <EmbeddedResource Update="CodeFixResources.resx">
-          <LastGenOutput>CodeFixResources.Designer.cs</LastGenOutput>
-          <Generator>ResXFileCodeGenerator</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Update="Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
+        <Compile Update="Resources.Designer.cs" DesignTime="True" AutoGen="True"
+            DependentUpon="Resources.resx" />
+        <EmbeddedResource Update="Resources.resx" Generator="ResXFileCodeGenerator"
+            LastGenOutput="Resources.Designer.cs" />
     </ItemGroup>
 
 </Project>