Merge pull request #47 from XanatosX/master

Bring develop history up to date
XanatosX · Feb 21, 2023 · f2dc2e5 · f2dc2e5
2 parents b7243b6 + 33420aa
commit f2dc2e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/create-live-build.yml b/.github/workflows/create-live-build.yml
@@ -103,7 +103,12 @@ jobs:
              echo "BUILD_VERSION=${{ GITHUB.REF_NAME }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
            }
     - name: Pack application
-      run: dotnet pack -p:PackageOutputPath=${{ env.APPLICATION_PUBLISH_FOLDER }} -p:Version=${{ env.BUILD_VERSION }}
+      run: dotnet pack -p:PackageOutputPath=publish -p:Version=${{ env.BUILD_VERSION }}
+    - name: Move nuget to output
+      run: |
+        mkdir ${{ env.APPLICATION_PUBLISH_FOLDER }}
+        mv .\src\IL2CareerToolset\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
+        mv .\src\IL2CareerModel\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
     - name: Show content for debug
       if: ${{ env.DEBUG == 'true' }}
       run: ls

diff --git a/.github/workflows/create-nightly-build.yml b/.github/workflows/create-nightly-build.yml
@@ -116,7 +116,12 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore
     - name: Pack application
-      run: dotnet pack -o ${{ env.APPLICATION_PUBLISH_FOLDER }} -p:Version=0.0.0
+      run: dotnet pack -p:PackageOutputPath=publish -p:Version=0.0.0
+    - name: Move nuget to output
+      run: |
+        mkdir ${{ env.APPLICATION_PUBLISH_FOLDER }}
+        mv .\src\IL2CareerToolset\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
+        mv .\src\IL2CareerModel\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
     - name: Show content for debug
       if: ${{ env.DEBUG == 'true' }}
       run: ls