Skip to content
This repository was archived by the owner on Aug 9, 2025. It is now read-only.

Commit d591f12

Browse files
author
VioletGiraffe
committed
Migration to VS 2017, build errors fixed
1 parent a6e0d5b commit d591f12

File tree

9 files changed

+33
-22
lines changed

9 files changed

+33
-22
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Backup*
44
CPPCheckPlugin/bin
55
CPPCheckPlugin/obj
66
CPPCheckPlugin.csproj.user
7+
storage.ide

‎CPPCheckPlugin.sln‎

Lines changed: 5 additions & 2 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 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26730.15
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPPCheckPlugin", "CPPCheckPlugin\CPPCheckPlugin.csproj", "{47946420-6C85-44FA-9E95-8FB46ADAC152}"
77
EndProject
@@ -19,4 +19,7 @@ Global
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {9006B35E-D161-4206-8DBE-33F21C5B373E}
24+
EndGlobalSection
2225
EndGlobal

‎CPPCheckPlugin/CPPCheckPlugin.csproj‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
4-
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4+
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
55
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
66
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
77
<FileUpgradeFlags>
88
</FileUpgradeFlags>
99
<UpgradeBackupLocation>
1010
</UpgradeBackupLocation>
1111
<OldToolsVersion>12.0</OldToolsVersion>
12+
<IsWebBootstrapper>false</IsWebBootstrapper>
13+
<TargetFrameworkProfile />
1214
<PublishUrl>publish\</PublishUrl>
1315
<Install>true</Install>
1416
<InstallFrom>Disk</InstallFrom>
@@ -21,10 +23,12 @@
2123
<MapFileExtensions>true</MapFileExtensions>
2224
<ApplicationRevision>0</ApplicationRevision>
2325
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
24-
<IsWebBootstrapper>false</IsWebBootstrapper>
2526
<UseApplicationTrust>false</UseApplicationTrust>
2627
<BootstrapperEnabled>true</BootstrapperEnabled>
2728
</PropertyGroup>
29+
<PropertyGroup>
30+
<ApplicationIcon>Resources\Package.ico</ApplicationIcon>
31+
</PropertyGroup>
2832
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2933
<PropertyGroup>
3034
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -38,7 +42,7 @@
3842
<AssemblyName>CppcheckPlugin</AssemblyName>
3943
<SignAssembly>True</SignAssembly>
4044
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
41-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
45+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
4246
</PropertyGroup>
4347
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4448
<DebugSymbols>true</DebugSymbols>
@@ -73,6 +77,8 @@
7377
</Reference>
7478
<Reference Include="Microsoft.CSharp" />
7579
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
80+
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
81+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
7682
<Reference Include="Microsoft.VisualStudio.Shell.Interop" />
7783
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7884
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -83,10 +89,9 @@
8389
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">
8490
<EmbedInteropTypes>true</EmbedInteropTypes>
8591
</Reference>
86-
<Reference Include="Microsoft.VisualStudio.Shell.11.0" />
8792
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
8893
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />
89-
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
94+
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
9095
<EmbedInteropTypes>True</EmbedInteropTypes>
9196
</Reference>
9297
<Reference Include="System" />

‎CPPCheckPlugin/CPPCheckPluginPackage.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
using System.Collections.Generic;
1111
using System.Linq;
1212
using System.Windows.Forms;
13-
using System.Threading.Tasks;
14-
using Microsoft.VisualStudio.VCProjectEngine;
1513

1614
namespace VSPackage.CPPCheckPlugin
1715
{
@@ -23,7 +21,7 @@ namespace VSPackage.CPPCheckPlugin
2321
[InstalledProductRegistration("#110", "#112", "1.2.0", IconResourceID = 400)]
2422
// This attribute is needed to let the shell know that this package exposes some menus.
2523
[ProvideMenuResource("Menus.ctmenu", 1)]
26-
[ProvideToolWindow(typeof(MainToolWindow), Style=VsDockStyle.Tabbed, Window=Microsoft.VisualStudio.Shell.Interop.ToolWindowGuids.Outputwindow, MultiInstances=false, Transient=false)]
24+
[ProvideToolWindow(typeof(MainToolWindow), Style = VsDockStyle.Tabbed, Window=Microsoft.VisualStudio.Shell.Interop.ToolWindowGuids.Outputwindow, MultiInstances=false, Transient=false)]
2725
[Guid(GuidList.guidCPPCheckPluginPkgString)]
2826
public sealed class CPPCheckPluginPackage : Package
2927
{

‎CPPCheckPlugin/MainToolWindowUI.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
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:vsp="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0"
6+
xmlns:vsp="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
77
mc:Ignorable="d"
88
d:DesignHeight="300" d:DesignWidth="300">
99
<Grid Background="{DynamicResource {x:Static vsp:EnvironmentColors.ToolWindowBackgroundBrushKey}}"

‎CPPCheckPlugin/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.

‎CPPCheckPlugin/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CPPCheckPlugin/app.config‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="VSPackage.CPPCheckPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" 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="VSPackage.CPPCheckPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<userSettings>
99
<VSPackage.CPPCheckPlugin.Properties.Settings>
1010
<setting name="CPPcheckPath" serializeAs="Xml">
1111
<value>
12-
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
13-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
12+
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
1413
<string>C:\Program Files (x86)\Cppcheck\cppcheck.exe</string>
1514
<string>C:\Program Files\Cppcheck\cppcheck.exe</string>
1615
</ArrayOfString>
@@ -20,7 +19,7 @@
2019
<value>False</value>
2120
</setting>
2221
<setting name="DefaultArguments" serializeAs="String">
23-
<value />
22+
<value/>
2423
</setting>
2524
<setting name="ProjectOnlyCheckCurrentConfig" serializeAs="String">
2625
<value>False</value>
@@ -39,4 +38,4 @@
3938
</setting>
4039
</VSPackage.CPPCheckPlugin.Properties.Settings>
4140
</userSettings>
42-
</configuration>
41+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>

‎CPPCheckPlugin/source.extension.vsixmanifest‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@
1212
<InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[11.0,15.0]" />
1313
</Installation>
1414
<Dependencies>
15-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
15+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
1616
<Dependency Id="Microsoft.VisualStudio.MPF" DisplayName="Visual Studio MPF" d:Source="Installed" Version="[11.0,)" />
1717
</Dependencies>
18+
<Prerequisites>
19+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[14.0,16.0)" />
20+
<Prerequisite Id="Microsoft.VisualStudio.Component.DiagnosticTools" Version="[14.0,16.0)" />
21+
<Prerequisite Id="Microsoft.VisualStudio.Shell.14.0" Version="[14.0]" />
22+
</Prerequisites>
1823
<Assets>
1924
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2025
</Assets>

0 commit comments

Comments
 (0)