Skip to content

Commit dae85de

Browse files
MpdreamzMpdreamz
committed
Merge pull request editorconfig#22 from editorconfig/feature/managed-core
Mega refactor
2 parents c0ea678 + 64391e5 commit dae85de

File tree

71 files changed

+3534
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3534
-872
lines changed

‎.editorconfig

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@ root=true
22

33
[*]
44
end_of_line = LF
5-
6-
[*.cs]
7-
indent_style = space
8-
indent_size = 4
9-
10-
[*.cpp]
115
indent_style = space
126
indent_size = 2
7+
trim_trailing_whitespace = true
138

14-
[*.h]
15-
indent_style = space
16-
indent_size = 2
9+
[*.cs]
10+
indent_size = 4

‎.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union

‎.gitmodules

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

‎CONTRIBUTORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ Martijn Laarman
55
Hong Xu
66
Tom Potts
77
Ethan J. Brown
8+
Jed Hunsaker
9+
Steve Cadwallader

‎Core

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Dist/EditorConfig.vsix

295 KB
Binary file not shown.

‎EditorConfig.VisualStudio.sln

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,53 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin", "Plugin\Plugin.csproj", "{47C063F7-1FE9-4695-9854-30DF51B87783}"
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorConfig", "Plugin\EditorConfig.csproj", "{FEAAE923-0664-4072-903F-0C833CD43D36}"
57
EndProject
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wrapper", "Wrapper\Wrapper.vcxproj", "{85F4C576-ECA4-44D7-98D0-FE065632C51E}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorConfigItemTemplate", "EditorConfigItemTemplate\EditorConfigItemTemplate.csproj", "{C812CBA0-F505-458A-A984-1B6C5B64DFF0}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{947E4BAB-59E4-4953-A9C1-A6A81A6EF229}"
11+
ProjectSection(SolutionItems) = preProject
12+
.editorconfig = .editorconfig
13+
.gitattributes = .gitattributes
14+
.gitignore = .gitignore
15+
EndProjectSection
716
EndProject
817
Global
918
GlobalSection(SolutionConfigurationPlatforms) = preSolution
19+
Debug|Any CPU = Debug|Any CPU
20+
Debug|Mixed Platforms = Debug|Mixed Platforms
1021
Debug|Win32 = Debug|Win32
22+
Release|Any CPU = Release|Any CPU
23+
Release|Mixed Platforms = Release|Mixed Platforms
1124
Release|Win32 = Release|Win32
1225
EndGlobalSection
1326
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{47C063F7-1FE9-4695-9854-30DF51B87783}.Debug|Win32.ActiveCfg = Debug|Any CPU
15-
{47C063F7-1FE9-4695-9854-30DF51B87783}.Debug|Win32.Build.0 = Debug|Any CPU
16-
{47C063F7-1FE9-4695-9854-30DF51B87783}.Release|Win32.ActiveCfg = Release|Any CPU
17-
{47C063F7-1FE9-4695-9854-30DF51B87783}.Release|Win32.Build.0 = Release|Any CPU
18-
{85F4C576-ECA4-44D7-98D0-FE065632C51E}.Debug|Win32.ActiveCfg = Debug|Win32
19-
{85F4C576-ECA4-44D7-98D0-FE065632C51E}.Debug|Win32.Build.0 = Debug|Win32
20-
{85F4C576-ECA4-44D7-98D0-FE065632C51E}.Release|Win32.ActiveCfg = Release|Win32
21-
{85F4C576-ECA4-44D7-98D0-FE065632C51E}.Release|Win32.Build.0 = Release|Win32
27+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
30+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
31+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Debug|Win32.ActiveCfg = Debug|Any CPU
32+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Debug|Win32.Build.0 = Debug|Any CPU
33+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
36+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
37+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Release|Win32.ActiveCfg = Release|Any CPU
38+
{FEAAE923-0664-4072-903F-0C833CD43D36}.Release|Win32.Build.0 = Release|Any CPU
39+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
42+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
43+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Debug|Win32.ActiveCfg = Debug|Any CPU
44+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Debug|Win32.Build.0 = Debug|Any CPU
45+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
46+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Release|Any CPU.Build.0 = Release|Any CPU
47+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
48+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
49+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Release|Win32.ActiveCfg = Release|Any CPU
50+
{C812CBA0-F505-458A-A984-1B6C5B64DFF0}.Release|Win32.Build.0 = Release|Any CPU
2251
EndGlobalSection
2352
GlobalSection(SolutionProperties) = preSolution
2453
HideSolutionNode = FALSE

‎EditorConfig.VisualStudio.sln.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<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>

‎EditorConfigItemTemplate/.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
root=true
2+
3+
[*]
4+
end_of_line = lf
5+
indent_style = space
6+
indent_size = 2
7+
trim_trailing_whitespace = true
8+
9+
[*.cs]
10+
indent_size = 4

‎EditorConfigItemTemplate/EditorConfig.ico

66.5 KB
Binary file not shown.

