Skip to content

Commit

Permalink
PROTOBUF-30 Added VS2017 support
Browse files Browse the repository at this point in the history
  • Loading branch information
mreu committed Apr 4, 2017
1 parent ad69aa4 commit dde18ab
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Protobuf/Protobuf.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{92014380-D403-4001-86DE-DD97D6708CC0}"
ProjectSection(SolutionItems) = preProject
Expand Down
4 changes: 2 additions & 2 deletions Protobuf/Protobuf/Properties/AssemblyInfo.shared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.*")]
[assembly: AssemblyFileVersion("1.9.0.0")]
[assembly: AssemblyVersion("1.10.*")]
[assembly: AssemblyFileVersion("1.10.0.0")]
2 changes: 1 addition & 1 deletion Protobuf/Protobuf/Protobuf.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<TargetFrameworkProfile />
Expand Down
2 changes: 1 addition & 1 deletion Protobuf/Protobuf/Protobuf.csproj.user
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<StartArguments>/rootsuffix Exp</StartArguments>
<StartAction>Program</StartAction>
<StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 12.0\Common7\IDE\\devenv.exe</StartProgram>
<StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory />
Expand Down
44 changes: 23 additions & 21 deletions Protobuf/Protobuf/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="5d89ec18-2175-4dc0-861a-9718edfa0be1" Version="1.9.0" Language="en-US" Publisher="Michael Reukauff" />
<DisplayName>Protobuf Language Service</DisplayName>
<Description xml:space="preserve">Protobuf Editor with Intellisense and Syntax Coloring for Googles Protobuf syntax.</Description>
<MoreInfo>http://visualstudiogallery.msdn.microsoft.com/4bc0f38c-b058-4e05-ae38-155e053c19c5</MoreInfo>
<Icon>Package.ico</Icon>
<PreviewImage>Protobuf_Large.png</PreviewImage>
<Tags>protobuf</Tags>
</Metadata>
<Installation>
<InstallationTarget Version="11.0" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="12.0" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="14.0" Id="Microsoft.VisualStudio.Pro" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,4.6)" />
<Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="[11.0,12.0)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Metadata>
<Identity Id="5d89ec18-2175-4dc0-861a-9718edfa0be1" Version="1.10.0" Language="en-US" Publisher="Michael Reukauff" />
<DisplayName>Protobuf Language Service</DisplayName>
<Description xml:space="preserve">Protobuf Editor with Intellisense and Syntax Coloring for Googles Protobuf syntax.</Description>
<MoreInfo>http://visualstudiogallery.msdn.microsoft.com/4bc0f38c-b058-4e05-ae38-155e053c19c5</MoreInfo>
<Icon>Package.ico</Icon>
<PreviewImage>Protobuf_Large.png</PreviewImage>
<Tags>protobuf</Tags>
</Metadata>
<Installation>
<InstallationTarget Version="[11.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[11.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[11.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,4.6)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26208.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>

0 comments on commit dde18ab

Please sign in to comment.