Test replacing out-of-date actions

simshaun · Jan 16, 2023 · da82fd1 · da82fd1
1 parent 366bf51
commit da82fd1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 29 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -62,45 +62,25 @@ jobs:
 
       # Archive the App build
       - name: Create App archive
-        run: Compress-Archive -Path $env:Project_Directory\bin\Release\* -DestinationPath $env:Project_Directory\bin\$env:Portable_Archive
+        run: Compress-Archive -Path $env:Project_Directory\bin\Release\win-x64\publish\* -DestinationPath $env:Project_Directory\bin\$env:Portable_Archive
 
       # Get the name of the tag that was pushed
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
         shell: bash
-
+        
       # Create the release:  https://github.com/actions/create-release
       - name: Create release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions; you do not need to create your own token
         with:
           tag_name: build-release.${{ github.ref }}
-          release_name: ${{ steps.get_version.outputs.VERSION }}
+          name: ${{ steps.get_version.outputs.VERSION }}
           draft: false
           prerelease: false
-
-      # Upload release asset:   https://github.com/actions/upload-release-asset
-      - name: Upload portable ZIP
-        id: upload-release-asset-1
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.Project_Directory }}\bin\${{ env.Portable_Archive }}
-          asset_name: ${{ env.Portable_Archive }}
-          asset_content_type: application/zip
-
-      - name: Upload installer MSI
-        id: upload-release-asset-2
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.Installer_Directory }}\bin\Release\en-us\${{ env.Installer_Filename }}
-          asset_name: ${{ env.Installer_Filename }}
-          asset_content_type: application/zip
+          files: |
+            ${{ env.Installer_Directory }}/bin/Release/en-us/${{ env.Installer_Filename }}
+            ${{ env.Project_Directory }}/bin/${{ env.Portable_Archive }}  
diff --git a/PixelPalette.Installer/PixelPalette.Installer.wixproj b/PixelPalette.Installer/PixelPalette.Installer.wixproj
@@ -61,7 +61,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <ReleasePath>..\PixelPalette\bin\Release</ReleasePath>
+    <ReleasePath>..\PixelPalette\bin\Release\win-x64\publish</ReleasePath>
     <DefineConstants>HarvestPath=$(ReleasePath)</DefineConstants>
   </PropertyGroup>
   <Target Name="BeforeBuild">

diff --git a/PixelPalette/PixelPalette.csproj b/PixelPalette/PixelPalette.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.4.5</Version>
+    <Version>1.4.5.1</Version>
     <Authors>Shaun</Authors>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>