Skip to content

Commit accf272

Browse files
SkyppidSkyppid
committed
Fixes for VS19 upgrade
1 parent c1f4d3c commit accf272

File tree

9 files changed

+75
-69
lines changed

9 files changed

+75
-69
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "LinqLib"]
2+
path = LinqLib
3+
url = https://github.com/AmirLiberman/LinqLib.git

‎ArrayVisualizer.sln

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2005
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30517.126
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinForms", "WinForms", "{A61C476F-0130-40D7-9D34-BD914E2865E0}"
77
EndProject
@@ -50,7 +50,6 @@ Global
5050
{3795E735-B135-407A-A779-52E5231BF040}.Release|Any CPU.ActiveCfg = Release|Any CPU
5151
{3795E735-B135-407A-A779-52E5231BF040}.Release|Any CPU.Build.0 = Release|Any CPU
5252
{3795E735-B135-407A-A779-52E5231BF040}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
53-
{3795E735-B135-407A-A779-52E5231BF040}.Release|Mixed Platforms.Build.0 = Release|Any CPU
5453
{3795E735-B135-407A-A779-52E5231BF040}.Release|x86.ActiveCfg = Release|Any CPU
5554
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5655
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -60,7 +59,6 @@ Global
6059
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Release|Any CPU.ActiveCfg = Release|Any CPU
6160
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Release|Any CPU.Build.0 = Release|Any CPU
6261
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
63-
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
6462
{E26DC262-233B-4E57-B71B-5F3A50E8129F}.Release|x86.ActiveCfg = Release|Any CPU
6563
{9FD9CFC8-2F96-449A-A4E6-C5A10CCA87CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6664
{9FD9CFC8-2F96-449A-A4E6-C5A10CCA87CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -100,7 +98,6 @@ Global
10098
{D23115C0-DA59-45B7-9826-D03A7764F3AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
10199
{D23115C0-DA59-45B7-9826-D03A7764F3AF}.Release|Any CPU.Build.0 = Release|Any CPU
102100
{D23115C0-DA59-45B7-9826-D03A7764F3AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
103-
{D23115C0-DA59-45B7-9826-D03A7764F3AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
104101
{D23115C0-DA59-45B7-9826-D03A7764F3AF}.Release|x86.ActiveCfg = Release|Any CPU
105102
{BCD64B50-6DF1-4084-9590-92D1DF7596D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106103
{BCD64B50-6DF1-4084-9590-92D1DF7596D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -119,7 +116,6 @@ Global
119116
{95907A9E-FA6F-45DE-BCB1-D54F96AD083A}.Debug|x86.Build.0 = Debug|x86
120117
{95907A9E-FA6F-45DE-BCB1-D54F96AD083A}.Release|Any CPU.ActiveCfg = Release|x86
121118
{95907A9E-FA6F-45DE-BCB1-D54F96AD083A}.Release|Mixed Platforms.ActiveCfg = Release|x86
122-
{95907A9E-FA6F-45DE-BCB1-D54F96AD083A}.Release|Mixed Platforms.Build.0 = Release|x86
123119
{95907A9E-FA6F-45DE-BCB1-D54F96AD083A}.Release|x86.ActiveCfg = Release|x86
124120
{95907A9E-FA6F-45DE-BCB1-D54F96AD083A}.Release|x86.Build.0 = Release|x86
125121
EndGlobalSection

‎ArrayVisualizerExt/ArrayVisualizerExt.csproj

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
3-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,7 +13,7 @@
1413
<AssemblyName>ArrayVisualizerExt</AssemblyName>
1514
<SignAssembly>True</SignAssembly>
1615
<AssemblyOriginatorKeyFile>ArrayVisualizer.snk</AssemblyOriginatorKeyFile>
17-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1817
<SccProjectName>SAK</SccProjectName>
1918
<SccLocalPath>SAK</SccLocalPath>
2019
<SccAuxPath>SAK</SccAuxPath>
@@ -74,37 +73,9 @@
7473
<DeployExtension>False</DeployExtension>
7574
</PropertyGroup>
7675
<ItemGroup>
77-
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
78-
<EmbedInteropTypes>False</EmbedInteropTypes>
79-
</Reference>
80-
<Reference Include="envdte100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81-
<EmbedInteropTypes>True</EmbedInteropTypes>
82-
</Reference>
83-
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
84-
<EmbedInteropTypes>True</EmbedInteropTypes>
85-
</Reference>
86-
<Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
87-
<EmbedInteropTypes>True</EmbedInteropTypes>
88-
</Reference>
89-
<Reference Include="LinqLib, Version=1.0.4.2, Culture=neutral, PublicKeyToken=100a413726ba3d7c, processorArchitecture=MSIL">
90-
<HintPath>..\packages\LinqExtLibrary.1.0.4.2\lib\LinqLib.dll</HintPath>
91-
</Reference>
92-
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
93-
<EmbedInteropTypes>True</EmbedInteropTypes>
94-
</Reference>
95-
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
96-
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
97-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
98-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
99-
<Reference Include="Microsoft.VisualStudio.Shell.Interop" />
100-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
101-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
102-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
103-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
104-
<Reference Include="Syncfusion.Chart.WPF, Version=15.3460.0.33, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
105-
<Reference Include="Syncfusion.Core, Version=15.3460.0.33, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL" />
106-
<Reference Include="Syncfusion.Linq.Base, Version=15.3460.0.33, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
107-
<Reference Include="Syncfusion.Shared.WPF, Version=15.3460.0.33, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
76+
<Reference Include="Syncfusion.Chart.WPF, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
77+
<Reference Include="Syncfusion.Linq.Base, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
78+
<Reference Include="Syncfusion.Shared.WPF, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
10879
<Reference Include="System" />
10980
<Reference Include="System.Core" />
11081
<Reference Include="System.Design" />
@@ -168,7 +139,6 @@
168139
<ItemGroup>
169140
<None Include="app.config" />
170141
<None Include="ArrayVisualizer.snk" />
171-
<None Include="packages.config" />
172142
<None Include="Properties\Settings.settings">
173143
<Generator>SettingsSingleFileGenerator</Generator>
174144
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -258,6 +228,49 @@
258228
<Install>true</Install>
259229
</BootstrapperPackage>
260230
</ItemGroup>
231+
<ItemGroup>
232+
<PackageReference Include="EnvDTE">
233+
<Version>16.7.30508.193</Version>
234+
</PackageReference>
235+
<PackageReference Include="EnvDTE100">
236+
<Version>16.7.30328.74</Version>
237+
</PackageReference>
238+
<PackageReference Include="EnvDTE80">
239+
<Version>16.7.30328.74</Version>
240+
</PackageReference>
241+
<PackageReference Include="EnvDTE90">
242+
<Version>16.7.30328.74</Version>
243+
</PackageReference>
244+
<PackageReference Include="EnvDTE90a">
245+
<Version>16.7.30328.74</Version>
246+
</PackageReference>
247+
<PackageReference Include="LinqExtLibrary">
248+
<Version>1.0.4.2</Version>
249+
</PackageReference>
250+
<PackageReference Include="Microsoft.VisualStudio.CommandBars">
251+
<Version>16.7.30508.193</Version>
252+
</PackageReference>
253+
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop">
254+
<Version>16.7.30328.74</Version>
255+
</PackageReference>
256+
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
257+
<Version>16.7.30329.88</Version>
258+
</PackageReference>
259+
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework">
260+
<Version>16.7.30329.88</Version>
261+
</PackageReference>
262+
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop">
263+
<Version>16.7.30328.74</Version>
264+
</PackageReference>
265+
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop">
266+
<Version>16.7.30328.74</Version>
267+
</PackageReference>
268+
<PackageReference Include="Microsoft.VSSDK.BuildTools">
269+
<Version>16.7.3069</Version>
270+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
271+
<PrivateAssets>all</PrivateAssets>
272+
</PackageReference>
273+
</ItemGroup>
261274
<PropertyGroup>
262275
<UseCodebase>true</UseCodebase>
263276
</PropertyGroup>
@@ -279,14 +292,6 @@
279292
<PostBuildEvent>
280293
</PostBuildEvent>
281294
</PropertyGroup>
282-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
283-
<PropertyGroup>
284-
<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>
285-
</PropertyGroup>
286-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props'))" />
287-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets'))" />
288-
</Target>
289-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" />
290295
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
291296
Other similar extension points exist, see Microsoft.Common.targets.
292297
<Target Name="BeforeBuild">

‎ArrayVisualizerExt/ArrayVisualizerToolControl.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.10.0"
7-
xmlns:ArrayVisualizerControls="clr-namespace:ArrayVisualizerControls;assembly=ArrayVisualizerControls"
86
mc:Ignorable="d" d:DesignWidth="808" d:DesignHeight="600"
97
x:Class="ArrayVisualizerExt.ArrayVisualizerToolControl"
108
x:Name="ArrayVisualizerToolWindow">

‎ArrayVisualizerExt/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ArrayVisualizerExt/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ArrayVisualizerExt/app.config

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
1+
<?xml version="1.0" encoding="utf-8"?>
32
<configuration>
43
<configSections>
5-
<sectionGroup name="userSettings"
6-
type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
7-
<section name="ArrayVisualizerExt.Properties.Settings"
8-
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
9-
allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="ArrayVisualizerExt.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
106
</sectionGroup>
117
</configSections>
128
<userSettings>
@@ -32,6 +28,15 @@
3228
</ArrayVisualizerExt.Properties.Settings>
3329
</userSettings>
3430
<startup>
35-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
31+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
3632
</startup>
37-
</configuration>
33+
<runtime>
34+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
35+
<dependentAssembly>
36+
<assemblyIdentity name="Microsoft.VisualStudio.Shell.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
37+
<bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0"/>
38+
</dependentAssembly>
39+
</assemblyBinding>
40+
</runtime>
41+
42+
</configuration>

‎ArrayVisualizerExt/source.extension.vsixmanifest

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,20 @@
1515
<Tags>Visualization</Tags>
1616
</Metadata>
1717
<Installation>
18-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0,17.0)" />
19-
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
20-
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
18+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0,17.0)" />
19+
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
20+
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
2121
</Installation>
2222
<Dependencies>
2323
<Dependency d:Source="Installed" Id="Microsoft.VisualStudio.MPF" DisplayName="Visual Studio MPF" Version="[11.0,)" />
24-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
24+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.7.2,)" />
2525
</Dependencies>
2626
<Assets>
2727
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%"
2828
Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2929
</Assets>
3030
<Prerequisites>
31-
<Prerequisite Id="Microsoft.Net.Component.4.6.TargetingPack" Version="[15.0.26621.2,16.0)"
32-
DisplayName=".NET Framework 4.6 targeting pack" />
33-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26606.0,16.0)"
34-
DisplayName="Visual Studio core editor" />
31+
<Prerequisite Id="Microsoft.Net.Component.4.7.2.TargetingPack" Version="[16.7.30310.162,17.0)" DisplayName=".NET Framework 4.7.2 targeting pack" />
32+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.1.28811.260,17.0)" DisplayName="Visual Studio core editor" />
3533
</Prerequisites>
3634
</PackageManifest>

‎LinqLib

Submodule LinqLib added at c776448

0 commit comments

Comments
 (0)