Merge pull request #60 from tonybaloney/use_nuget_packages

Use the nuget packages for the demo solution
tonybaloney · Jul 26, 2024 · 189c46f · 189c46f
2 parents f434169 + cf91169
commit 189c46f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 29 deletions.
diff --git a/.github/workflows/dotnet-publish-ci.yml b/.github/workflows/dotnet-publish-ci.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   DOTNET_VERSION: 8.0.x
-  NUGET_VERSION: 1.0.1
+  NUGET_VERSION: 1.0.2
 
 jobs:
   publish-github-packages:
@@ -39,13 +39,15 @@ jobs:
       - name: Publish NuGet package CSnakes.Runtime
         run: dotnet pack src/CSnakes.Runtime --no-build -c Release -o ./nuget -p:PackageVersion='${{ env.NUGET_VERSION }}' --version-suffix 'alpha${{ github.run_number }}'
 
-      - name: Publish to GitHub packages
-        run: dotnet nuget push ./nuget/*.nupkg --source "github"
-        env:
-          NUGET_API_KEY: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Publish NuGet packages as artifacts
         uses: actions/upload-artifact@v4
         with:
           name: nuget-packages
           path: ./nuget
+
+      - name: Publish to GitHub packages
+        run: dotnet nuget push ./nuget/*.nupkg --source "github"
+        env:
+          NUGET_API_KEY: ${{ secrets.GITHUB_TOKEN }}
+
+
diff --git a/.github/workflows/dotnet-publish-main.yml b/.github/workflows/dotnet-publish-main.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   DOTNET_VERSION: 8.0.x
-  NUGET_VERSION: 1.0.1
+  NUGET_VERSION: 1.0.2
 
 jobs:
   publish-github-packages:
@@ -39,11 +39,11 @@ jobs:
       - name: Publish NuGet package CSnakes.Runtime
         run: dotnet pack src/CSnakes.Runtime --no-build -c Release -o ./nuget -p:PackageVersion='${{ env.NUGET_VERSION }}' --version-suffix 'beta${{ github.run_number }}'
 
-      - name: Publish to GitHub packages
-        run: dotnet nuget push ./nuget/*.nupkg --source "nuget" --api-key ${{ secrets.NUGET_API_KEY }}
-
       - name: Publish NuGet packages as artifacts
         uses: actions/upload-artifact@v4
         with:
           name: nuget-packages
           path: ./nuget
+
+      - name: Publish to GitHub packages
+        run: dotnet nuget push ./nuget/*.nupkg --source "nuget" --api-key ${{ secrets.NUGET_API_KEY }}
diff --git a/nuget.config b/nuget.config
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="github" value="https://nuget.pkg.github.com/tonybaloney/index.json" />
-  </packageSources>
-  <packageSourceMapping>
-    <packageSource key="github">
-      <package pattern="CSnakes*" />
-    </packageSource>
-    <packageSource key="nuget">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="github" value="https://nuget.pkg.github.com/tonybaloney/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="github">
+      <package pattern="CSnakes*" />
+    </packageSource>
+    <packageSource key="nuget">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>
diff --git a/samples/ExamplePythonDependency/ExamplePythonDependency.csproj b/samples/ExamplePythonDependency/ExamplePythonDependency.csproj
@@ -30,7 +30,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="python" Version="3.12.4" />
+        <PackageReference Include="CSnakes" Version="1.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/QuickConsoleTest/Program.cs b/samples/QuickConsoleTest/Program.cs
@@ -1,6 +1,8 @@
 using Python.Generated;
 using PythonEnvironments;
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Text.Json;
 
 // See https://aka.ms/new-console-template for more information

diff --git a/samples/QuickConsoleTest/QuickConsoleTest.csproj b/samples/QuickConsoleTest/QuickConsoleTest.csproj
@@ -2,10 +2,15 @@
 
   <PropertyGroup>
 	<ProductName>Example Python Embedded Console App</ProductName>
-	  <TargetFramework>netstandard2.1</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 	  <OutputType>Exe</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CSnakes.Runtime" Version="1.0.1" />
+    <PackageReference Include="python" Version="3.12.4" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ExamplePythonDependency\ExamplePythonDependency.csproj" />
   </ItemGroup>

diff --git a/src/CSnakes/CSnakes.csproj b/src/CSnakes/CSnakes.csproj
@@ -21,6 +21,7 @@
 		  <Pack>True</Pack>
 		  <PackagePath>\</PackagePath>
 		</None>
+		<None Include="$(PKGSuperpower)\lib\netstandard2.0\Superpower.dll" CopyToOutputDirectory="PreserveNewest" />
 	</ItemGroup>
 
 	<PropertyGroup>