Skip to content

Commit 959b1a0

Browse files
authored
Vs2019 support and dropping VS2015 support (#11)
* Updating to support visual studio 2019 * Updating readme to reflect dropping of VS 2015 support and addition of VS2019 support * Removing migration backup files
1 parent ec9fdc8 commit 959b1a0

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Unity Mixed Callstack
22
=====
33

4-
UnityMixedCallstack is a Visual Studio 2015/2017 extension to help debug native applications embedding Mono, like Unity.
4+
UnityMixedCallstack is a Visual Studio 2017/2019 extension to help debug native applications embedding Mono, like Unity.
5+
6+
If you are using Visual Studio 2015 then you will need to grab one of the older releases of UnityMixedCallstack
57

68
Mono doesn't generate debug symbols that Visual Studio understands for jitted functions.
79

UnityMixedCallstack.csproj

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
43
<PropertyGroup>
54
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
65
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
76
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
8-
<VSSDK140Install Condition="'$(VSSDK140Install)' == ''">$(MSBuildProgramFiles32)\Microsoft Visual Studio 14.0\VSSDK\</VSSDK140Install>
7+
<!-- <VSSDK140Install Condition="'$(VSSDK140Install)' == ''">$(MSBuildProgramFiles32)\Microsoft Visual Studio 14.0\VSSDK\</VSSDK140Install> -->
8+
<VSSDK170Install Condition="'$(VSSDK170Install)' == ''">$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Professional\VSSDK\</VSSDK170Install>
99
<VsixType>v3</VsixType>
1010
<NuGetPackageImportStamp>
1111
</NuGetPackageImportStamp>
@@ -24,7 +24,7 @@
2424
<FileAlignment>512</FileAlignment>
2525
<GeneratePkgDefFile>false</GeneratePkgDefFile>
2626
<!--Root directory to Concord SDK install; includes the trailing backslash '\'.-->
27-
<ConcordSDKDir>$(VSSDK140Install)VisualStudioIntegration\</ConcordSDKDir>
27+
<ConcordSDKDir>$(VSSDK170Install)VisualStudioIntegration\</ConcordSDKDir>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3030
<DebugSymbols>true</DebugSymbols>
@@ -74,13 +74,19 @@
7474
</VsdConfigXmlFiles>
7575
</ItemGroup>
7676
<ItemGroup>
77-
<None Include="packages.config" />
7877
<None Include="source.extension.vsixmanifest">
7978
<SubType>Designer</SubType>
8079
</None>
8180
</ItemGroup>
81+
<ItemGroup>
82+
<PackageReference Include="Microsoft.VisualStudio.Sdk.BuildTasks.14.0">
83+
<Version>14.9.23</Version>
84+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
85+
<PrivateAssets>all</PrivateAssets>
86+
</PackageReference>
87+
</ItemGroup>
8288
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
83-
<Import Project="$(ConcordSDKDir)Tools\bin\Microsoft.VSDebugger.targets" />
89+
<Import Project="$(ConcordSDKDir)Tools\bin\Microsoft.VSSDK.Debugger.VSDConfigTool.targets" />
8490
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
8591
<PropertyGroup>
8692
<VsdConfigOutput>$(OutputPath)\UnityMixedCallStack.vsdconfig</VsdConfigOutput>
@@ -96,12 +102,4 @@
96102
</ItemGroup>
97103
<Message Text="VsdConfigOutput: $(VsdConfigOutput)" Importance="high" />
98104
</Target>
99-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
100-
<PropertyGroup>
101-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
102-
</PropertyGroup>
103-
<Error Condition="!Exists('packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
104-
<Error Condition="!Exists('packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
105-
</Target>
106-
<Import Project="packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.5.100\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
107105
</Project>

packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

source.extension.vsixmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Description xml:space="preserve">Visual Studio native debugger extension to help debug native applications using Mono. Originally developed by Jb Evain, Updated for Unity by Michael DeRoy and Jonathan Chambers</Description>
77
</Metadata>
88
<Installation>
9-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 15.0]" />
9+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0, 17.0]" />
1010
</Installation>
1111
<Dependencies>
1212
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
@@ -15,6 +15,6 @@
1515
<Asset Type="DebuggerEngineExtension" Path="UnityMixedCallstack.vsdconfig"/>
1616
</Assets>
1717
<Prerequisites>
18-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
18+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,)" DisplayName="Visual Studio core editor" />
1919
</Prerequisites>
2020
</PackageManifest>

0 commit comments

Comments
 (0)