diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..c58d29249 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,25 @@ +; Top-most EditorConfig file +root = true + +[*] +indent_style = tab +indent_size = 4 + +# The indentation (and source formatting!) of the addin sources are different than the rest of the solution. +[ILSpy.AddIn/*] +indent_style = space +indent_size = 4 + +[*.il] +indent_style = space +indent_size = 2 + +[*.csproj] +indent_style = space +indent_size = 2 +[*.config] +indent_style = space +indent_size = 2 +[*.vsixmanifest] +indent_style = space +indent_size = 2 diff --git a/ILSpy.sln b/ILSpy.sln index af5e549d7..9a2368536 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -1,8 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -# SharpDevelop 5.0 -VisualStudioVersion = 12.0.20827.3 +# Visual Studio 14 +VisualStudioVersion = 14.0.22013.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}" ProjectSection(SolutionItems) = preProject @@ -38,6 +37,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.AddIn", "ILSpy.AddIn\ILSpy.AddIn.csproj", "{9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VSIntegration", "VSIntegration", "{CA68D818-CDB5-4240-9909-F3E02F1B34CB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0A344E19-D1FC-4F4C-8883-0844AC669113}" + ProjectSection(SolutionItems) = preProject + Rebracer.xml = Rebracer.xml + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Rebracer.xml b/Rebracer.xml new file mode 100644 index 000000000..b855aecd6 --- /dev/null +++ b/Rebracer.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + TODO:2 + HACK:2 + UNDONE:2 + UnresolvedMergeConflict:3 + + true + true + false + + + + + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 0 + 0 + 2 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + \ No newline at end of file