From f3180558af1036dd2150ae916633dd82b4959127 Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Tue, 21 Mar 2023 00:25:59 +0100
Subject: [PATCH 1/2] (#17) updated TargetFramework to net6.0-windows7.0

* Bumped GitExtensions.Extensibility
* Referenced Microsoft.VisualStudio.Composition
* Referenced Microsoft.VisualStudio.threading
---
 .../GitExtensions.PluginTemplate.csproj              |  9 ++++++---
 .../GitExtensions.PluginTemplate.csproj.user         | 12 ++++++++----
 .../Properties/launchSettings.json                   |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj
index c0e6c9b..4cb828b 100644
--- a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj
+++ b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <VersionPrefix>1.0.0</VersionPrefix>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
@@ -18,12 +19,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitExtensions.Extensibility" Version="0.1.1.40" />
+    <PackageReference Include="GitExtensions.Extensibility" Version="0.3.0.57" />
+    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
+    <PackageReference Include="Microsoft.VisualStudio.threading" Version="17.5.22" />
   </ItemGroup>
 
   <!--SourceLink support: https://github.com/dotnet/sourcelink -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <!--<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>-->
     <!--<PackageReference Include="Microsoft.SourceLink.AzureDevOpsServer.Git" Version="1.0.0" PrivateAssets="All"/>-->
     <!--<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.0.0" PrivateAssets="All"/>-->
diff --git a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj.user b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj.user
index 1d1ba20..3fa019d 100644
--- a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj.user
+++ b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj.user
@@ -1,8 +1,12 @@
 <Project>
   <PropertyGroup>
-    <GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath> <!-- path is relative to $(ProjectDir) -->
-    <GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion> <!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
-    <GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppYevor' -->
-    <GitExtensionsPath></GitExtensionsPath> <!-- for local builds (no download) -->
+    <!-- path is relative to $(ProjectDir) -->
+    <GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath>
+    <!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
+    <GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion>
+    <!-- 'GitHub' or 'AppYevor' -->
+    <GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource>
+    <!-- for local builds (no download) -->
+    <GitExtensionsPath>$(GitExtensionsDownloadPath)</GitExtensionsPath>
   </PropertyGroup>
 </Project>
diff --git a/src/GitExtensions.PluginTemplate/Properties/launchSettings.json b/src/GitExtensions.PluginTemplate/Properties/launchSettings.json
index 255b5a4..fc68c8c 100644
--- a/src/GitExtensions.PluginTemplate/Properties/launchSettings.json
+++ b/src/GitExtensions.PluginTemplate/Properties/launchSettings.json
@@ -2,7 +2,8 @@
   "profiles": {
     "GitExtensions.PluginTemplate": {
       "commandName": "Executable",
-      "executablePath": "$(GitExtensionsExecutablePath)"
+      "executablePath": "$(GitExtensionsExecutablePath)",
+      "workingDirectory": "$(MSBuildProjectDirectory)"
     }
   }
 }
\ No newline at end of file

From 6388295f38c938595a49ccfea38a4daf9c4bb8bb Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Wed, 22 Mar 2023 00:02:48 +0100
Subject: [PATCH 2/2] Implemented changes from discussion

* TargetFramework is now `net6.0-windows`
* Removed package references to Microsoft.VisualStudio.Composition & Microsoft.VisualStudio.Threading
* added a reference to the System.ComponentModel.Composition.dll that is provided by Git Extensions

Also, I bumped the AppVeyor image to VS2022 to get support for net6.0.
---
 appveyor.yml                                         |  2 +-
 .../GitExtensions.PluginTemplate.csproj              | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e82a590..c8f1395 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,7 +17,7 @@ max_jobs: 1
 
 # Build worker image (VM template)
 image:
-- Visual Studio 2019
+- Visual Studio 2022
 
 #---------------------------------#
 #       build configuration       #
diff --git a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj
index 4cb828b..152f748 100644
--- a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj
+++ b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <VersionPrefix>1.0.0</VersionPrefix>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -19,9 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitExtensions.Extensibility" Version="0.3.0.57" />
-    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
-    <PackageReference Include="Microsoft.VisualStudio.threading" Version="17.5.22" />
+    <PackageReference Include="GitExtensions.Extensibility" Version="0.3.*" />
   </ItemGroup>
 
   <!--SourceLink support: https://github.com/dotnet/sourcelink -->
@@ -41,8 +39,10 @@
     <Reference Include="ResourceManager">
       <HintPath>$(GitExtensionsPath)\ResourceManager.dll</HintPath>
     </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.ComponentModel.Composition">
+      <HintPath>$(GitExtensionsPath)\System.ComponentModel.Composition.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms, Version=6.0.*" />
   </ItemGroup>
 
   <!-- Pack as .nupkg with dependency on GitExtensions.Extensibility -->