Feat: Package is working again

AterraEngine · Jan 7, 2025 · c4378b5 · c4378b5
1 parent 871af0a
commit c4378b5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 203 deletions.
diff --git a/src/AterraEngine.Unions.Generators/AterraEngine.Unions.Generators.csproj b/src/AterraEngine.Unions.Generators/AterraEngine.Unions.Generators.csproj
@@ -6,13 +6,14 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
 
+        <IsDeveloperDependency>true</IsDeveloperDependency>
         <DevelopmentDependency>true</DevelopmentDependency>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <IsRoslynComponent>true</IsRoslynComponent>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <NoWarn>NU5128</NoWarn>
 
-        <IsPackable>true</IsPackable>
+        <!-- Package metadata -->
         <PackageId>AterraEngine.Unions.Generators</PackageId>
         <Version>3.4.0</Version>
         <Authors>Anna Sas</Authors>
@@ -28,22 +29,24 @@
         <PackageIcon>icon.png</PackageIcon>
     </PropertyGroup>
 
+    <!-- Include external files -->
     <ItemGroup>
         <None Include="../../LICENSE" Pack="true" PackagePath="" Visible="false"/>
         <None Include="../../README.md" Pack="true" PackagePath="" Visible="false"/>
         <None Include="../../assets/icon.png" Pack="true" PackagePath="" Visible="false"/>
     </ItemGroup>
 
+    <!-- Package dependencies -->
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all"/>
-        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" PrivateAssets="all"/>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all"/>
-        <PackageReference Include="CodeOfChaos.GeneratorTools" Version="0.6.0" PrivateAssets="all" GeneratePathProperty="true"/>
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" />
+        <PackageReference Include="CodeOfChaos.GeneratorTools" Version="0.6.0" PrivateAssets="all" GeneratePathProperty="true" />
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
-        <None Include="$(PkgCodeOfChaos_GeneratorTools)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+        <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+        <None Include="$(PkgCodeOfChaos_GeneratorTools)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     </ItemGroup>
 
 </Project>
diff --git a/src/AterraEngine.Unions/AterraEngine.Unions.csproj b/src/AterraEngine.Unions/AterraEngine.Unions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
@@ -32,12 +32,4 @@
         <!-- ProjectReference for the generator as an analyzer -->
         <ProjectReference Include="..\AterraEngine.Unions.Generators\AterraEngine.Unions.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
     </ItemGroup>
-
-    <!--  Fixes a "buggy feature  -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="IsExternalInit" Version="1.0.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
 </Project>
diff --git a/src/AterraEngine.Unions/NullableAttributes.cs b/src/AterraEngine.Unions/NullableAttributes.cs
diff --git a/tests/Tests.AterraEngine.Unions.Generators/Tests.AterraEngine.Unions.Generators.csproj b/tests/Tests.AterraEngine.Unions.Generators/Tests.AterraEngine.Unions.Generators.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CodeOfChaos.GeneratorTools" Version="0.6.0"/>
+        <PackageReference Include="CodeOfChaos.GeneratorTools" Version="1.0.7" />
         <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
             <PrivateAssets>all</PrivateAssets>

diff --git a/tests/Tests.AterraEngine.Unions/Tests.AterraEngine.Unions.csproj b/tests/Tests.AterraEngine.Unions/Tests.AterraEngine.Unions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/tests/Tests.AterraEngine.Unions/UnionExtraAttributeTest.cs b/tests/Tests.AterraEngine.Unions/UnionExtraAttributeTest.cs