From 56dcc06f3f1cd2700bb0a981b869b34f58b688b0 Mon Sep 17 00:00:00 2001
From: Bob Davidson <bob@blendinteractive.com>
Date: Sat, 24 Sep 2022 10:16:33 -0500
Subject: [PATCH] Package adjustments and publishing update.

---
 .github/workflows/main.yml                    |  8 ++++++--
 .../BlendInteractive.Datastore.csproj         | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ee60348..ca9577e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,7 +33,11 @@ jobs:
           CERT_PASSWORD: ${{ secrets.CERT_PASSWORD }}
       - name: Clean up signing cert
         run: rm ./cert.p12
+      - name: Publish package to Github registry
+        run: dotnet nuget push ./out/*.nupkg -k "$GITHUB_AUTH_TOKEN" -s 'https://nuget.pkg.github.com/blendinteractive/index.json'
+        env:
+          GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
       - name: Publish package to Nuget public registry
-        run: dotnet nuget push ./out/*.nupkg -k "$NUGET_AUTH_TOKEN" -s 'https://nuget.pkg.github.com/blendinteractive/index.json'
+        run: dotnet nuget push ./out/*.nupkg -k "$NUGET_AUTH_TOKEN" -s 'https://api.nuget.org/v3/index.json'
         env:
-          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+          NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} 
diff --git a/src/BlendInteractive.Datastore/BlendInteractive.Datastore.csproj b/src/BlendInteractive.Datastore/BlendInteractive.Datastore.csproj
index 2e159c7..afa62d7 100644
--- a/src/BlendInteractive.Datastore/BlendInteractive.Datastore.csproj
+++ b/src/BlendInteractive.Datastore/BlendInteractive.Datastore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -6,10 +6,10 @@
     <PackageId>BlendInteractive.Datastore</PackageId>
     <Description>A minimalist SQL migration system and access pattern</Description>
 
-    <Version>1.0.1</Version>
-    <PackageVersion>1.0.1</PackageVersion>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
+    <Version>1.0.2</Version>
+    <PackageVersion>1.0.2</PackageVersion>
+    <AssemblyVersion>1.0.2.0</AssemblyVersion>
+    <FileVersion>1.0.2.0</FileVersion>
 
     <Authors>Blend Interactive</Authors>
     <Company>Blend Interactive</Company>
@@ -20,6 +20,8 @@
 
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PackageIcon>icon.png</PackageIcon>
+	<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+	<PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIconUrl />
 
     <PackageReleaseNotes>Initial Release</PackageReleaseNotes>
@@ -30,20 +32,21 @@
 
   <ItemGroup>
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
    <ItemGroup>
     <None Include="..\..\License">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>LICENSE.txt</PackagePath>
     </None>
     <None Include="..\..\README.md">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>README.md</PackagePath>
     </None>
     <None Include="..\..\icon.png">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>icon.png</PackagePath>
     </None>
   </ItemGroup>