cleanup

philosowaffle · Sep 24, 2023 · 672d335 · 672d335
1 parent 304e9de
commit 672d335
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -23,9 +23,6 @@ jobs:
       with:
         dotnet-version: ${{ matrix.dotnet }}
 
-    # - name: Install MAUI Workloads
-    #   run: dotnet workload install maui --ignore-failed-sources
-
     - name: Clean
       run: dotnet clean --configuration Debug && dotnet nuget locals all --clear
 

diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml
@@ -73,7 +73,7 @@ jobs:
       artifact: ${{ steps.win-ui-create-artifact.outputs.artifact }}
     strategy:
       matrix:
-        dotnet: [ '7.0' ]
+        dotnet: [ '7.0.400' ]
         framework: ['net7.0-windows10.0.22621.0']
         os: [ 'win10-x64' ]
 
@@ -96,20 +96,18 @@ jobs:
         uses: papeloto/action-zip@v1
         with:
           files: ${{ needs.publish-windows-console-exe-dist.outputs.artifact }}
-          dest: /dist/${{ matrix.os }}_${{ github.event.inputs.version }}.zip
+          dest: /dist/console_win_${{ github.event.inputs.version }}.zip
 
       - name: Create Zip for Win UI Release Artifact
         uses: papeloto/action-zip@v1
         with:
           files: ${{ needs.publish-ui-dist.outputs.artifact }}
-          dest: /dist/${{ matrix.os }}_${{ github.event.inputs.version }}-ui.zip
+          dest: /dist/ui_win_${{ github.event.inputs.version }}.zip
 
       - name: Create Release and Upload Artifacts
         uses: ncipollo/release-action@v1
         with:
-          artifacts: 
-            - "${{ github.workspace }}/dist/${{ matrix.os }}_${{ github.event.inputs.version }}.zip"
-            - "${{ github.workspace }}/dist/${{ matrix.os }}_${{ github.event.inputs.version }}-ui.zip"
+          artifacts: "${{ github.workspace }}/dist/console_win_${{ github.event.inputs.version }}.zip,${{ github.workspace }}/dist/ui_win_${{ github.event.inputs.version }}.zip"
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: v${{ github.event.inputs.version }}
           allowUpdates: true

diff --git a/src/ClientUI/ClientUI.csproj b/src/ClientUI/ClientUI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!--<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>-->
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.22621.0</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.22621.0</TargetFrameworks>
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
         <OutputType>Exe</OutputType>
@@ -53,7 +53,7 @@
         <MauiFont Include="Resources\Fonts\*" />
 
         <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-        <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
     </ItemGroup>
 
     <ItemGroup>
@@ -62,7 +62,10 @@
 
     <ItemGroup>
 		 <!-- Pinning this version fixes a dependency downgrade issue with Havit -->
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+		<!--https://github.com/dotnet/maui/issues/10775-->
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1">
+          <NoWarn>NU1603,NETSDK1023</NoWarn>
+        </PackageReference>
     </ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Common/Database/SettingsDb.cs b/src/Common/Database/SettingsDb.cs
@@ -39,7 +39,7 @@ private void Init()
 			{
 				var settings = _db.GetItem<Settings>("1");
 			}
-			catch (KeyNotFoundException k)
+			catch (KeyNotFoundException)
 			{
 				var success = _db.InsertItem("1", _defaultSettings);
 				if (!success)

diff --git a/src/SharedUI/SharedUI.csproj b/src/SharedUI/SharedUI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>