Skip to content

Commit ce46975

Browse files
committed
Upgrading the project to the VS2015 SDK nugets. This allows building the solution in Visual Studio 2015 without having the SDK installed.
1 parent 37e5a13 commit ce46975

File tree

6 files changed

+21
-63
lines changed

6 files changed

+21
-63
lines changed

EditorConfig.VisualStudio.sln

Lines changed: 2 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 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorConfig", "Plugin\EditorConfig.csproj", "{FEAAE923-0664-4072-903F-0C833CD43D36}"
77
EndProject
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2-
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String></wpf:ResourceDictionary>
2+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
3+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>

Plugin/EditorConfig.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3-
<PropertyGroup>
4-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
6-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
7-
<FileUpgradeFlags>
8-
</FileUpgradeFlags>
9-
<UpgradeBackupLocation>
10-
</UpgradeBackupLocation>
11-
<OldToolsVersion>4.0</OldToolsVersion>
12-
</PropertyGroup>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" />
134
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
145
<PropertyGroup>
156
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
167
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
178
<SchemaVersion>2.0</SchemaVersion>
189
<ProjectGuid>{FEAAE923-0664-4072-903F-0C833CD43D36}</ProjectGuid>
19-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10+
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
2011
<OutputType>Library</OutputType>
2112
<AppDesignerFolder>Properties</AppDesignerFolder>
2213
<RootNamespace>EditorConfig.VisualStudio</RootNamespace>
2314
<AssemblyName>EditorConfig</AssemblyName>
2415
<SignAssembly>True</SignAssembly>
2516
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
2617
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
2720
</PropertyGroup>
2821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2922
<DebugSymbols>true</DebugSymbols>
@@ -55,6 +48,7 @@
5548
<EmbedInteropTypes>True</EmbedInteropTypes>
5649
</Reference>
5750
<Reference Include="EnvDTE" />
51+
<Reference Include="Microsoft.Build.Framework" />
5852
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
5953
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
6054
<Reference Include="Microsoft.VisualStudio.Shell.10.0" />
@@ -154,6 +148,7 @@
154148
<IncludeInVSIX>true</IncludeInVSIX>
155149
</Content>
156150
</ItemGroup>
151+
<!--
157152
<ItemGroup>
158153
<ProjectReference Include="..\EditorConfigItemTemplate\EditorConfigItemTemplate.csproj">
159154
<Project>{C812CBA0-F505-458A-A984-1B6C5B64DFF0}</Project>
@@ -163,11 +158,16 @@
163158
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
164159
</ProjectReference>
165160
</ItemGroup>
166-
<PropertyGroup>
167-
<UseCodebase>true</UseCodebase>
168-
</PropertyGroup>
161+
-->
169162
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
170-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
163+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
164+
<PropertyGroup>
165+
<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>
166+
</PropertyGroup>
167+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props'))" />
168+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets'))" />
169+
</Target>
170+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets')" />
171171
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
172172
Other similar extension points exist, see Microsoft.Common.targets.
173173
<Target Name="BeforeBuild">

Plugin/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="editorconfig" version="0.12.1" targetFramework="net45" />
4+
<package id="Microsoft.VSSDK.BuildTools" version="14.1.24720" targetFramework="net45" developmentDependency="true" />
45
</packages>

build.VS2010.cmd

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

build.VS2012.cmd

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

0 commit comments

Comments
 (0)