refactor: solution structure

itmo-is-dev · May 1, 2024 · 5266645 · 5266645
1 parent 5883b3d
commit 5266645
Show file tree

Hide file tree

Showing 173 changed files with 3,830 additions and 3,531 deletions.
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -41,28 +41,15 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/*.Packages.props', '**/*.csproj') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
-
-      - name: move nuget config
-        run: |
-          mkdir .tmp-nuget-config
-          mv NuGet.config .tmp-nuget-config
-          
-      - name: build sources
-        run: |
-          for csproj in $(find src | grep csproj$)
-          do
-            dotnet build -c Release "$csproj"
-          done
-
-      - name: move nuget config back
-        run: |
-          mv .tmp-nuget-config/NuGet.config .
-          rm -rf .tmp-nuget-config
+            
+      - name: Restore
+        if: steps.cache-tests.output.cache-hit != 'true'
+        run: dotnet restore
 
       - name: Build
         if: steps.cache-tests.outputs.cache-hit != 'true'
-        run: dotnet build -c Release
+        run: dotnet build -c Debug
 
       - name: Test
         if: steps.cache-tests.outputs.cache-hit != 'true'
-        run: dotnet test -c Release --no-restore --no-build
+        run: dotnet test -c Debug --no-restore --no-build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -50,15 +50,8 @@ jobs:
       - name: exclude redundant projects and files
         if: ${{ steps.cache-packages.outputs.cache-hit != 'true' }}
         run: |
-          dotnet sln SourceKit.sln remove tests/SourceKit.Tests/SourceKit.Tests.csproj
           dotnet sln SourceKit.sln remove tests/SourceKit.Reflect.Tests/SourceKit.Reflect.Tests.csproj
-          dotnet sln SourceKit.sln remove SourceKit.Sample/SourceKit.Sample.csproj
-          dotnet sln SourceKit.sln remove samples/SourceKit.Generators.Grpc.Samples/SourceKit.Generators.Grpc.Samples.csproj
-          rm -rf SourceKit.Sample
-          rm -rf tests/SourceKit.Tests
           rm -rf tests/SourceKit.Reflect.Tests
-          rm -rf samples/SourceKit.Generators.Grpc.Samples
-          rm NuGet.config -f
 
       - name: restore
         if: ${{ steps.cache-packages.outputs.cache-hit != 'true' }}
@@ -74,18 +67,7 @@ jobs:
         if: ${{ steps.cache-packages.outputs.cache-hit != 'true' }}
         run: |
           rm -rf .packages
