From 1eaa8743c54198a5ca61910b69d0f30cbb4b80e1 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 15:31:19 -0500 Subject: [PATCH 01/15] Revert the addition of ICSharpCode.Decompiler.netstd.csproj --- .../ICSharpCode.Decompiler.csproj | 6 +- .../ICSharpCode.Decompiler.netstd.csproj | 56 ------------------- ILSpy.sln | 15 +---- 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 28d2535bc..2de1c7897 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -546,17 +546,13 @@ Instructions.cs + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil - - {fd56f486-a0c3-4469-b6d3-d2bae23ce2a0} - ICSharpCode.Decompiler.netstd - false - diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj deleted file mode 100644 index 544248968..000000000 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - netstandard2.0 - ICSharpCode.Decompiler - ICSharpCode.Decompiler - false - true - true - ICSharpCode.Decompiler.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UpdateAssemblyInfo.exe - mono $(UpdateAssemblyInfo) - - - - - - - - - - - \ No newline at end of file diff --git a/ILSpy.sln b/ILSpy.sln index ef5e84de4..7724d8dbd 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.12 +VisualStudioVersion = 15.0.25920.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}" ProjectSection(SolutionItems) = preProject @@ -35,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Rebracer.xml = Rebracer.xml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.netstd", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.netstd.csproj", "{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -123,19 +121,8 @@ Global {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|Any CPU.Build.0 = Release|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|x86.ActiveCfg = Release|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|x86.Build.0 = Debug|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|Any CPU.Build.0 = Release|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|x86.ActiveCfg = Release|Any CPU - {FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9DC5EDAF-8473-4E6C-A4BB-584496ACDD44} - EndGlobalSection EndGlobal From 29619b9872dc1119b12aa8c4bbcb2268035ee0bd Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 12:35:12 -0500 Subject: [PATCH 02/15] Reinstall the DiffLib package --- .../ICSharpCode.Decompiler.Tests.csproj | 2 +- ICSharpCode.Decompiler.Tests/packages.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index 5cf22c60c..7db12eb2b 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -53,7 +53,7 @@ TRACE - + ..\packages\DiffLib.1.0.0.55\lib\net35-Client\DiffLib.dll diff --git a/ICSharpCode.Decompiler.Tests/packages.config b/ICSharpCode.Decompiler.Tests/packages.config index 0c6a35b9e..059c480c0 100644 --- a/ICSharpCode.Decompiler.Tests/packages.config +++ b/ICSharpCode.Decompiler.Tests/packages.config @@ -1,6 +1,6 @@  - + From 6b0f63946c40bc01cd83c807ac9d36b42240aeff Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 12:38:05 -0500 Subject: [PATCH 03/15] Updated .gitignore for Visual Studio 2015+ solution folder --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e88e4359e..a1e5f6ad2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,12 +5,11 @@ obj/ /ICSharpCode.Decompiler/Properties/AssemblyInfo.cs /ILSpy/Properties/AssemblyInfo.cs /ILSpy/app.config -*.suo *.user /Resharper-ILSpy-Style.xml _ReSharper*/ *.ReSharper *.patch /packages -*.ide/ +.vs/ /ICSharpCode.Decompiler/Tests/TestCases/*.exe From a8791e825e87321104dfe55399e60c96073463f5 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 14:18:29 -0500 Subject: [PATCH 04/15] Add ILSpy-tests as a submodule --- .gitignore | 1 - .gitmodules | 3 +++ ILSpy-tests | 1 + appveyor.yml | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) create mode 160000 ILSpy-tests diff --git a/.gitignore b/.gitignore index a1e5f6ad2..15fbf331d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ bin/ obj/ -/ILSpy-tests /ICSharpCode.Decompiler/Properties/AssemblyInfo.cs /ILSpy/Properties/AssemblyInfo.cs /ILSpy/app.config diff --git a/.gitmodules b/.gitmodules index 41918909b..d1593580e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "cecil"] path = cecil url = https://github.com/jbevain/cecil.git +[submodule "ILSpy-tests"] + path = ILSpy-tests + url = https://github.com/icsharpcode/ILSpy-tests diff --git a/ILSpy-tests b/ILSpy-tests new file mode 160000 index 000000000..e8c3f0e9e --- /dev/null +++ b/ILSpy-tests @@ -0,0 +1 @@ +Subproject commit e8c3f0e9e811b9f67090ac6ee445d9cc3e52f82a diff --git a/appveyor.yml b/appveyor.yml index 36241bde9..1212f2c0f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,6 @@ platform: Any CPU image: Visual Studio 2017 install: - git submodule update --init --recursive -- git clone https://github.com/icsharpcode/ILSpy-tests before_build: - nuget restore ILSpy.sln build: From 4908b129f82c58adb3662683c1067d32ead60bca Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 13:00:37 -0500 Subject: [PATCH 05/15] Convert projects to the new project system --- .../CorrectnessTestRunner.cs | 2 +- .../DecompilerTestBase.cs | 2 +- .../ICSharpCode.Decompiler.Tests.csproj | 151 +++--------- .../PrettyTestRunner.cs | 2 +- .../RoundtripAssembly.cs | 2 +- ICSharpCode.Decompiler.Tests/Stub.cs | 30 +++ ICSharpCode.Decompiler.Tests/app.config | 14 -- ICSharpCode.Decompiler.Tests/packages.config | 11 - ICSharpCode.Decompiler.sln | 10 +- .../ICSharpCode.Decompiler.csproj | 98 +++----- ICSharpCode.Decompiler/packages.config | 5 - ILSpy.AddIn/ILSpy.AddIn.csproj | 221 +++++------------- ILSpy.AddIn/Properties/AssemblyInfo.cs | 20 -- ILSpy.AddIn/Properties/launchSettings.json | 8 + ILSpy.AddIn/packages.config | 19 -- ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs | 2 +- .../ILSpy.BamlDecompiler.Tests.csproj | 132 ++++------- .../Properties/AssemblyInfo.cs | 2 +- ILSpy.BamlDecompiler.Tests/packages.config | 4 - .../ILSpy.BamlDecompiler.csproj | 151 +++++------- .../Properties/AssemblyInfo.cs | 2 +- ILSpy.BamlDecompiler/packages.config | 4 - ILSpy.sln | 53 +++-- ILSpy/ILSpy.csproj | 159 ++++--------- ILSpy/Properties/launchSettings.json | 9 + ILSpy/packages.config | 5 - SharpTreeView/ICSharpCode.TreeView.csproj | 88 ++----- TestPlugin/Properties/AssemblyInfo.cs | 2 +- TestPlugin/Properties/launchSettings.json | 9 + TestPlugin/TestPlugin.csproj | 119 +++------- appveyor.yml | 4 +- 31 files changed, 429 insertions(+), 911 deletions(-) create mode 100644 ICSharpCode.Decompiler.Tests/Stub.cs delete mode 100644 ICSharpCode.Decompiler.Tests/app.config delete mode 100644 ICSharpCode.Decompiler.Tests/packages.config delete mode 100644 ICSharpCode.Decompiler/packages.config create mode 100644 ILSpy.AddIn/Properties/launchSettings.json delete mode 100644 ILSpy.AddIn/packages.config delete mode 100644 ILSpy.BamlDecompiler.Tests/packages.config delete mode 100644 ILSpy.BamlDecompiler/packages.config create mode 100644 ILSpy/Properties/launchSettings.json delete mode 100644 ILSpy/packages.config create mode 100644 TestPlugin/Properties/launchSettings.json diff --git a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs index 615b0b054..1f7457087 100644 --- a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.Decompiler.Tests [TestFixture] public class CorrectnessTestRunner { - const string TestCasePath = @"../../../ICSharpCode.Decompiler.Tests/TestCases/Correctness"; + const string TestCasePath = @"../../../../ICSharpCode.Decompiler.Tests/TestCases/Correctness"; [Test] public void AllFilesHaveTests() diff --git a/ICSharpCode.Decompiler.Tests/DecompilerTestBase.cs b/ICSharpCode.Decompiler.Tests/DecompilerTestBase.cs index 93f01150a..1559aa218 100644 --- a/ICSharpCode.Decompiler.Tests/DecompilerTestBase.cs +++ b/ICSharpCode.Decompiler.Tests/DecompilerTestBase.cs @@ -34,7 +34,7 @@ namespace ICSharpCode.Decompiler.Tests { protected static void ValidateFileRoundtrip(string samplesFileName) { - var fullPath = Path.Combine(@"../../../ICSharpCode.Decompiler.Tests", samplesFileName); + var fullPath = Path.Combine(@"../../../../ICSharpCode.Decompiler.Tests", samplesFileName); AssertRoundtripCode(fullPath); } diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index 7db12eb2b..e3363b5ef 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -1,129 +1,60 @@  - + + - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22} - Debug - x86 - Library - ICSharpCode.Decompiler.Tests - ICSharpCode.Decompiler.Tests - v4.6.1 - Properties + net461 + True - False - 4 - false - False - 67,169,1058,728,1720,649 - - False + + $(NoWarn),67,169,1058,728,1720,649 + + False + + false + + Exe + ICSharpCode.Decompiler.Tests.Stub + True + True ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk - False - File - - - - x86 - False - Auto - 4194304 - 4096 - - - AnyCPU - False - Auto - 4194304 - 4096 - - - ..\ICSharpCode.Decompiler\bin\Debug\ + + + full true - Full - False - DEBUG;TRACE - - ..\ICSharpCode.Decompiler\bin\Release\ - false - None - True - TRACE + + + pdbonly + true + - - ..\packages\DiffLib.1.0.0.55\lib\net35-Client\DiffLib.dll - - - ..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - - ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll - False - - - ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll - False - - - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - - ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll - False - - - ..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll - False - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - 3.5 - - - ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - - 3.5 - + + + + + + - - - - + + + - - {d68133bd-1e63-496e-9ede-4fbdbf77b486} - Mono.Cecil - - - {984cc812-9470-4a13-aff9-cc44068d666c} - ICSharpCode.Decompiler - + + + + @@ -166,9 +97,7 @@ - - - + CompoundAssignmentTest.cs @@ -181,9 +110,5 @@ - - - - - + \ No newline at end of file diff --git a/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs b/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs index 38851297a..6da0ade88 100644 --- a/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.Decompiler.Tests { public class PrettyTestRunner { - const string TestCasePath = @"../../../ICSharpCode.Decompiler.Tests/TestCases/Pretty"; + const string TestCasePath = @"../../../../ICSharpCode.Decompiler.Tests/TestCases/Pretty"; [Test] public void AllFilesHaveTests() diff --git a/ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs b/ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs index 561132f51..38633358e 100644 --- a/ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs +++ b/ICSharpCode.Decompiler.Tests/RoundtripAssembly.cs @@ -32,7 +32,7 @@ namespace ICSharpCode.Decompiler.Tests { public class RoundtripAssembly { - static readonly string testDir = Path.GetFullPath("../../../ILSpy-tests"); + static readonly string testDir = Path.GetFullPath("../../../../ILSpy-tests"); static readonly string nunit = Path.Combine(testDir, "nunit", "nunit3-console.exe"); [Test] diff --git a/ICSharpCode.Decompiler.Tests/Stub.cs b/ICSharpCode.Decompiler.Tests/Stub.cs new file mode 100644 index 000000000..781997025 --- /dev/null +++ b/ICSharpCode.Decompiler.Tests/Stub.cs @@ -0,0 +1,30 @@ +// Copyright (c) 2016 Daniel Grunwald +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +using System; + +namespace ICSharpCode.Decompiler.Tests +{ + class Stub + { + static void Main(string[] args) + { + throw new InvalidOperationException("Entry point exists only to support output type 'Exe'"); + } + } +} diff --git a/ICSharpCode.Decompiler.Tests/app.config b/ICSharpCode.Decompiler.Tests/app.config deleted file mode 100644 index 5095b0e47..000000000 --- a/ICSharpCode.Decompiler.Tests/app.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ICSharpCode.Decompiler.Tests/packages.config b/ICSharpCode.Decompiler.Tests/packages.config deleted file mode 100644 index 059c480c0..000000000 --- a/ICSharpCode.Decompiler.Tests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ICSharpCode.Decompiler.sln b/ICSharpCode.Decompiler.sln index 1e00f2b4c..787fb3285 100644 --- a/ICSharpCode.Decompiler.sln +++ b/ICSharpCode.Decompiler.sln @@ -1,13 +1,12 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25914.0 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler\Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,4 +44,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E873114C-83E7-4A78-86C9-2A93B8A16991} + EndGlobalSection EndGlobal diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 2de1c7897..95e26b870 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -1,76 +1,43 @@  - + + - {984CC812-9470-4A13-AFF9-CC44068D666C} - Debug - AnyCPU - Library - ICSharpCode.Decompiler - ICSharpCode.Decompiler - v4.6.1 - - - Properties - False - False - 4 - false + net461 + + False + + false + True ICSharpCode.Decompiler.snk - False - File - - AnyCPU - False - Auto - 448462848 - - - bin\Debug\ + + + full true - Full - False True - DEBUG;TRACE + $(DefineConstants);STEP - - bin\Release\ + + + pdbonly true - PdbOnly - True - False - TRACE - - - false - TRACE;DEBUG;STEP - ICSharpCode.Decompiler.ruleset - true - - false + + ICSharpCode.Decompiler.ruleset true + - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - 3.5 - - - ..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll - True - - - - 3.5 - + + + + + + + @@ -545,30 +512,21 @@ TextTemplatingFileGenerator Instructions.cs - - - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - - - - - - + Documentation\XML Documentation.html + CSharp\Syntax\PatternMatching\Pattern Matching.html - + UpdateAssemblyInfo.exe diff --git a/ICSharpCode.Decompiler/packages.config b/ICSharpCode.Decompiler/packages.config deleted file mode 100644 index d4a92e683..000000000 --- a/ICSharpCode.Decompiler/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ILSpy.AddIn/ILSpy.AddIn.csproj b/ILSpy.AddIn/ILSpy.AddIn.csproj index 7e7eef4a4..a00e3424c 100644 --- a/ILSpy.AddIn/ILSpy.AddIn.csproj +++ b/ILSpy.AddIn/ILSpy.AddIn.csproj @@ -1,142 +1,58 @@  - + + + - - $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK\Microsoft.VsSDK.targets - $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets - - - - - $(VisualStudioVersion) - - - - Debug - AnyCPU - 2.0 - {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384} - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties + net461 ICSharpCode.ILSpy.AddIn - ILSpy.AddIn + + IC#Code + ILSpy + en-US + 1.5.0.0 + 1.5.0.0 + + False + true + True Key.snk - v4.6.1 - - - - Program - $(DevEnvDir)\devenv.exe - /rootSuffix Exp - - true + + full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true + true - + + pdbonly - true - bin\Release\ - TRACE - prompt - 4 + true true - true + False + - - False - ..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll - True - - - False - ..\packages\VSSDK.DTE.10.10.0.4\lib\net20\envdte100.dll - True - - - False - ..\packages\VSSDK.DTE.8.8.0.4\lib\net20\envdte80.dll - True - - - False - ..\packages\VSSDK.DTE.9.9.0.4\lib\net20\envdte90.dll - True - - - False - ..\packages\VSSDK.DTE.9.9.0.4\lib\net20\envdte90a.dll - True - - - ..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll - True - False - - - ..\packages\VSSDK.Shell.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.10.0.dll - False - - - ..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - False - - - ..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll - True - False - - - - ..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - False - - - ..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - False - - - ..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll - True - False - - - ..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - False - - - - - False - ..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll - True - - - - - - - - - + + + + + + + + + + + + + + + + @@ -149,10 +65,10 @@ - + ResXFileCodeGenerator @@ -164,23 +80,29 @@ VSPackage + Designer + + Menus.ctmenu Designer + + + Always @@ -192,46 +114,21 @@ - - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - - - {984CC812-9470-4A13-AFF9-CC44068D666C} - ICSharpCode.Decompiler - - - {A6BAD2BA-76BA-461C-8B6D-418607591247} - ILSpy.BamlDecompiler - - - {1E85EFF9-E370-4683-83E4-8A3D063FF791} - ILSpy - - - {d68133bd-1e63-496e-9ede-4fbdbf77b486} - Mono.Cecil - - - {63e6915c-7ea4-4d76-ab28-0d7191eea626} - Mono.Cecil.Pdb - - - {dde2a481-8271-4eac-a330-8fa6a38d13d1} - ICSharpCode.TreeView - - + true - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/ILSpy.AddIn/Properties/AssemblyInfo.cs b/ILSpy.AddIn/Properties/AssemblyInfo.cs index cd85a3e1e..db36e8d59 100644 --- a/ILSpy.AddIn/Properties/AssemblyInfo.cs +++ b/ILSpy.AddIn/Properties/AssemblyInfo.cs @@ -1,36 +1,16 @@ using System; using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ILSpy.AddIn")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("IC#Code")] -[assembly: AssemblyProduct("ILSpy.AddIn")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: CLSCompliant(false)] -[assembly: NeutralResourcesLanguage("en-US")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] [assembly: InternalsVisibleTo("ILSpy.AddIn_IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100653c4a319be4f524972c3c5bba5fd243330f8e900287d9022d7821a63fd0086fd3801e3683dbe9897f2ecc44727023e9b40adcf180730af70c81c54476b3e5ba8b0f07f5132b2c3cc54347a2c1a9d64ebaaaf3cbffc1a18c427981e2a51d53d5ab02536b7550e732f795121c38a0abfdb38596353525d034baf9e6f1fd8ac4ac")] [assembly: InternalsVisibleTo("ILSpy.AddIn_UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100653c4a319be4f524972c3c5bba5fd243330f8e900287d9022d7821a63fd0086fd3801e3683dbe9897f2ecc44727023e9b40adcf180730af70c81c54476b3e5ba8b0f07f5132b2c3cc54347a2c1a9d64ebaaaf3cbffc1a18c427981e2a51d53d5ab02536b7550e732f795121c38a0abfdb38596353525d034baf9e6f1fd8ac4ac")] diff --git a/ILSpy.AddIn/Properties/launchSettings.json b/ILSpy.AddIn/Properties/launchSettings.json new file mode 100644 index 000000000..48d76ff24 --- /dev/null +++ b/ILSpy.AddIn/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "Visual Studio Extension": { + "executablePath": "$(DevEnvDir)devenv.exe", + "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log" + } + } +} diff --git a/ILSpy.AddIn/packages.config b/ILSpy.AddIn/packages.config deleted file mode 100644 index ce8982f5e..000000000 --- a/ILSpy.AddIn/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs b/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs index 63c279e4f..1fc54cfa7 100644 --- a/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs +++ b/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs @@ -103,7 +103,7 @@ namespace ILSpy.BamlDecompiler.Tests #region RunTest void RunTest(string name) { - RunTest(name, typeof(BamlTestRunner).Assembly.Location, Path.Combine("..\\..\\..\\ILSpy.BamlDecompiler.Tests", name + ".xaml")); + RunTest(name, typeof(BamlTestRunner).Assembly.Location, Path.Combine("..\\..\\..\\..\\ILSpy.BamlDecompiler.Tests", name + ".xaml")); } void RunTest(string name, string asmPath, string sourcePath) diff --git a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj index 0ce915031..f22ee7231 100644 --- a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj +++ b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj @@ -1,74 +1,49 @@  - + + - {1169E6D1-1899-43D4-A500-07CE4235B388} - Debug - x86 - Library - ILSpy.BamlDecompiler.Tests - ILSpy.BamlDecompiler.Tests - v4.6.1 - - - False - False - 4 - false + net461 + + False + + false - - x86 - False - Auto - 4194304 - 4096 - - - AnyCPU + + + + $(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets - - ..\ILSpy.BamlDecompiler\bin\Debug\ + + + full true - Full - False True - DEBUG;TRACE - - ..\bin\Release\ - false - None - True - False - TRACE + + + pdbonly + true + + + + + + + + + + + + - - ..\packages\DiffLib.1.0.0.55\lib\net35-Client\DiffLib.dll - - - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - 3.0 - - - 3.0 - - - - 3.5 - - - 4.0 - - - - 3.5 - - - 3.0 - + + + + + + @@ -95,32 +70,7 @@ - - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - - - {fec0da52-c4a6-4710-be36-b484a20c5e22} - ICSharpCode.Decompiler.Tests - - - {1e85eff9-e370-4683-83e4-8a3d063ff791} - ILSpy - - - {dde2a481-8271-4eac-a330-8fa6a38d13d1} - ICSharpCode.TreeView - - - {a6bad2ba-76ba-461c-8b6d-418607591247} - ILSpy.BamlDecompiler - - - - - - + @@ -145,9 +95,13 @@ + - - + + + + + \ No newline at end of file diff --git a/ILSpy.BamlDecompiler.Tests/Properties/AssemblyInfo.cs b/ILSpy.BamlDecompiler.Tests/Properties/AssemblyInfo.cs index 7bad1b94d..83385b032 100644 --- a/ILSpy.BamlDecompiler.Tests/Properties/AssemblyInfo.cs +++ b/ILSpy.BamlDecompiler.Tests/Properties/AssemblyInfo.cs @@ -27,4 +27,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/ILSpy.BamlDecompiler.Tests/packages.config b/ILSpy.BamlDecompiler.Tests/packages.config deleted file mode 100644 index ad37a5282..000000000 --- a/ILSpy.BamlDecompiler.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj index 6f547027f..747c3c8d6 100644 --- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj +++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj @@ -1,89 +1,59 @@  - + + + - {A6BAD2BA-76BA-461C-8B6D-418607591247} - Debug - AnyCPU - Library - ILSpy.BamlDecompiler + net461 ILSpy.BamlDecompiler.Plugin - v4.6.1 - - - Properties - False - False - 4 - false - OnBuildSuccess + + False + + false + 6488064 - - x86 - False - Auto - - - AnyCPU - False - Auto - - - ..\ILSpy\bin\Debug\ + + + full true - Full - False True - DEBUG;TRACE - - ..\ILSpy\bin\Release\ + + + pdbonly true - PdbOnly - True - False - TRACE - - - false - - - false - - - false - - false + + + ..\ILSpy\bin\$(Configuration)\ + + + + + + + + + + + + - - ..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll - - - 3.0 - - - 3.0 - - - - 4.0 - - - 3.5 - - - 4.0 - - - - 3.5 - - - 3.0 - + + False + + + False + + + False + + + False + + @@ -114,32 +84,17 @@ - - - - {984cc812-9470-4a13-aff9-cc44068d666c} - ICSharpCode.Decompiler - False - - - {1e85eff9-e370-4683-83e4-8a3d063ff791} - ILSpy - False - - - {d68133bd-1e63-496e-9ede-4fbdbf77b486} - Mono.Cecil - False - - - {dde2a481-8271-4eac-a330-8fa6a38d13d1} - ICSharpCode.TreeView - False - - + - - + + + + + + + + + \ No newline at end of file diff --git a/ILSpy.BamlDecompiler/Properties/AssemblyInfo.cs b/ILSpy.BamlDecompiler/Properties/AssemblyInfo.cs index 363db4447..248266b94 100644 --- a/ILSpy.BamlDecompiler/Properties/AssemblyInfo.cs +++ b/ILSpy.BamlDecompiler/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.CompilerServices; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/ILSpy.BamlDecompiler/packages.config b/ILSpy.BamlDecompiler/packages.config deleted file mode 100644 index b1f84266b..000000000 --- a/ILSpy.BamlDecompiler/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ILSpy.sln b/ILSpy.sln index 7724d8dbd..fc8cdada6 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25920.0 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}" ProjectSection(SolutionItems) = preProject @@ -10,25 +10,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E7 doc\IntPtr.txt = doc\IntPtr.txt EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy", "ILSpy\ILSpy.csproj", "{1E85EFF9-E370-4683-83E4-8A3D063FF791}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy", "ILSpy\ILSpy.csproj", "{1E85EFF9-E370-4683-83E4-8A3D063FF791}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPlugin", "TestPlugin\TestPlugin.csproj", "{F32EBCC8-0E53-4421-867E-05B3D6E10C70}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin", "TestPlugin\TestPlugin.csproj", "{F32EBCC8-0E53-4421-867E-05B3D6E10C70}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "cecil\symbols\pdb\Mono.Cecil.Pdb.csproj", "{63E6915C-7EA4-4D76-AB28-0D7191EEA626}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler", "ILSpy.BamlDecompiler\ILSpy.BamlDecompiler.csproj", "{A6BAD2BA-76BA-461C-8B6D-418607591247}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.BamlDecompiler", "ILSpy.BamlDecompiler\ILSpy.BamlDecompiler.csproj", "{A6BAD2BA-76BA-461C-8B6D-418607591247}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler.Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler.Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.AddIn", "ILSpy.AddIn\ILSpy.AddIn.csproj", "{9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.AddIn", "ILSpy.AddIn\ILSpy.AddIn.csproj", "{9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0A344E19-D1FC-4F4C-8883-0844AC669113}" ProjectSection(SolutionItems) = preProject @@ -45,12 +45,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|x86.ActiveCfg = Debug|x86 - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|x86.Build.0 = Debug|x86 + {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|x86.ActiveCfg = Debug|Any CPU + {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|x86.Build.0 = Debug|Any CPU {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.Build.0 = Release|Any CPU - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|x86.ActiveCfg = Release|x86 - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|x86.Build.0 = Release|x86 + {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|x86.ActiveCfg = Release|Any CPU + {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|x86.Build.0 = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -77,12 +77,12 @@ Global {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.Build.0 = Release|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.ActiveCfg = Debug|x86 - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.Build.0 = Debug|x86 + {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.ActiveCfg = Debug|Any CPU + {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.Build.0 = Debug|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|Any CPU.ActiveCfg = Release|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|Any CPU.Build.0 = Release|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.ActiveCfg = Release|x86 - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.Build.0 = Release|x86 + {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.ActiveCfg = Release|Any CPU + {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.Build.0 = Release|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|Any CPU.Build.0 = Debug|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -101,20 +101,20 @@ Global {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.Build.0 = net_4_0_Release|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.ActiveCfg = Debug|x86 - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.Build.0 = Debug|x86 + {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.ActiveCfg = Debug|Any CPU + {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.Build.0 = Debug|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.Build.0 = Release|Any CPU - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.ActiveCfg = Release|x86 - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.Build.0 = Release|x86 + {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.ActiveCfg = Release|Any CPU + {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.Build.0 = Release|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|x86.ActiveCfg = Debug|x86 - {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|x86.Build.0 = Debug|x86 + {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|x86.ActiveCfg = Debug|Any CPU + {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|x86.Build.0 = Debug|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|Any CPU.ActiveCfg = Release|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|Any CPU.Build.0 = Release|Any CPU - {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|x86.ActiveCfg = Release|x86 - {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|x86.Build.0 = Release|x86 + {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|x86.ActiveCfg = Release|Any CPU + {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|x86.Build.0 = Release|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -125,4 +125,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C764218F-7633-4412-923D-558CE7EE0560} + EndGlobalSection EndGlobal diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index bed2058c2..51d2bb8f0 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -1,116 +1,68 @@  - + + - {1E85EFF9-E370-4683-83E4-8A3D063FF791} - Debug - x86 + net461 WinExe + + False + + false + ICSharpCode.ILSpy - ILSpy - v4.6.1 - Properties - - - OnBuildSuccess + True - False - 4 - false + Images\ILSpy-Large.ico - False - /separate + True ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk - False - File - - x86 - False - Auto - 4194304 - 4096 - - - AnyCPU - False - Auto - 4194304 - 4096 - - - bin\Debug\ + + + full true - Full - False True - DEBUG;TRACE - Project - - bin\Release\ + + + pdbonly true - PdbOnly - True - False - TRACE - - false - false + + ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.ruleset - - false - - - false - - - false + + + + $(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets + - - ..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll - True - - - 3.0 - - - 3.0 - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - 4.0 - - - 3.5 - - - - 3.5 - - + + + - - 4.0 - - - - 3.5 - - - 3.0 - + + + + + + + + + + + + + + + @@ -283,9 +235,9 @@ - + Code @@ -325,6 +277,7 @@ + Designer @@ -355,6 +308,7 @@ + @@ -400,32 +354,15 @@ - - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - - - {63e6915c-7ea4-4d76-ab28-0d7191eea626} - Mono.Cecil.Pdb - - - {984cc812-9470-4a13-aff9-cc44068d666c} - ICSharpCode.Decompiler - - - {dde2a481-8271-4eac-a330-8fa6a38d13d1} - ICSharpCode.TreeView - - - + + - + \ No newline at end of file diff --git a/ILSpy/Properties/launchSettings.json b/ILSpy/Properties/launchSettings.json new file mode 100644 index 000000000..9456feabf --- /dev/null +++ b/ILSpy/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "ILSpy": { + "commandName": "Executable", + "executablePath": "$(OutDir)$(AssemblyName)$(TargetExt)", + "commandLineArgs": "/separate" + } + } +} \ No newline at end of file diff --git a/ILSpy/packages.config b/ILSpy/packages.config deleted file mode 100644 index e000fbb81..000000000 --- a/ILSpy/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/SharpTreeView/ICSharpCode.TreeView.csproj b/SharpTreeView/ICSharpCode.TreeView.csproj index 85ce1afa4..f4237b0fa 100644 --- a/SharpTreeView/ICSharpCode.TreeView.csproj +++ b/SharpTreeView/ICSharpCode.TreeView.csproj @@ -1,77 +1,46 @@  - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {DDE2A481-8271-4EAC-A330-8FA6A38D13D1} - Library - Properties - ICSharpCode.TreeView - ICSharpCode.TreeView - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - Client - bin\$(Configuration) - False - False - false + net461 + + False + + false + True ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk - False - File - + + + full true - Full - false - DEBUG;TRACE - prompt - 4 - + + pdbonly - true - TRACE - prompt - 4 - - - False + true - - False - Auto - 4194304 - AnyCPU + + + + $(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets + - - - 3.5 - - - 3.5 - - - 3.5 - - - - - + + + MSBuild:Compile Designer + @@ -91,19 +60,12 @@ - + - - + \ No newline at end of file diff --git a/TestPlugin/Properties/AssemblyInfo.cs b/TestPlugin/Properties/AssemblyInfo.cs index 2d0b9b6d8..600568bb6 100644 --- a/TestPlugin/Properties/AssemblyInfo.cs +++ b/TestPlugin/Properties/AssemblyInfo.cs @@ -27,4 +27,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/TestPlugin/Properties/launchSettings.json b/TestPlugin/Properties/launchSettings.json new file mode 100644 index 000000000..3578e8aa6 --- /dev/null +++ b/TestPlugin/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "TestPlugin": { + "commandName": "Executable", + "executablePath": "$(OutDir)ILSpy.exe", + "commandLineArgs": "/separate" + } + } +} \ No newline at end of file diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj index cd77cf4dd..288b3331f 100644 --- a/TestPlugin/TestPlugin.csproj +++ b/TestPlugin/TestPlugin.csproj @@ -1,79 +1,46 @@  - + + - {F32EBCC8-0E53-4421-867E-05B3D6E10C70} - Debug - AnyCPU - Library - TestPlugin + net461 Test.Plugin - v4.6.1 - Properties - False - False - 4 - false - /separate - + + False + + False - - AnyCPU - False - Auto - 4194304 - 4096 - - - bin\Debug\ + + + full true - Full - False True - DEBUG;TRACE - Project - bin\Debug\ILSpy.exe - - - bin\Release\ - False - None - True - False - TRACE - Program - bin\Release\ILSpy.exe - - false + + + pdbonly + true - - false + + + + $(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets + - - 3.0 - - - 3.0 - - - - 4.0 - - - 3.5 - - - 4.0 - - - - 3.5 - - - 3.0 - + + + + + + + + + + + + + @@ -84,30 +51,14 @@ + - - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - - - {984cc812-9470-4a13-aff9-cc44068d666c} - ICSharpCode.Decompiler - - - {1e85eff9-e370-4683-83e4-8a3d063ff791} - ILSpy - - - {dde2a481-8271-4eac-a330-8fa6a38d13d1} - ICSharpCode.TreeView - - + - + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 1212f2c0f..a1e31f499 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build: verbosity: minimal test: assemblies: - - 'ICSharpCode.Decompiler\bin\Debug\ICSharpCode.Decompiler.Tests.dll' - - 'ILSpy.BamlDecompiler\bin\Debug\ILSpy.BamlDecompiler.Tests.dll' + - 'ICSharpCode.Decompiler\bin\Debug\net461\ICSharpCode.Decompiler.Tests.dll' + - 'ILSpy.BamlDecompiler\bin\Debug\net461\ILSpy.BamlDecompiler.Tests.dll' after_test: - python BuildTools\tidy.py From 40456102a11fd4f5a7d60d3fdabe4b7b4f955064 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 14:47:31 -0500 Subject: [PATCH 06/15] Remove the x86 build configuration --- ICSharpCode.Decompiler.sln | 14 ------------- ILSpy.sln | 40 -------------------------------------- 2 files changed, 54 deletions(-) diff --git a/ICSharpCode.Decompiler.sln b/ICSharpCode.Decompiler.sln index 787fb3285..b3af26650 100644 --- a/ICSharpCode.Decompiler.sln +++ b/ICSharpCode.Decompiler.sln @@ -11,35 +11,21 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.Build.0 = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = net_4_0_Release|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|x86.ActiveCfg = Debug|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|x86.Build.0 = Debug|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.Build.0 = Release|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.ActiveCfg = Release|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.Build.0 = Release|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.ActiveCfg = Debug|x86 - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.Build.0 = Debug|x86 {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|Any CPU.ActiveCfg = Release|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|Any CPU.Build.0 = Release|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.ActiveCfg = Release|x86 - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ILSpy.sln b/ILSpy.sln index fc8cdada6..f41e66863 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -38,89 +38,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|x86.ActiveCfg = Debug|Any CPU - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|x86.Build.0 = Debug|Any CPU {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.Build.0 = Release|Any CPU - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|x86.ActiveCfg = Release|Any CPU - {1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|x86.Build.0 = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|x86.ActiveCfg = Debug|Any CPU - {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|x86.Build.0 = Debug|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.ActiveCfg = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU - {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|x86.ActiveCfg = Release|Any CPU - {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|x86.Build.0 = Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.Build.0 = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU - {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = net_4_0_Release|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|x86.ActiveCfg = Debug|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|x86.Build.0 = Debug|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.Build.0 = Release|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.ActiveCfg = Release|Any CPU - {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.Build.0 = Release|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.ActiveCfg = Debug|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Debug|x86.Build.0 = Debug|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|Any CPU.ActiveCfg = Release|Any CPU {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|Any CPU.Build.0 = Release|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.ActiveCfg = Release|Any CPU - {FEC0DA52-C4A6-4710-BE36-B484A20C5E22}.Release|x86.Build.0 = Release|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|x86.ActiveCfg = Debug|Any CPU - {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|x86.Build.0 = Debug|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|Any CPU.ActiveCfg = Release|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|Any CPU.Build.0 = Release|Any CPU - {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|x86.ActiveCfg = Release|Any CPU - {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|x86.Build.0 = Release|Any CPU {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU - {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU - {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|x86.Build.0 = net_4_0_Debug|Any CPU {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU - {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU - {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.Build.0 = net_4_0_Release|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.ActiveCfg = Debug|Any CPU - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.Build.0 = Debug|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.Build.0 = Release|Any CPU - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.ActiveCfg = Release|Any CPU - {A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.Build.0 = Release|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|x86.ActiveCfg = Debug|Any CPU - {1169E6D1-1899-43D4-A500-07CE4235B388}.Debug|x86.Build.0 = Debug|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|Any CPU.ActiveCfg = Release|Any CPU {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|Any CPU.Build.0 = Release|Any CPU - {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|x86.ActiveCfg = Release|Any CPU - {1169E6D1-1899-43D4-A500-07CE4235B388}.Release|x86.Build.0 = Release|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Debug|x86.ActiveCfg = Debug|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|Any CPU.Build.0 = Release|Any CPU - {9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From ff7086e10e781b592da029e1dfc0e88c67c20fcd Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 15:02:49 -0500 Subject: [PATCH 07/15] Generate NuGet package on build --- .editorconfig | 3 +++ ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj | 8 ++++++++ .../ICSharpCode.Decompiler.nuspec | 11 ++++++----- packages/build_decompiler_package.cmd | 5 ----- 4 files changed, 17 insertions(+), 10 deletions(-) rename {packages => ICSharpCode.Decompiler}/ICSharpCode.Decompiler.nuspec (71%) delete mode 100644 packages/build_decompiler_package.cmd diff --git a/.editorconfig b/.editorconfig index b7c3b6dc2..6242fc7f6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,9 @@ indent_size = 2 [*.config] indent_style = space indent_size = 2 +[*.nuspec] +indent_style = space +indent_size = 2 [*.vsixmanifest] indent_style = space indent_size = 2 diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 95e26b870..fc71c016f 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -12,6 +12,13 @@ ICSharpCode.Decompiler.snk + + true + true + ICSharpCode.Decompiler.nuspec + Configuration=$(Configuration) + + full true @@ -502,6 +509,7 @@ + diff --git a/packages/ICSharpCode.Decompiler.nuspec b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec similarity index 71% rename from packages/ICSharpCode.Decompiler.nuspec rename to ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec index e5201fed0..44caff5b0 100644 --- a/packages/ICSharpCode.Decompiler.nuspec +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec @@ -19,9 +19,10 @@ - - - - - + + + + + + \ No newline at end of file diff --git a/packages/build_decompiler_package.cmd b/packages/build_decompiler_package.cmd deleted file mode 100644 index 9735d6e07..000000000 --- a/packages/build_decompiler_package.cmd +++ /dev/null @@ -1,5 +0,0 @@ -rmdir /s /q %~dp0..\ICSharpCode.Decompiler\bin -rmdir /s /q %~dp0..\ICSharpCode.Decompiler\obj -nuget restore %~dp0..\ILSpy.sln || exit /b 1 -%windir%\microsoft.net\framework\v4.0.30319\msbuild %~dp0..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj /p:Configuration=Release "/p:Platform=Any CPU" /p:BuildNuGetPackage=True || exit /b 1 -nuget pack %~dp0ICSharpCode.Decompiler.nuspec /Symbols || exit /b 1 From 3d6d0569fade8cf44b7612a713a08cf53016fd97 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 15:03:11 -0500 Subject: [PATCH 08/15] Remove unused NuGet packages folder --- .gitignore | 1 - .../DiffLib.1.0.0.55/DiffLib.1.0.0.55.nupkg | Bin 21252 -> 0 bytes .../lib/net35-Client/DiffLib.XML | 641 ------------------ .../lib/net35-Client/DiffLib.dll | Bin 23552 -> 0 bytes packages/repositories.config | 9 - 5 files changed, 651 deletions(-) delete mode 100644 packages/DiffLib.1.0.0.55/DiffLib.1.0.0.55.nupkg delete mode 100644 packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.XML delete mode 100644 packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.dll delete mode 100644 packages/repositories.config diff --git a/.gitignore b/.gitignore index 15fbf331d..dd56bee10 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,5 @@ obj/ _ReSharper*/ *.ReSharper *.patch -/packages .vs/ /ICSharpCode.Decompiler/Tests/TestCases/*.exe diff --git a/packages/DiffLib.1.0.0.55/DiffLib.1.0.0.55.nupkg b/packages/DiffLib.1.0.0.55/DiffLib.1.0.0.55.nupkg deleted file mode 100644 index b03c58b990080d884ac150e9867da77a87f62963..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21252 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 diff --git a/packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.XML b/packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.XML deleted file mode 100644 index beb4c26cd..000000000 --- a/packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.XML +++ /dev/null @@ -1,641 +0,0 @@ - - - - DiffLib - - - - - This class holds a single collection from either the first or the second, or both, - collections given to the class, along - with the type of change that the elements produce. - - - - - Initializes a new instance of . - - - The type of change this details. - - - The element from the first collection. If is , then - this parameter has no meaning. - - - The element from the second collection. If is , then - this parameter has no meaning. - - - - - Indicates whether the current object is equal to another object of the same type. - - - true if the current object is equal to the parameter; otherwise, false. - - An object to compare with this object. - - - - Determines whether the specified is equal to the current . - - - true if the specified is equal to the current ; otherwise, false. - - The to compare with the current . 2 - - - - Serves as a hash function for a particular type. - - - A hash code for the current . - - 2 - - - - Returns a that represents the current . - - - A that represents the current . - - 2 - - - - The type of change this details. - - - - - The element from the first collection. If is , then - the value of this property has no meaning. - - - - - The element from the second collection. If is , then - the value of this property has no meaning. - - - - - This enum is used by to specify how - the two elements from the two collections relate. - - - - - The two elements are the same. - - - - - The second element was added in the second collection. - - - - - The first element was removed from the second collection. - - - - - The first element was changed/replaced with the second element in the second collection. - - - - - This class implements the basic diff algorithm by recursively applying the Longest Common Substring - on pieces of the collections, and reporting sections that are similar, and those that are not, - in the appropriate sequence. - - - The types of elements in the collections being compared. - - - - - Initializes a new instance of - using the default instance for the - type. - - - The first collection of items. - - - The second collection of items. - - - is null. - - or - - is null. - - - - - Initializes a new instance of . - - - The first collection of items. - - - The second collection of items. - - - The that will be used to compare elements from - with elements from . - - - is null. - - or - - is null. - - or - - is null. - - - - - Returns an enumerator that iterates through the collection. - - - A that can be used to iterate through the collection. - - 1 - - - - Generates the diff between the two collections. - - - - - This class contains a single section of diff output from the - method. - - - - - Initializes a new instance of . - - - If true, then the section specifies a section from the first - collection that is equal to a section from the second collection; - otherwise, if false, then the section from the first - collection was replaced with the section from the second collection. - - - The length of the section in the first collection. Can be 0 if - the section specifies that new content was added in the second - collection. - - - The length of the section in the second collection. Can be 0 if - the section specifies that old content was deleted in the second - collection. - - - is negative. - - or - - is negative. - - - is true but is not equal to . - - - - - Indicates whether the current object is equal to another object of the same type. - - - true if the current object is equal to the parameter; otherwise, false. - - An object to compare with this object. - - - - Determines whether the specified is equal to the current . - - - true if the specified is equal to the current ; otherwise, false. - - The to compare with the current . 2 - - - - Serves as a hash function for a particular type. - - - A hash code for the current . - - 2 - - - - Returns a that represents the current . - - - A that represents the current . - - 2 - - - - Gets whether the specifies equal sections in the two - collections, or differing sections. - - - If true, then the section specifies a section from the first - collection that is equal to a section from the second collection; - otherwise, if false, then the section from the first - collection was replaced with the section from the second collection. - - - - - The length of the section in the first collection. - - - - - The length of the section in the second collection. - - - - - This interface must be implemented by classes that will do similarity-filtering - during alignment () to determine - if two aligned elements are similar enough to report - them as a change, instead of as a delete plus an add. - - - The type of elements being compared. - - - - - Determines if the two values are similar enough to align them - as a change, instead of not aligning them but reporting them - as a delete plus an add instead. - - - The first value to compare against . - - - The second value to compare against . - - - true if the two values are similar enough to report - them as a change; false if the two values aren't similar enough - but needs to be reported as a delete plus an add. - - - - - This interface must be implemented by classes that will do similarity-calculation - for use with the class. - - - The type of elements being compared. - - - - - Does a similarity comparison between the two values and returns their - similarity, a value ranging from 0.0 to 1.0, where 0.0 means they're - completely different and 1.0 means they have the same value. - - - The first value to compare. - - - The second value to compare. - - - A value ranging from 0.0 to 1.0, where 0.0 means they're - completely different and 1.0 means they have the same value. - - - - - This class implements the LCS algorithm, to find the longest common substring that exists - in two collections, and return the locations of those substrings. - - - The types of elements in the collections being compared. - - - - - Initializes a new instance of the class - using the default instance for the - type. - - - The first collection of items. - - - The second collection of items. - - - is null. - - or - - is null. - - - - - Initializes a new instance of the class. - - - The first collection of items. - - - The second collection of items. - - - The that will be used to compare elements from - with elements from . - - - is null. - - or - - is null. - - or - - is null. - - - - - Finds the longest common substring and returns its position in the two collections, and - its length, or null if no such common substring can be located. - - - A containing the positions of the two substrings, one position - for each collection, both 0-based, and the length of the substring. If no common substring can be found, null - will be returned. - - - - - Finds the longest common substring and returns its position in the two collections, and - its length, or null if no such common substring can be located. - - - The starting position in the first collection, 0-based. Included in the search. - - - The ending position in the first collection, 0-based. Not included in the search. - - - The starting position in the second collection, 0-based. Included in the search. - - - The ending position in the second collection, 0-based. Not included in the search. - - - A containing the positions of the two substrings, one position - for each collection, both 0-based, and the length of the substring. If no common substring can be found, null - will be returned. - - - is less than 0. - - or - - is greater than . - - or - - is greater than the length of the first collection. - - or - - is less than 0. - - or - - is greater than . - - or - - is greater than the length of the second collection. - - - - - This class holds the result of calling . - - - - - Initializes a new instance of . - - - The position in the first collection, 0-based. - - - The position in the second collection, 0-based. - - - The length of the common substring. - - - is negative. - - or - - is negative. - - or - - is zero or negative. - - - - - Indicates whether the current object is equal to another object of the same type. - - - true if the current object is equal to the parameter; otherwise, false. - - An object to compare with this object. - - - - Determines whether the specified is equal to the current . - - - true if the specified is equal to the current ; otherwise, false. - - The to compare with the current . 2 - - - - Serves as a hash function for a particular type. - - - A hash code for the current . - - 2 - - - - Returns a that represents the current . - - - A that represents the current . - - 2 - - - - The position in the first collection, 0-based. - - - - - The position in the second collection, 0-based. - - - - - The length of the common substring. - - - - - This class implements a slightly more advanced diff algorithm than by - taking the output from and attempting to align individual elements inside - replace-blocks. This is mostly suitable for text file diffs. - - - The types of elements in the collections being compared. - - - - - Initializes a new instance of . - - - The first collection of items. - - - The second collection of items. - - - The that will be used to compare elements from - with elements from . - - - The that will be used to attempt to align elements - inside blocks that consists of elements from the first collection being replaced - with elements from the second collection. - - - The that will be used to determine if - two aligned elements are similar enough to be report them as a change from - one to another, or to report them as one being deleted and the other added in - its place. - - - is null. - - or - - is null. - - or - - is null. - - or - - is null. - - - - - Returns an enumerator that iterates through the collection. - - - A that can be used to iterate through the collection. - - 1 - - - - Generates the diff, one line of output at a time. - - - A collection of objects, one for - each line in the first or second collection (sometimes one instance for a line - from both, when lines are equal or similar.) - - - - - This class implements for strings, doing a very basic "diff" between the two, - and calculating how much of the text occurs in both. - - - - - Does a similarity comparison between the two values and returns their - similarity, a value ranging from 0.0 to 1.0, where 0.0 means they're - completely different and 1.0 means they have the same value. - - - The first value to compare. - - - The second value to compare. - - - A value ranging from 0.0 to 1.0, where 0.0 means they're - completely different and 1.0 means they have the same value. - - - - - This class implements for strings, doing a very basic "diff" between the two, - and calculating how much of the text occurs in both. - - - - - Initializes a new instance of the class. - - - - - Initializes a new instance of the class. - - - The diff predicate used to determine if the strings are - similar enough (see for details. - - is null. - - - - Determines if the two values are similar enough to align them - as a change, instead of not aligning them but reporting them - as a delete plus an add instead. - - - The first value to compare against . - - - The second value to compare against . - - - true if the two values are similar enough to report - them as a change; false if the two values aren't similar enough - but needs to be reported as a delete plus an add. - - - - - This delegate is used by to - determine if the two strings are similar enough to report them - as a change, instead of as a delete plus and add. - - - The first string to compare. - - - The second string to compare. - - - The diff between and . - - - true if the strings are similar enough (reported as a change); - otherwise, false (reported as a delete plus an add.) - - - - diff --git a/packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.dll b/packages/DiffLib.1.0.0.55/lib/net35-Client/DiffLib.dll deleted file mode 100644 index d5963dea08ad456e6e237973582b2469b137c1aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23552 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 M%Kv=+|FgjV0i+#tH~;_u diff --git a/packages/repositories.config b/packages/repositories.config deleted file mode 100644 index f357e2fb3..000000000 --- a/packages/repositories.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file From cb96be5c117abc8f22e73f0b1f52a36b3065e1db Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 15:09:52 -0500 Subject: [PATCH 09/15] Remove unused exclusion --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index dd56bee10..abf23cfd7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ _ReSharper*/ *.ReSharper *.patch .vs/ -/ICSharpCode.Decompiler/Tests/TestCases/*.exe From e0c79ddb8d53734bc06fccd7161c84675afb6ab6 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 15:14:48 -0500 Subject: [PATCH 10/15] Require Visual Studio 2017 or newer --- ICSharpCode.Decompiler.sln | 2 +- ILSpy.sln | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ICSharpCode.Decompiler.sln b/ICSharpCode.Decompiler.sln index b3af26650..03bac74d8 100644 --- a/ICSharpCode.Decompiler.sln +++ b/ICSharpCode.Decompiler.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.12 -MinimumVisualStudioVersion = 10.0.40219.1 +MinimumVisualStudioVersion = 15.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" diff --git a/ILSpy.sln b/ILSpy.sln index f41e66863..7c164b62d 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.12 -MinimumVisualStudioVersion = 10.0.40219.1 +MinimumVisualStudioVersion = 15.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}" ProjectSection(SolutionItems) = preProject doc\Command Line.txt = doc\Command Line.txt From 2330274599fec92a7437a94ad3891388f0aa87fb Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 15:20:43 -0500 Subject: [PATCH 11/15] Add a .NET Standard 2.0 build of ICSharpCode.Decompiler --- ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj | 2 +- ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index fc71c016f..a72696dc5 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -2,7 +2,7 @@ - net461 + net461;netstandard2.0 False diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec index 44caff5b0..513ed3434 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec @@ -22,7 +22,12 @@ + + + + + \ No newline at end of file From 5975b2ea6756914abacfabe4c2857603ec7855c1 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 20:48:19 -0500 Subject: [PATCH 12/15] Work around improper .NET Standard build support in cecil --- .../ICSharpCode.Decompiler.Tests.csproj | 2 +- ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj | 2 +- ILSpy.AddIn/ILSpy.AddIn.csproj | 5 ++--- .../ILSpy.BamlDecompiler.Tests.csproj | 2 +- ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj | 2 +- ILSpy/ILSpy.csproj | 4 ++-- TestPlugin/TestPlugin.csproj | 2 +- appveyor.yml | 6 ++---- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index e3363b5ef..b615cc7c0 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -39,7 +39,7 @@ - + diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index a72696dc5..99c21d3a2 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -42,7 +42,7 @@ - + diff --git a/ILSpy.AddIn/ILSpy.AddIn.csproj b/ILSpy.AddIn/ILSpy.AddIn.csproj index a00e3424c..d8c8fe6af 100644 --- a/ILSpy.AddIn/ILSpy.AddIn.csproj +++ b/ILSpy.AddIn/ILSpy.AddIn.csproj @@ -44,12 +44,11 @@ - - - + + diff --git a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj index f22ee7231..954ee0b03 100644 --- a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj +++ b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj @@ -37,7 +37,7 @@ - + diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj index 747c3c8d6..715adb513 100644 --- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj +++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj @@ -46,7 +46,7 @@ False - + False diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index 51d2bb8f0..80959eb0c 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -53,8 +53,8 @@ - - + + diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj index 288b3331f..0b88693e2 100644 --- a/TestPlugin/TestPlugin.csproj +++ b/TestPlugin/TestPlugin.csproj @@ -35,7 +35,7 @@ - + diff --git a/appveyor.yml b/appveyor.yml index a1e31f499..a2739c62d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,10 +6,8 @@ install: - git submodule update --init --recursive before_build: - nuget restore ILSpy.sln -build: - project: ILSpy.sln - parallel: false - verbosity: minimal +build_script: +- msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test: assemblies: - 'ICSharpCode.Decompiler\bin\Debug\net461\ICSharpCode.Decompiler.Tests.dll' From abfe707b0fd87f2d3df3a240777f5c5a264f9332 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 20:49:48 -0500 Subject: [PATCH 13/15] Work around improper integration of assembly info generation --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a2739c62d..75c255dde 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ install: before_build: - nuget restore ILSpy.sln build_script: -- msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" +- msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false /t:BeforeBuild,Build "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test: assemblies: - 'ICSharpCode.Decompiler\bin\Debug\net461\ICSharpCode.Decompiler.Tests.dll' From 8c428a1ffb6929d31eca8d1c4698dfc184442fb1 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 22:20:50 -0500 Subject: [PATCH 14/15] Fix paths to test assemblies --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 75c255dde..5ed4d5526 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ build_script: - msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false /t:BeforeBuild,Build "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test: assemblies: - - 'ICSharpCode.Decompiler\bin\Debug\net461\ICSharpCode.Decompiler.Tests.dll' - - 'ILSpy.BamlDecompiler\bin\Debug\net461\ILSpy.BamlDecompiler.Tests.dll' + - 'ICSharpCode.Decompiler.Tests\bin\Debug\net461\ICSharpCode.Decompiler.Tests.exe' + - 'ILSpy.BamlDecompiler.Tests\bin\Debug\net461\ILSpy.BamlDecompiler.Tests.dll' after_test: - python BuildTools\tidy.py From 472a735c4567c91605a0987ec6d4b122d425d6b7 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Fri, 1 Sep 2017 09:27:35 -0500 Subject: [PATCH 15/15] Fix assembly info generation --- .../ICSharpCode.Decompiler.csproj | 14 ++++++++++++-- .../Properties/AssemblyInfo.template.cs | 8 -------- appveyor.yml | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 99c21d3a2..5a411cedc 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -1,10 +1,18 @@  - + + net461;netstandard2.0 - False + IL decompiler engine + ic#code + ILSpy + Copyright 2011-2016 AlphaSierraPapa for the SharpDevelop Team + en-US + False + False + False false @@ -535,6 +543,8 @@ + + UpdateAssemblyInfo.exe diff --git a/ICSharpCode.Decompiler/Properties/AssemblyInfo.template.cs b/ICSharpCode.Decompiler/Properties/AssemblyInfo.template.cs index 5a7a67424..4d92e6271 100644 --- a/ICSharpCode.Decompiler/Properties/AssemblyInfo.template.cs +++ b/ICSharpCode.Decompiler/Properties/AssemblyInfo.template.cs @@ -1,7 +1,5 @@ #region Using directives -using System; -using System.Resources; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -9,11 +7,6 @@ using System.Diagnostics.CodeAnalysis; #endregion -[assembly: AssemblyTitle("ICSharpCode.Decompiler")] -[assembly: AssemblyDescription("IL decompiler engine")] -[assembly: AssemblyCompany("ic#code")] -[assembly: AssemblyProduct("ILSpy")] -[assembly: AssemblyCopyright("Copyright 2011-2016 AlphaSierraPapa for the SharpDevelop Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -23,7 +16,6 @@ using System.Diagnostics.CodeAnalysis; [assembly: AssemblyVersion("$INSERTVERSION$")] [assembly: AssemblyInformationalVersion("$INSERTVERSION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$-$INSERTSHORTCOMMITHASH$")] -[assembly: NeutralResourcesLanguage("en-US")] [assembly: InternalsVisibleTo("ICSharpCode.Decompiler.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004dcf3979c4e902efa4dd2163a039701ed5822e6f1134d77737296abbb97bf0803083cfb2117b4f5446a217782f5c7c634f9fe1fc60b4c11d62c5b3d33545036706296d31903ddcf750875db38a8ac379512f51620bb948c94d0831125fbc5fe63707cbb93f48c1459c4d1749eb7ac5e681a2f0d6d7c60fa527a3c0b8f92b02bf")] diff --git a/appveyor.yml b/appveyor.yml index 5ed4d5526..b023e6224 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ install: before_build: - nuget restore ILSpy.sln build_script: -- msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false /t:BeforeBuild,Build "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" +- msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test: assemblies: - 'ICSharpCode.Decompiler.Tests\bin\Debug\net461\ICSharpCode.Decompiler.Tests.exe'