Merge pull request #3 from drasticactions/merge-source-gen

Merge SourceGen library into Carpanet

Author: drasticactions

.github/workflows/nuget.yml

@@ -31,7 +31,6 @@ jobs:
           dotnet pack src/CarpaNet/CarpaNet.csproj --configuration Release --no-build --output nupkg
           dotnet pack src/CarpaNet.OAuth/CarpaNet.OAuth.csproj --configuration Release --no-build --output nupkg
           dotnet pack src/CarpaNet.Jetstream/CarpaNet.Jetstream.csproj --configuration Release --no-build --output nupkg
-          cp src/CarpaNet.SourceGen/bin/Release/*.nupkg nupkg/
 
       - name: Upload Nuget
         uses: actions/upload-artifact@v4

apps/StandardSiteGen/StandardSiteGen.csproj

@@ -27,7 +27,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <Import Project="..\..\src\CarpaNet.SourceGen\build\CarpaNet.SourceGen.targets" />
+  <Import Project="..\..\src\CarpaNet\build\CarpaNet.targets" />
 
   <ItemGroup>
     <LexiconResolve Include="com.atproto.repo.listRecords" />

samples/AuthTest/AuthTest.csproj

@@ -20,7 +20,7 @@
       OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <Import Project="..\..\src\CarpaNet.SourceGen\build\CarpaNet.SourceGen.targets" />
+  <Import Project="..\..\src\CarpaNet\build\CarpaNet.targets" />
 
   <ItemGroup>
     <LexiconResolve Include="app.bsky.actor.getProfile" />

samples/BSkyOAuth/BSkyOAuth.MacCatalyst/BSkyOAuth.MacCatalyst.csproj

@@ -29,7 +29,7 @@
                       ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <Import Project="../../../src/CarpaNet.SourceGen/build/CarpaNet.SourceGen.targets" />
+  <Import Project="../../../src/CarpaNet/build/CarpaNet.targets" />
 
   <ItemGroup>
     <LexiconResolve Include="app.bsky.actor.getProfile" />

samples/FirehoseTest/FirehoseTest.csproj

@@ -17,7 +17,7 @@
                       ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <Import Project="..\..\src\CarpaNet.SourceGen\build\CarpaNet.SourceGen.targets" />
+  <Import Project="..\..\src\CarpaNet\build\CarpaNet.targets" />
 
   <ItemGroup>
     <LexiconResolve Include="com.atproto.sync.subscribeRepos" />

samples/RemoteResolution/RemoteResolution.csproj

@@ -27,6 +27,6 @@
         <LexiconResolve Include="site.standard.graph.subscription" />
     </ItemGroup>
 
-    <Import Project="..\..\src\CarpaNet.SourceGen\build\CarpaNet.SourceGen.targets" />
+    <Import Project="..\..\src\CarpaNet\build\CarpaNet.targets" />
 
 </Project>

src/CarpaNet.SourceGen/CarpaNet.SourceGen.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -8,46 +8,19 @@
 
     <IsRoslynComponent>true</IsRoslynComponent>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-
-    <PackageId>CarpaNet.SourceGen</PackageId>
-    <Description>Generate bindings of ATProtocol Lexicon files for CarpaNet.</Description>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <DevelopmentDependency>true</DevelopmentDependency>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
     <PackageReference Include="System.Text.Json" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <ItemGroup Condition=" ('$(IsPackable)' == 'true') or ('$(PackAsTool)' == 'true') ">
-    <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath=""
-      Visible="false" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-    <None Include="$(PkgSystem_Text_Json)\lib\netstandard2.0\System.Text.Json.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\CarpaNet.BuildTasks\CarpaNet.BuildTasks.csproj"
                       ReferenceOutputAssembly="false"
-                      SkipGetTargetFrameworkProperties="true" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="build\CarpaNet.SourceGen.targets" Pack="true" PackagePath="build\" Visible="false" />
-    <None Include="build\CarpaNet.SourceGen.targets" Pack="true" PackagePath="buildTransitive\" Visible="false" />
-  </ItemGroup>
-
-  <!-- Pack the build task DLL into the NuGet package -->
-  <ItemGroup>
-    <None Include="..\CarpaNet.BuildTasks\bin\$(Configuration)\net8.0\CarpaNet.BuildTasks.dll"
-          Pack="true" PackagePath="tasks\net8.0\" Visible="false" />
+                      SkipGetTargetFrameworkProperties="true"
+                      GlobalPropertiesToRemove="TargetFramework" />
   </ItemGroup>
 
   <Import Project="..\..\Version.props" />