From 8a86e8eaa67c800a61512dcbce4327e6b90eb41c Mon Sep 17 00:00:00 2001
From: alterNERDtive <nerd@alternerd.tv>
Date: Fri, 16 Feb 2024 22:59:03 +0100
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFinitial=20work=20for=20net7=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .forgejo/workflows/create-release.yaml        |  2 +-
 .github/workflows/create-release.yaml         |  2 +-
 ExamplePlugin/ExamplePlugin.csproj            |  6 ++---
 ExamplePlugin/Properties/Settings.Designer.cs | 26 -------------------
 .../VoiceAttack-Framework-Test.csproj         |  2 +-
 .../VoiceAttack-Framework.csproj              |  4 +--
 6 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 ExamplePlugin/Properties/Settings.Designer.cs

diff --git a/.forgejo/workflows/create-release.yaml b/.forgejo/workflows/create-release.yaml
index 8d1bcfc..c828146 100644
--- a/.forgejo/workflows/create-release.yaml
+++ b/.forgejo/workflows/create-release.yaml
@@ -59,6 +59,6 @@ jobs:
           body: ${{ env.release_body }}
           files: |-
             VoiceAttack-Framework/bin/Release/alterNERDtive.YAVAPF.*nupkg
-            VoiceAttack-Framework/bin/Release/net48/VoiceAttack-Framework.*
+            VoiceAttack-Framework/bin/Release/net7/VoiceAttack-Framework.*
           draft: true
           api_key: '${{ secrets.RELEASE_TOKEN }}'
diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 5f279e5..7a67bfc 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -44,7 +44,7 @@ jobs:
       - name: Draft release
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "VoiceAttack-Framework/bin/Release/alterNERDtive.YAVAPF.*nupkg,VoiceAttack-Framework/bin/Release/net48/VoiceAttack-Framework.*"
+          artifacts: "VoiceAttack-Framework/bin/Release/alterNERDtive.YAVAPF.*nupkg,VoiceAttack-Framework/bin/Release/net7/VoiceAttack-Framework.*"
           bodyFile: "CHANGELOG.md"
           draft: true
           token: ${{ secrets.RELEASE_TOKEN }}
diff --git a/ExamplePlugin/ExamplePlugin.csproj b/ExamplePlugin/ExamplePlugin.csproj
index d7e698f..bb40f98 100644
--- a/ExamplePlugin/ExamplePlugin.csproj
+++ b/ExamplePlugin/ExamplePlugin.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <RootNamespace>alterNERDtive.Example</RootNamespace>
     <Nullable>enable</Nullable>
 
@@ -22,7 +22,7 @@
   <ItemGroup>
     <Reference Include="System.Net.Http" />
     <Reference Include="VoiceAttack">
-      <HintPath>C:\Program Files\VoiceAttack\VoiceAttack.exe</HintPath>
+      <HintPath>..\VoiceAttack.exe</HintPath>
       <Private>False</Private>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
diff --git a/ExamplePlugin/Properties/Settings.Designer.cs b/ExamplePlugin/Properties/Settings.Designer.cs
deleted file mode 100644
index 8c9570c..0000000
--- a/ExamplePlugin/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace alterNERDtive.Example.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/VoiceAttack-Framework-Test/VoiceAttack-Framework-Test.csproj b/VoiceAttack-Framework-Test/VoiceAttack-Framework-Test.csproj
index 837b75e..a53d3fe 100644
--- a/VoiceAttack-Framework-Test/VoiceAttack-Framework-Test.csproj
+++ b/VoiceAttack-Framework-Test/VoiceAttack-Framework-Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <RootNamespace>VoiceAttack_Framework_Test</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/VoiceAttack-Framework/VoiceAttack-Framework.csproj b/VoiceAttack-Framework/VoiceAttack-Framework.csproj
index 91029a4..554249f 100644
--- a/VoiceAttack-Framework/VoiceAttack-Framework.csproj
+++ b/VoiceAttack-Framework/VoiceAttack-Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>net7</TargetFrameworks>
     <RootNamespace>alterNERDtive.Yavapf</RootNamespace>
     <PackageId>alterNERDtive.YAVAPF</PackageId>
     <Version>0.2.0</Version>
@@ -45,7 +45,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Net.Http" />
     <Reference Include="VoiceAttack">
-      <HintPath>C:\Program Files\VoiceAttack\VoiceAttack.exe</HintPath>
+      <HintPath>..\VoiceAttack.exe</HintPath>
       <Private>False</Private>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>