From b89ac1d41c6a88ca599dbb7054ee0f4c4f861d98 Mon Sep 17 00:00:00 2001
From: Andrew Welker <awelker@pepperdash.com>
Date: Fri, 3 Feb 2023 20:29:38 -0700
Subject: [PATCH] ci: correct more syntax

---
 .github/workflows/docker.yml                           | 10 ++++------
 .../Pepperdash Core/PepperDash_Core_4-Series.csproj    |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 627ec32..73b47b1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -42,7 +42,7 @@ jobs:
           SOLUTION_FILE: PepperDash Core 4-Series.sln
       # Build the solutions in the docker image
       - name: Build Solution        
-        run: msbuild "./$($Env:SOLUTION_PATH)/$($Env:SOLUTION_FILE).sln" -p:Platform="Any CPU" -p:Configuration="Debug -p:VersionPrefix=${{steps.setVersion.outputs.version}}"
+        run: msbuild .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}"
       - name: Create tag for non-rc builds
         if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
         run: |
@@ -63,10 +63,8 @@ jobs:
       - name: Add Github Packages source
         run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
       - name: Add nuget.org API Key
-        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
-      - name: Create nuget package
-        run: nuget pack "./Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj.nuspec" -version ${{ env.VERSION }}
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}      
       - name: Publish nuget package to Github registry
-        run: nuget push "./*.nupkg" -Source github
+        run: nuget push "./package/*.nupkg" -Source github
       - name: Publish nuget package to nuget.org
-        run: nuget push "./*.nupkg" -Source https://api.nuget.org/v3/index.json
\ No newline at end of file
+        run: nuget push "./package/*.nupkg" -Source https://api.nuget.org/v3/index.json
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj
index 1816199..bebb42d 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core_4-Series.csproj	
@@ -14,6 +14,7 @@
     <RepositoryUrl>https://github.com/PepperDash/PepperDashCore</RepositoryUrl>
     <PackageTags>crestron;4series;</PackageTags>
     <Version>$(Version)</Version>
+    <PackageOutputPath>../../package</PackageOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>