Skip to content

Commit bcd2c3e

Browse files
jaredparjaredpar
authored
Merge pull request #18 from justcla/master
Upgraded to support VS2017
2 parents e39388e + 268c0ed commit bcd2c3e

File tree

4 files changed

+33
-40
lines changed

4 files changed

+33
-40
lines changed

‎EasyMotion/EasyMotion.csproj‎

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
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.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
4+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="'$(VisualStudioVersion)' != '14.0' And Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
35
<PropertyGroup>
4-
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
57
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
68
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
79
<FileUpgradeFlags>
@@ -18,6 +20,7 @@
1820
<ProjectGuid>{AAEF749E-2E47-407D-8289-ECC3003B9BB5}</ProjectGuid>
1921
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
2022
<OutputType>Library</OutputType>
23+
<VsixType>v3</VsixType>
2124
<AppDesignerFolder>Properties</AppDesignerFolder>
2225
<RootNamespace>EasyMotion</RootNamespace>
2326
<AssemblyName>EasyMotion</AssemblyName>
@@ -82,42 +85,6 @@
8285
<Reference Include="WindowsBase" />
8386
</ItemGroup>
8487
<ItemGroup>
85-
<COMReference Include="EnvDTE">
86-
<Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
87-
<VersionMajor>8</VersionMajor>
88-
<VersionMinor>0</VersionMinor>
89-
<Lcid>0</Lcid>
90-
<WrapperTool>primary</WrapperTool>
91-
<Isolated>False</Isolated>
92-
<EmbedInteropTypes>False</EmbedInteropTypes>
93-
</COMReference>
94-
<COMReference Include="EnvDTE100">
95-
<Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
96-
<VersionMajor>10</VersionMajor>
97-
<VersionMinor>0</VersionMinor>
98-
<Lcid>0</Lcid>
99-
<WrapperTool>primary</WrapperTool>
100-
<Isolated>False</Isolated>
101-
<EmbedInteropTypes>False</EmbedInteropTypes>
102-
</COMReference>
103-
<COMReference Include="EnvDTE80">
104-
<Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
105-
<VersionMajor>8</VersionMajor>
106-
<VersionMinor>0</VersionMinor>
107-
<Lcid>0</Lcid>
108-
<WrapperTool>primary</WrapperTool>
109-
<Isolated>False</Isolated>
110-
<EmbedInteropTypes>False</EmbedInteropTypes>
111-
</COMReference>
112-
<COMReference Include="EnvDTE90">
113-
<Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
114-
<VersionMajor>9</VersionMajor>
115-
<VersionMinor>0</VersionMinor>
116-
<Lcid>0</Lcid>
117-
<WrapperTool>primary</WrapperTool>
118-
<Isolated>False</Isolated>
119-
<EmbedInteropTypes>False</EmbedInteropTypes>
120-
</COMReference>
12188
<COMReference Include="Microsoft.VisualStudio.CommandBars">
12289
<Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
12390
<VersionMajor>8</VersionMajor>
@@ -175,6 +142,7 @@
175142
</EmbeddedResource>
176143
</ItemGroup>
177144
<ItemGroup>
145+
<None Include="packages.config" />
178146
<None Include="source.extension.vsixmanifest">
179147
<SubType>Designer</SubType>
180148
</None>
@@ -191,6 +159,10 @@
191159
<None Include="Resources\Images.png" />
192160
</ItemGroup>
193161
<ItemGroup>
162+
<Content Include="ReleaseNotes.txt">
163+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
164+
<IncludeInVSIX>true</IncludeInVSIX>
165+
</Content>
194166
<Content Include="Resources\Package.ico" />
195167
</ItemGroup>
196168
<ItemGroup>
@@ -204,11 +176,22 @@
204176
</PropertyGroup>
205177
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
206178
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
179+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
180+
<PropertyGroup>
181+
<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>
182+
</PropertyGroup>
183+
<Error Condition="'$(VisualStudioVersion)' == '14.0' And !Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
184+
<Error Condition="'$(VisualStudioVersion)' == '14.0' And !Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
185+
<Error Condition="'$(VisualStudioVersion)' != '14.0' And !Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
186+
<Error Condition="'$(VisualStudioVersion)' != '14.0' And !Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
187+
</Target>
188+
<Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
189+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="'$(VisualStudioVersion)' != '14.0' And Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
207190
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
208191
Other similar extension points exist, see Microsoft.Common.targets.
209192
<Target Name="BeforeBuild">
210193
</Target>
211194
<Target Name="AfterBuild">
212195
</Target>
213196
-->
214-
</Project>
197+
</Project>

‎EasyMotion/ReleaseNotes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
30-Mar-2017 v1.0.2 - Upgraded to support VS2017

‎EasyMotion/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.12-pre" targetFramework="net45" developmentDependency="true" />
4+
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net45" developmentDependency="true" />
5+
</packages>

‎EasyMotion/source.extension.vsixmanifest‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="5bb019ad-a18e-4c86-af3c-27217853df95" Version="1.0.1" Language="en-US" Publisher="JaredPar" />
4+
<Identity Id="5bb019ad-a18e-4c86-af3c-27217853df95" Version="1.0.2" Language="en-US" Publisher="JaredPar" />
55
<DisplayName>EasyMotion</DisplayName>
66
<Description>Easy Motion clone for Visual Studio</Description>
7+
<ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
78
</Metadata>
89
<Installation InstalledByMsi="false">
9-
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
10+
<InstallationTarget Version="[14.0,16.0)" Id="Microsoft.VisualStudio.Community" />
1011
</Installation>
1112
<Dependencies>
1213
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
@@ -15,4 +16,7 @@
1516
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
1617
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
1718
</Assets>
19+
<Prerequisites>
20+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
21+
</Prerequisites>
1822
</PackageManifest>

0 commit comments

Comments
 (0)