Browse Source

Update workflow for inno installer

Ruben 1 year ago
parent
commit
1a48032a05

+ 1 - 6
.github/workflows/WinX64.yml

@@ -86,14 +86,9 @@ jobs:
       # Step 9: Generate the Inno Setup Installer
       - name: Generate Inno Setup variables
         run: |
-          $appVersion = "${{steps.get-version.outputs.assembly-version}}"
-          $outputDir = "${{ steps.paths.outputs.output_dir }}"
-          $setupOutputDir = "${{ steps.paths.outputs.output_dir }}\install"
-          $appIconPath = "${{ github.workspace }}\src\PicView.Avalonia.Win32\icon.ico"
-          $licenseFilePath = "${{ github.workspace }}\src\PicView.Core\Licenses\LICENSE.txt"
           
           # Create output directory for installer
-          New-Item -Path $setupOutputDir -ItemType Directory -Force
+          New-Item -Path ${{ steps.paths.outputs.output_dir }}\install -ItemType Directory -Force
         
         shell: pwsh
 

+ 2 - 1
Build/install.iss

@@ -1,5 +1,6 @@
 #define MyAppName "PicView"
 #define MyAppVersion "{#MyAppVersion}"
+#define MyAppVersionInfo "{#MyAppVersionInfo}"
 #define MyAppPublisher "Ruben2776"
 #define MyAppExeName "{#MyAppExeName}"
 #define AppIcon "{#MyAppIcon}"
@@ -26,7 +27,7 @@ WizardStyle=modern
 UninstallDisplayIcon={app}\{#MyAppExeName}
 UninstallDisplayName={#MyAppName}
 ChangesAssociations=yes
-VersionInfoVersion={#MyAppVersion}
+VersionInfoVersion={#MyAppVersionInfo}
 
 [Files]
 Source: "{#MyAppOutputDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs

+ 2 - 2
src/PicView.Avalonia.Win32/PicView.Avalonia.Win32.csproj

@@ -23,8 +23,8 @@
     <AssemblyName>PicView</AssemblyName>
     <StartupObject>PicView.Avalonia.Win32.Program</StartupObject>
     <LangVersion>preview</LangVersion>
-    <AssemblyVersion>3.0.0.3</AssemblyVersion>
-    <FileVersion>3.0.0.3</FileVersion>
+    <AssemblyVersion>3.0.400</AssemblyVersion>
+    <FileVersion>3.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>