Merge branch 'main' into ps3-patch

Author: jvyden

.github/workflows/dotnet.yml

@@ -10,8 +10,12 @@ on:
 
 jobs:
   build:
-    name: Build, Test, and Upload Builds
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+    name: Build, Test, and Upload Builds (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET
@@ -21,25 +25,32 @@ jobs:
 
     - name: Set VERSION variable from tag (for tag pushes)
       if: ${{ contains(github.ref, 'refs/tags') }}
+      shell: bash
       run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
 
     - name: Set VERSION variable from tag (for normal commits)
+      shell: bash
       if: ${{ !contains(github.ref, 'refs/tags') }}
       run: echo "VERSION=0.0.0" >> $GITHUB_ENV
 
     - name: Print VERSION variable for debugging
+      shell: bash
       run: echo "$VERSION"
 
     - name: Restore
       run: dotnet restore
 
     - name: Publish for Linux x64
+      if: matrix.os == 'ubuntu-latest'
       run: dotnet publish -c Release -r linux-x64 --self-contained Refresher /p:Version=${VERSION}
 
     - name: Publish for Windows x64
-      run: dotnet publish -c Release -r win-x64 --self-contained Refresher /p:Version=${VERSION}
+      if: matrix.os == 'windows-latest'
+      shell: bash
+      run: dotnet publish -c Release -r win-x64 --self-contained Refresher //p:Version=${VERSION}
 
     - name: Upload Linux x64 build
+      if: matrix.os == 'ubuntu-latest'
       uses: actions/[email protected]
       with:
           name: "Refresher for Linux x64"
@@ -48,9 +59,10 @@ jobs:
           retention-days: 30
 
     - name: Upload Windows x64 build
+      if: matrix.os == 'windows-latest'
       uses: actions/[email protected]
       with:
           name: "Refresher for Windows x64"
-          path: "Refresher/bin/Release/net7.0/win-x64/publish/"
+          path: "Refresher/bin/Release/net7.0-windows/win-x64/publish/"
           if-no-files-found: error
           retention-days: 30

Refresher/Refresher.csproj

@@ -7,6 +7,7 @@
         <TargetFramework Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net7.0</TargetFramework>
         <TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net7.0-windows</TargetFramework>
         <ApplicationIcon>Resources\refresher.ico</ApplicationIcon>
+        <BuiltInComInteropSupport Condition="'$(TargetFramework)' == 'net7.0-windows'">true</BuiltInComInteropSupport>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -18,7 +19,7 @@
       <PackageReference Include="ELFSharp" Version="2.17.2" />
       <PackageReference Include="Eto.Forms" Version="2.7.5" />
       <PackageReference Include="Eto.Platform.Gtk" Version="2.7.5" />
-      <PackageReference Condition="'$(TargetFramework)' == 'net7.0-windows'" Include="Eto.Platform.Windows" Version="2.7.5" />
+      <PackageReference Condition="'$(TargetFramework)' == 'net7.0-windows'" Include="Eto.Platform.Wpf" Version="2.7.5" />
       <EmbeddedResource Include="Resources\refresher.ico" LogicalName="refresher.ico" />
       <PackageReference Include="FluentFTP" Version="47.1.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />