From 6df8f7eea750ded5dec22f4e27fa9cddecd584f0 Mon Sep 17 00:00:00 2001
From: Nicholas Dunnaway <nick@dunnaway.org>
Date: Mon, 15 Nov 2021 21:48:14 -0800
Subject: [PATCH] update workflow and nuget packages

---
 .github/workflows/nuget.release.yml           | 27 +++++++++++++------
 ...gitalroot.Valheim.Common.Extensions.csproj | 11 +++++---
 .../packages.lock.json                        | 14 +++++++---
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/nuget.release.yml b/.github/workflows/nuget.release.yml
index fb760bb..3d9b409 100644
--- a/.github/workflows/nuget.release.yml
+++ b/.github/workflows/nuget.release.yml
@@ -1,5 +1,7 @@
 name: NuGet Release
 
+concurrency: ci-${{ github.ref }}
+
 on:
   push:
     branches: [ main ] # Default release branch
@@ -14,13 +16,22 @@ env:
 jobs:
   call-workflow-nuget-release:
     uses: Digitalroot-Valheim/.github/.github/workflows/nuget.release.yml@main
+
     secrets:
-      awsaccesskeyid: ${{ secrets.NUGET_S3_REPO_KEY_ID }}
-      awssecretaccesskey: ${{ secrets.NUGET_S3_REPO_KEY_SECRET }}    
+      aws-access-key-id: ${{ secrets.NUGET_S3_REPO_KEY_ID }}
+      aws-secret-access-key: ${{ secrets.NUGET_S3_REPO_KEY_SECRET }}
+      #nexus-api-key: ${{ secrets.NEXUS_API_KEY }}
+      #nexus-cookies-header: ${{ secrets.NEXUS_COOKIE_HEADER }}
     with:
-      slnfilename: Digitalroot.Valheim.Common.Extensions
-      projfilename: Digitalroot.Valheim.Common.Extensions
-      #srcpath: src
-      #unittestpath: UnitTests
-      skipunittest: true
-      #awsregion: us-west-2
+      sln-file-name: Digitalroot.Valheim.Common.Extensions
+      proj-file-name: Digitalroot.Valheim.Common.Extensions
+      #src-path: src
+      #unit-test-path: UnitTests
+      skip-unit-tests: true
+      #force-assembly-version: true
+      #create-github-release: false
+      #aws-region: us-west-2
+      nuget-gh-upload: true
+      nuget-s3-upload: true
+      #nexus-enable-upload: true
+      #nexus-mod-id: 000
\ No newline at end of file
diff --git a/src/Digitalroot.Valheim.Common.Extensions/Digitalroot.Valheim.Common.Extensions.csproj b/src/Digitalroot.Valheim.Common.Extensions/Digitalroot.Valheim.Common.Extensions.csproj
index f7e0eec..a98a5ee 100644
--- a/src/Digitalroot.Valheim.Common.Extensions/Digitalroot.Valheim.Common.Extensions.csproj
+++ b/src/Digitalroot.Valheim.Common.Extensions/Digitalroot.Valheim.Common.Extensions.csproj
@@ -36,10 +36,6 @@
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Pfhoenix.Valheim.ModProjectReferences" Version="1.0.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\ico\ValheimRcon_black.png">
       <Pack>True</Pack>
@@ -47,4 +43,11 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.204.5" />
+    <PackageReference Include="UnityEngine.Modules" Version="[2019.4.32]">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Digitalroot.Valheim.Common.Extensions/packages.lock.json b/src/Digitalroot.Valheim.Common.Extensions/packages.lock.json
index ffba929..ed6e933 100644
--- a/src/Digitalroot.Valheim.Common.Extensions/packages.lock.json
+++ b/src/Digitalroot.Valheim.Common.Extensions/packages.lock.json
@@ -2,11 +2,17 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.6.2": {
-      "Pfhoenix.Valheim.ModProjectReferences": {
+      "Digitalroot.Valheim.Common.References": {
         "type": "Direct",
-        "requested": "[1.0.6, )",
-        "resolved": "1.0.6",
-        "contentHash": "uly1BGZy0hy67lIJFmVTB5kLVVqzvCnmBsU4PiI7ptAO17qb163EnC0HvI0+UnuuUHZbEVCoHHPCc44h1Uq2eg=="
+        "requested": "[0.204.5, )",
+        "resolved": "0.204.5",
+        "contentHash": "5+E+7FDWDKAYzL8A1GfBFWmxu2p6LLbd+D5PR79RCAVmJTn/b2cPXdTCiNNe5/msrcpdyaGT3GFra1AjY/V+aA=="
+      },
+      "UnityEngine.Modules": {
+        "type": "Direct",
+        "requested": "[2019.4.32, 2019.4.32]",
+        "resolved": "2019.4.32",
+        "contentHash": "7KmS0Nz+s89igz/tDBRk9PEmWqlwReQZf9E6tl6/uV5DndbaR5WInqis4y6Fwq1B++2leamS7qPffnW5+WQwUw=="
       }
     }
   }