-          mkdir .packages
-          mv src/SourceKit/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.MustBePartial/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.MustBePartial.Annotations/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.MemberAccessibility/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.Nullable/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.Enumerable/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.Properties/bin/Release/*.nupkg .packages/
-          mv src/analyzers/SourceKit.Analyzers.Collections/bin/Release/*.nupkg .packages/
-          mv src/generators/SourceKit.Generators.Builder/bin/Release/*.nupkg .packages/
-          mv src/generators/SourceKit.Generators.Builder.Annotations/bin/Release/*.nupkg .packages/
-          mv src/generators/SourceKit.Generators.Grpc/bin/Release/*.nupkg .packages/
+          cp bin/packages .packages
   
   publish:
     name: publish

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,29 @@
 <Project>
+
     <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>12</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
+
     <PropertyGroup>
-        <PatchVersion>0</PatchVersion>
+        <NoWarn>$(NoWarn);NU5128</NoWarn>
     </PropertyGroup>
+
+    <PropertyGroup>
+        <PatchVersion>0-local</PatchVersion>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <SourceKitPackageOutputPath>
+            $([System.IO.Path]::Combine($(SolutionDir), 'bin', 'packages'))
+        </SourceKitPackageOutputPath>
+    </PropertyGroup>
+
+    <Target Name="CopyPackageToGlobalPath" AfterTargets="Pack" Condition="'$(SourceKitMovePackage)' == 'true'">
+        <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg"
+              DestinationFolder="$(SourceKitPackageOutputPath)"/>
+    </Target>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,46 +1,50 @@
 <Project>
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageVersion Include="Ben.Demystifier" Version="0.4.1"/>
-        <PackageVersion Include="coverlet.collector" Version="3.2.0"/>
-        <PackageVersion Include="FluentAssertions" Version="6.11.0"/>
-        <PackageVersion Include="FluentChaining" Version="1.0.4"/>
-        <PackageVersion Include="Google.Protobuf" Version="3.25.3"/>
-        <PackageVersion Include="Grpc.Tools" Version="2.56.2"/>
-        <PackageVersion Include="Humanizer.Core" Version="2.14.1"/>
-        <PackageVersion Include="Humanizer.Core.uk" Version="2.14.1"/>
-        <PackageVersion Include="Lokad.ILPack" Version="0.2.0"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.5.0"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.1"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.5.0"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0"/>
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0"/>
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
-        <PackageVersion Include="PolySharp" Version="1.13.2"/>
-        <PackageVersion Include="Sigil" Version="5.0.0"/>
-        <PackageVersion Include="System.Reflection.Emit" Version="4.7.0"/>
-        <PackageVersion Include="System.Reflection.Emit.ILGeneration" Version="4.7.0"/>
-        <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0"/>
-        <PackageVersion Include="SourceKit" Version="1.1.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.Collections" Version="1.0.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.Enumerable" Version="1.0.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.Nullable" Version="1.0.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.MustBePartial" Version="1.1.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.MustBePartial.Annotations" Version="1.1.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.Properties" Version="1.0.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Analyzers.MemberAccessibility" Version="1.0.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Generators.Builder" Version="1.2.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Generators.Builder.Annonataions" Version="1.2.$(PatchVersion)"/>
-        <PackageVersion Include="SourceKit.Generators.Grpc" Version="1.0.$(PatchVersion)"/>
-        <PackageVersion Include="xunit" Version="2.4.2"/>
-        <PackageVersion Include="Xunit.DependencyInjection.Demystifier" Version="8.0.1"/>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5"/>
-    </ItemGroup>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.9.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="SourceKit" Version="1.1.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.Collections" Version="1.0.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.Enumerable" Version="1.0.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.Nullable" Version="1.0.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.MustBePartial" Version="1.1.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.MustBePartial.Annotations" Version="1.1.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.Properties" Version="1.0.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Analyzers.MemberAccessibility" Version="1.0.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Generators.Builder" Version="1.2.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Generators.Builder.Annonataions" Version="1.2.$(PatchVersion)" />
+    <PackageVersion Include="SourceKit.Generators.Grpc" Version="1.0.$(PatchVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="Ben.Demystifier" Version="0.4.1" />
+    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
+    <PackageVersion Include="FluentChaining" Version="1.0.4" />
+    <PackageVersion Include="Google.Protobuf" Version="3.25.3" />
+    <PackageVersion Include="Grpc.Tools" Version="2.56.2" />
+    <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
+    <PackageVersion Include="Humanizer.Core.uk" Version="2.14.1" />
+    <PackageVersion Include="Lokad.ILPack" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="PolySharp" Version="1.13.2" />
+    <PackageVersion Include="Sigil" Version="5.0.0" />
+    <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageVersion Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
+    <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="Xunit.DependencyInjection.Demystifier" Version="8.0.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+  </ItemGroup>
 </Project>
diff --git a/NuGet.config b/NuGet.config
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
     <packageSources>
-        <add key="local-SourceKit" value="src/SourceKit/bin/Release"/>
-        <add key="local-Analyzers.Collections" value="src/analyzers/SourceKit.Analyzers.Collections/bin/Release"/>
-        <add key="local-Analyzers.Enumerable" value="src/analyzers/SourceKit.Analyzers.Enumerable/bin/Release"/>
-        <add key="local-Analyzers.MustBePartial" value="src/analyzers/SourceKit.Analyzers.MustBePartial/bin/Release"/>
-        <add key="local-Analyzers.MustBePartial.Annotations" value="src/analyzers/SourceKit.Analyzers.MustBePartial.Annotations/bin/Release"/>
-        <add key="local-Analyzers.Nullable" value="src/analyzers/SourceKit.Analyzers.Nullable/bin/Release"/>
-        <add key="local-Analyzers.MemberAccessibility" value="src/analyzers/SourceKit.Analyzers.MemberAccessibility/bin/Release"/>
-        <add key="local-Analyzers.Properties" value="src/analyzers/SourceKit.Analyzers.Properties/bin/Release"/>
-        <add key="local-Generators.Builder" value="src/generators/SourceKit.Generators.Builder/bin/Release"/>
-        <add key="local-Generators.Builder.Annotations" value="src/generators/SourceKit.Generators.Builder.Annotations/bin/Release"/>
-        <add key="local-Generators.Grpc" value="src/generators/SourceKit.Generators.Grpc/bin/Release"/>
+        <add key="local-SourceKit" value="bin/packages" />
     </packageSources>
-</configuration>
+    <packageSourceMapping>
+        <packageSource key="local-SourceKit">
+            <package pattern="SourceKit*" />
+        </packageSource>
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+    </packageSourceMapping>
+</configuration>
diff --git a/SourceKit.Sample/.editorconfig b/SourceKit.Sample/.editorconfig
diff --git a/SourceKit.Sample/Analyzers/Collections/Dictionary/KeyTypeDoesNotImplementEquatable.cs b/SourceKit.Sample/Analyzers/Collections/Dictionary/KeyTypeDoesNotImplementEquatable.cs
diff --git a/SourceKit.Sample/Analyzers/Collections/Dictionary/KeyTypeImplementsEquatable.cs b/SourceKit.Sample/Analyzers/Collections/Dictionary/KeyTypeImplementsEquatable.cs
diff --git a/SourceKit.Sample/Analyzers/DeclarationCouldBeConvertedToProperty/OnePublicField.cs b/SourceKit.Sample/Analyzers/DeclarationCouldBeConvertedToProperty/OnePublicField.cs
diff --git a/SourceKit.Sample/Analyzers/DeclarationCouldBeConvertedToProperty/PublicProperty.cs b/SourceKit.Sample/Analyzers/DeclarationCouldBeConvertedToProperty/PublicProperty.cs
diff --git a/SourceKit.Sample/Analyzers/DeclarationCouldBeConvertedToProperty/ReadonlyPublicField.cs b/SourceKit.Sample/Analyzers/DeclarationCouldBeConvertedToProperty/ReadonlyPublicField.cs
diff --git a/SourceKit.Sample/Analyzers/MustBePartial/NonPartialDerivative.cs b/SourceKit.Sample/Analyzers/MustBePartial/NonPartialDerivative.cs
diff --git a/SourceKit.Sample/Analyzers/Nullable/NullableDisable.cs b/SourceKit.Sample/Analyzers/Nullable/NullableDisable.cs
diff --git a/SourceKit.Sample/Analyzers/Nullable/NullableEnable.cs b/SourceKit.Sample/Analyzers/Nullable/NullableEnable.cs
diff --git a/SourceKit.Sample/Generators/ArrayQueryUsage.cs b/SourceKit.Sample/Generators/ArrayQueryUsage.cs