Update building workflow to .NET 8

imesense · Feb 29, 2024 · 130b498 · 130b498
1 parent 5eea90e
commit 130b498
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 39 deletions.
diff --git a/.github/workflows/build-hasher.yml b/.github/workflows/build-hasher.yml
@@ -38,7 +38,7 @@ jobs:
         - Debug
         - Release
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -54,7 +54,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -95,10 +95,9 @@ jobs:
         config:
         - Release
         runtime:
-        - win-x86
         - win-x64
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -114,7 +113,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -132,9 +131,9 @@ jobs:
           --configuration ${{ matrix.config }} `
           --runtime ${{ matrix.runtime }} `
           --self-contained true `
-          -p:PublishSingleFile=true `
-          -p:IncludeAllContentForSelfExtract=true `
-          -p:EnableCompressionInSingleFile=true `
+          -p:PublishAot=true `
+          -p:InvariantGlobalization=true `
+          -p:IsAotCompatible=true `
           -p:DebugSymbols=false `
           -p:DebugType=None
 

diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml
@@ -38,7 +38,7 @@ jobs:
         - Debug
         - Release
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -54,7 +54,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -94,7 +94,7 @@ jobs:
         - Debug
         - Release
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -110,7 +110,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -151,10 +151,9 @@ jobs:
         config:
         - Release
         runtime:
-        - win-x86
         - win-x64
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -170,7 +169,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -188,9 +187,9 @@ jobs:
           --configuration ${{ matrix.config }} `
           --runtime ${{ matrix.runtime }} `
           --self-contained true `
-          -p:PublishSingleFile=true `
-          -p:IncludeAllContentForSelfExtract=true `
-          -p:EnableCompressionInSingleFile=true `
+          -p:PublishAot=true `
+          -p:InvariantGlobalization=true `
+          -p:IsAotCompatible=true `
           -p:DebugSymbols=false `
           -p:DebugType=None
 
@@ -212,10 +211,9 @@ jobs:
         config:
         - Release
         runtime:
-        - win-x86
         - win-x64
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -231,7 +229,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -249,9 +247,9 @@ jobs:
           --configuration ${{ matrix.config }} `
           --runtime ${{ matrix.runtime }} `
           --self-contained true `
-          -p:PublishSingleFile=true `
-          -p:IncludeAllContentForSelfExtract=true `
-          -p:EnableCompressionInSingleFile=true `
+          -p:PublishAot=true `
+          -p:InvariantGlobalization=true `
+          -p:IsAotCompatible=true `
           -p:DebugSymbols=false `
           -p:DebugType=None
 
@@ -275,9 +273,9 @@ jobs:
         config:
         - Release
         runtime:
-        - win-x86
+        - win-x64
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -306,7 +304,6 @@ jobs:
 
     - name: Upload installer
       uses: actions/upload-artifact@v4
-      if: matrix.runtime == 'win-x86'
       with:
         name: installer-${{ matrix.runtime }}-${{ github.sha }}
         path: bin/SBLauncherInstaller.exe
diff --git a/.github/workflows/build-legacy.yml b/.github/workflows/build-legacy.yml
@@ -38,7 +38,7 @@ jobs:
         - Debug
         - Release
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -54,7 +54,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -95,10 +95,9 @@ jobs:
         config:
         - Release
         runtime:
-        - win-x86
         - win-x64
         framework:
-        - net7.0
+        - net8.0
 
     runs-on: ${{ matrix.system }}
 
@@ -114,7 +113,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache dependencies
       uses: actions/cache@v4

diff --git a/publish-hasher.bat b/publish-hasher.bat
@@ -3,5 +3,6 @@ dotnet publish src\ImeSense.Launchers.Belarus.CryptoHasher\ImeSense.Launchers.Be
     --runtime win-x64 ^
     -p:PublishAot=true ^
     -p:InvariantGlobalization=true ^
-    -p:IsAotCompatible=true
-
+    -p:IsAotCompatible=true ^
+    -p:DebugSymbols=false ^
+    -p:DebugType=None
diff --git a/publish-launcher.bat b/publish-launcher.bat
@@ -3,4 +3,6 @@ dotnet publish src\ImeSense.Launchers.Belarus.Avalonia\ImeSense.Launchers.Belaru
     --runtime win-x64 ^
     -p:PublishAot=true ^
     -p:InvariantGlobalization=true ^
-    -p:IsAotCompatible=true
+    -p:IsAotCompatible=true ^
+    -p:DebugSymbols=false ^
+    -p:DebugType=None
diff --git a/publish-updater.bat b/publish-updater.bat
@@ -3,4 +3,6 @@ dotnet publish src\ImeSense.Launchers.Belarus.Updater\ImeSense.Launchers.Belarus
     --runtime win-x64 ^
     -p:PublishAot=true ^
     -p:InvariantGlobalization=true ^
-    -p:IsAotCompatible=true
+    -p:IsAotCompatible=true ^
+    -p:DebugSymbols=false ^
+    -p:DebugType=None
diff --git a/src/ImeSense.Launchers.Belarus.Setup/Setup.iss b/src/ImeSense.Launchers.Belarus.Setup/Setup.iss
@@ -34,8 +34,8 @@ Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\bin\Release\win-x86\publish\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\bin\Release\win-x86\publish\SBLauncherUpdater.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\Release\win-x64\publish\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\Release\win-x64\publish\SBLauncherUpdater.exe"; DestDir: "{app}"; Flags: ignoreversion
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
@@ -45,4 +45,4 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent shellexec
 
 [UninstallDelete]
-Type: FilesAndOrDirs; Name: {app}
+Type: FilesAndOrDirs; Name: {app}