‎EditorConfigItemTemplate/EditorConfigItemTemplate.csproj

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
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+
<OldToolsVersion>12.0</OldToolsVersion>
10+
<UpgradeBackupLocation />
11+
<PublishUrl>publish\</PublishUrl>
12+
<Install>true</Install>
13+
<InstallFrom>Disk</InstallFrom>
14+
<UpdateEnabled>false</UpdateEnabled>
15+
<UpdateMode>Foreground</UpdateMode>
16+
<UpdateInterval>7</UpdateInterval>
17+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
18+
<UpdatePeriodically>false</UpdatePeriodically>
19+
<UpdateRequired>false</UpdateRequired>
20+
<MapFileExtensions>true</MapFileExtensions>
21+
<ApplicationRevision>0</ApplicationRevision>
22+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
23+
<IsWebBootstrapper>false</IsWebBootstrapper>
24+
<UseApplicationTrust>false</UseApplicationTrust>
25+
<BootstrapperEnabled>true</BootstrapperEnabled>
26+
</PropertyGroup>
27+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
28+
<PropertyGroup>
29+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
30+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
31+
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
32+
<ProjectGuid>{C812CBA0-F505-458A-A984-1B6C5B64DFF0}</ProjectGuid>
33+
<OutputType>Library</OutputType>
34+
<AppDesignerFolder>Properties</AppDesignerFolder>
35+
<RootNamespace>EditorConfigItemTemplate</RootNamespace>
36+
<AssemblyName>EditorConfigItemTemplate</AssemblyName>
37+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
38+
<FileAlignment>512</FileAlignment>
39+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
40+
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
41+
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
42+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
43+
<CreateVsixContainer>false</CreateVsixContainer>
44+
<DeployExtension>false</DeployExtension>
45+
<DeployVSTemplates>false</DeployVSTemplates>
46+
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
47+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
48+
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
49+
</PropertyGroup>
50+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
51+
<DebugSymbols>true</DebugSymbols>
52+
<DebugType>full</DebugType>
53+
<Optimize>false</Optimize>
54+
<OutputPath>bin\Debug\</OutputPath>
55+
<DefineConstants>DEBUG;TRACE</DefineConstants>
56+
<ErrorReport>prompt</ErrorReport>
57+
<WarningLevel>4</WarningLevel>
58+
</PropertyGroup>
59+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
60+
<DebugType>pdbonly</DebugType>
61+
<Optimize>true</Optimize>
62+
<OutputPath>bin\Release\</OutputPath>
63+
<DefineConstants>TRACE</DefineConstants>
64+
<ErrorReport>prompt</ErrorReport>
65+
<WarningLevel>4</WarningLevel>
66+
</PropertyGroup>
67+
<ItemGroup>
68+
<Reference Include="Microsoft.VisualStudio.CoreUtility">
69+
<Private>False</Private>
70+
</Reference>
71+
<Reference Include="System" />
72+
<Reference Include="System.Core" />
73+
<Reference Include="System.Data" />
74+
<Reference Include="System.Xml" />
75+
</ItemGroup>
76+
<ItemGroup>
77+
<Compile Include="Properties\AssemblyInfo.cs" />
78+
</ItemGroup>
79+
<ItemGroup>
80+
<VSTemplate Include="EditorConfigItemTemplate.vstemplate" />
81+
</ItemGroup>
82+
<ItemGroup>
83+
<Content Include="EditorConfig.ico" />
84+
</ItemGroup>
85+
<ItemGroup>
86+
<None Include=".editorconfig" />
87+
</ItemGroup>
88+
<ItemGroup>
89+
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
90+
<Visible>False</Visible>
91+
<ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
92+
<Install>true</Install>
93+
</BootstrapperPackage>
94+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
95+
<Visible>False</Visible>
96+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
97+
<Install>false</Install>
98+
</BootstrapperPackage>
99+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
100+
<Visible>False</Visible>
101+
<ProductName>.NET Framework 3.5 SP1</ProductName>
102+
<Install>false</Install>
103+
</BootstrapperPackage>
104+
</ItemGroup>
105+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
107+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
108+
Other similar extension points exist, see Microsoft.Common.targets.
109+
<Target Name="BeforeBuild">
110+
</Target>
111+
<Target Name="AfterBuild">
112+
</Target>
113+
-->
114+
</Project>

‎EditorConfigItemTemplate/EditorConfigItemTemplate.vstemplate

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010">
3+
<TemplateData>
4+
<Name>EditorConfig file</Name>
5+
<Description>A file for defining per project coding styles and other misc settings.</Description>
6+
<Icon>editorconfig.ico</Icon>
7+
<TemplateID>89e72999-b004-4810-bf50-cc99ea8d247e</TemplateID>
8+
<ProjectType>General</ProjectType>
9+
<ShowByDefault>true</ShowByDefault>
10+
<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
11+
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
12+
<DefaultName>does_not_matter_always_extensionless.editorconfig</DefaultName>
13+
<EnableEditOfLocationField>false</EnableEditOfLocationField>
14+
</TemplateData>
15+
<TemplateContent>
16+
<ProjectItem ReplaceParameters="false" TargetFileName=".editorconfig">.editorconfig</ProjectItem>
17+
</TemplateContent>
18+
</VSTemplate>

‎EditorConfigItemTemplate/Properties/AssemblyInfo.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("EditorConfigItemTemplate")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("EditorConfigItemTemplate")]
13+
[assembly: AssemblyCopyright("Copyright © 2015")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("3fa9bef5-5387-4656-aa76-5ef3be8a1183")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)