Fix NuGet packaging

podNET-Hungary · Jul 15, 2024 · a6fdc29 · a6fdc29
1 parent 29bd0ad
commit a6fdc29
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/cd-nuget.yml b/.github/workflows/cd-nuget.yml
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
       - run: |
-              dotnet build src/EmbeddedTexts -c debug
-              dotnet test
+          dotnet pack ./src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj -c debug
+          dotnet test
       - run: dotnet pack -p:Version=$(echo ${{ github.ref_name }} | sed 's/^v//') -p:RepositoryCommit=${{ github.sha }}
       - run: dotnet nuget push ./artifacts/package/release/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
diff --git a/src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj b/src/EmbeddedTexts/PodNet.EmbeddedTexts.csproj
@@ -5,16 +5,15 @@
 		<PackageId>PodNet.EmbeddedTexts</PackageId>
 		<Description>A simple C# code generator that allows for embedding text file content into your code.</Description>
 		<PackageTags>EmbeddedTexts, PodNet, generator, embedded, texts, resx, resource, awesome</PackageTags>
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<InternalsVisibleTo Include="PodNet.EmbeddedTexts.Tests" />
-		
-		<PackageReference Include="PodNet.Analyzers.Core" Version="1.0.9" PrivateAssets="all" />
+
+		<PackageReference Include="PodNet.Analyzers.Core" Version="1.0.10" PrivateAssets="all" />
 		<PackageReference Include="PodNet.NuGet.Core" Version="1.0.4" PrivateAssets="all" />
 
 		<Content Include="build/*" PackagePath="build" />
 	</ItemGroup>
-
+	
 </Project>
diff --git a/tests/EmbeddedTexts.IntegrationTests/PodNet.EmbeddedTexts.IntegrationTests.csproj b/tests/EmbeddedTexts.IntegrationTests/PodNet.EmbeddedTexts.IntegrationTests.csproj
@@ -2,22 +2,17 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<RestoreAdditionalProjectSources>$(ArtifactsPath)/package</RestoreAdditionalProjectSources>
-		<PodNetEnableAnalyzerConfigSnapshot>true</PodNetEnableAnalyzerConfigSnapshot>
+		<RestoreAdditionalProjectSources>$(ArtifactsPath)\package</RestoreAdditionalProjectSources>
 	</PropertyGroup>
 
-	<Target Name="PackEmbeddedTexts" BeforeTargets="Restore; Compile; Test">
-		<MSBuild Projects="..\..\src\EmbeddedTexts\PodNet.EmbeddedTexts.csproj" Targets="Pack" />
-	</Target>
-
 	<ItemGroup>
-		
+
 		<PackageReference Include="MSTest" Version="3.4.3" />
-
-		<PackageReference Include="PodNet.Analyzers.ConfigSnapshotGenerator" Version="1.0.3" />
+
 		<PackageReference Include="PodNet.Analyzers.Testing" Version="1.0.3" />
-
-		<ProjectReference Include="..\..\src\EmbeddedTexts\PodNet.EmbeddedTexts.csproj" ReferenceOutputAssembly="false" />
+
+		<!-- Take note that the NuGet package has to be packed before the integration tests are executed. -->
+		<!-- Take care to empty the package from the local and global caches as needed. -->
 		<PackageReference Include="PodNet.EmbeddedTexts" Version="[0.0.0-debug]" />
 
 		<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
@@ -30,7 +25,7 @@
 		<AdditionalFiles Update="Files\CustomNamespace.txt" PodNet_EmbedTextNamespace="TestNamespace.TestSubNamespace" />
 		<AdditionalFiles Update="Files\CustomClassAndNamespace.txt" PodNet_EmbedTextNamespace="TestNamespace.TestSubNamespace" PodNet_EmbedTextClassName="TestClass" />
 		<AdditionalFiles Update="Files\Ignored\Unignored.txt" PodNet_EmbedText="true" />
-	
+
 	</ItemGroup>
 
 </Project>