Update to net8 and Apos.Shapes

Apostolique · Nov 22, 2023 · 1d40643 · 1d40643
1 parent b4d17d5
commit 1d40643
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,9 +21,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
     - name: Get version from tag
       run: |
         TAGVERSION=$(git describe --tags --abbrev=0)
@@ -43,14 +43,6 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: '14.x'
-    - name: rcedit icon fix
-      run: |
-        mkdir dep
-        cd dep
-        npm init -y
-        npm i rcedit
-        cd ..
-        wine dep/node_modules/rcedit/bin/rcedit-x64.exe ./artifacts/windows/Mitten.exe --set-icon ./Platforms/DesktopGL/Icon.ico --set-product-version "${{ env.TAGVERSION }}"
     - name: Publish Windows build to itch.io
       uses: josephbmanley/butler-publish-itchio-action@master
       env:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "buildDesktopGL",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Platforms/DesktopGL/bin/Debug/net6.0/Mitten.dll",
+            "program": "${workspaceFolder}/Platforms/DesktopGL/bin/Debug/net8/Mitten.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Platforms/DesktopGL",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
@@ -23,7 +23,7 @@
             "request": "launch",
             "preLaunchTask": "buildWindowsDX",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Platforms/WindowsDX/bin/Debug/net6.0-windows/Mitten.dll",
+            "program": "${workspaceFolder}/Platforms/WindowsDX/bin/Debug/net8-windows/Mitten.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Platforms/WindowsDX",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

diff --git a/Platforms/DesktopGL/DesktopGL.csproj b/Platforms/DesktopGL/DesktopGL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <AssemblyName>Mitten</AssemblyName>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -11,7 +11,7 @@
     <PublishTrimmed>true</PublishTrimmed>
     <PublishReadyToRun>false</PublishReadyToRun>
     <TieredCompilation>false</TieredCompilation>
-    <RuntimeIdentifiers>win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <NoBeautyFlag>True</NoBeautyFlag>
     <BeautyExcludes>SDL2*;libSDL2*;sdl2*;soft_oal*;openal*;MonoGame.Framework*</BeautyExcludes>
   </PropertyGroup>
@@ -21,7 +21,7 @@
     <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
     <PackageReference Include="Apos.Camera" Version="0.3.2" />
     <PackageReference Include="Apos.Input" Version="2.4.2" />
-    <PackageReference Include="Apos.Shapes" Version="0.1.10" />
+    <PackageReference Include="Apos.Shapes" Version="0.2.0" />
     <PackageReference Include="Apos.Spatial" Version="0.2.4" />
     <PackageReference Include="Apos.Tweens" Version="0.1.3" />
     <PackageReference Include="FontStashSharp.MonoGame" Version="1.2.8" />

diff --git a/Platforms/WindowsDX/WindowsDX.csproj b/Platforms/WindowsDX/WindowsDX.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8-windows</TargetFramework>
     <AssemblyName>Mitten</AssemblyName>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -18,7 +18,7 @@
     <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
     <PackageReference Include="Apos.Camera" Version="0.3.2" />
     <PackageReference Include="Apos.Input" Version="2.4.2" />
-    <PackageReference Include="Apos.Shapes" Version="0.1.10" />
+    <PackageReference Include="Apos.Shapes" Version="0.2.0" />
     <PackageReference Include="Apos.Spatial" Version="0.2.4" />
     <PackageReference Include="Apos.Tweens" Version="0.1.3" />
     <PackageReference Include="FontStashSharp.MonoGame" Version="1.2.8" />