From 7322a400157b63b952a6ba609d637db8b0e1f205 Mon Sep 17 00:00:00 2001
From: "sc.venkatesh" <venkatesh@unity3d.com>
Date: Fri, 19 Sep 2025 10:01:53 +0800
Subject: [PATCH] Add support for Visual Studio 2026.

---
 CallstackTestProj/CallstackTestProj.csproj |  3 ++-
 UnityMixedCallstack.csproj                 | 15 +++++++++++++++
 source.extension.vsixmanifest              |  6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CallstackTestProj/CallstackTestProj.csproj b/CallstackTestProj/CallstackTestProj.csproj
index 1a4a59d..dacd638 100644
--- a/CallstackTestProj/CallstackTestProj.csproj
+++ b/CallstackTestProj/CallstackTestProj.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PlatformTarget>x64</PlatformTarget>
     <Platforms>AnyCPU;x64</Platforms>
+	<VSSdkPath Condition="'$(VisualStudioVersion.Contains(`18`))'">$(ProgramFiles)\Microsoft Visual Studio\2026A\VSSDK\</VSSdkPath>
     <VSSdkPath Condition="'$(VisualStudioVersion.Contains(`17`))'">$(ProgramFiles)\Microsoft Visual Studio\2022\Professional\VSSDK\</VSSdkPath>
     <VSSdkPath Condition="'$(VisualStudioVersion.Contains(`16`))'">$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Professional\VSSDK\</VSSdkPath>
     <ConcordSDKDir>$(VSSdkPath)VisualStudioIntegration\</ConcordSDKDir>
diff --git a/UnityMixedCallstack.csproj b/UnityMixedCallstack.csproj
index beec979..540f45f 100644
--- a/UnityMixedCallstack.csproj
+++ b/UnityMixedCallstack.csproj
@@ -5,6 +5,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <!-- <VSSDK140Install Condition="'$(VSSDK140Install)' == ''">$(MSBuildProgramFiles32)\Microsoft Visual Studio 14.0\VSSDK\</VSSDK140Install> -->
+    <VSSdkPath Condition="'$(VisualStudioVersion.Contains(`18`))'">$(ProgramFiles)\Microsoft Visual Studio\2026A\VSSDK\</VSSdkPath>
     <VSSdkPath Condition="'$(VisualStudioVersion.Contains(`17`))'">$(ProgramFiles)\Microsoft Visual Studio\2022\Professional\VSSDK\</VSSdkPath>
     <VSSdkPath Condition="'$(VisualStudioVersion.Contains(`16`))'">$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Professional\VSSDK\</VSSdkPath>
     <VsixType>v3</VsixType>
@@ -56,12 +57,26 @@
     <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
+    <VsVersion Condition="'$(VisualStudioVersion.Contains(`18`))'">VS2026</VsVersion>
     <VsVersion Condition="'$(VisualStudioVersion.Contains(`17`))'">VS2022</VsVersion>
     <VsVersion Condition="'$(VisualStudioVersion.Contains(`16`))'">VS2019</VsVersion>
     <OutputPath>bin\$(VsVersion)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(VsVersion)\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <Choose>
+    <When Condition="'$(VsVersion)' == 'VS2026'">
+      <PropertyGroup>
+        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+      </PropertyGroup>
+      <ItemGroup>
+        <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.4.33103.184" />
+        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.5.4065">
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+          <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.VisualStudio.Debugger.Engine" Version="17.0.2012801" />
+      </ItemGroup>
+    </When>	    
     <When Condition="'$(VsVersion)' == 'VS2022'">
       <PropertyGroup>
         <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
index 2d98cc9..cd37867 100644
--- a/source.extension.vsixmanifest
+++ b/source.extension.vsixmanifest
@@ -7,10 +7,10 @@
   </Metadata>
   <Installation>
     <!-- Enable/Disable as needed. For now enabled for VS2022-->
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
         <ProductArchitecture>amd64</ProductArchitecture>
     </InstallationTarget>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
         <ProductArchitecture>arm64</ProductArchitecture>
     </InstallationTarget>
     <!--
@@ -24,6 +24,6 @@
     <Asset Type="DebuggerEngineExtension" Path="UnityMixedCallstack.vsdconfig"/>
   </Assets>
   <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0, 18.0)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0, 19.0)" DisplayName="Visual Studio core editor" />
   </Prerequisites>
 </PackageManifest>
\ No newline at end of file