From 4908b129f82c58adb3662683c1067d32ead60bca Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 31 Aug 2017 13:00:37 -0500 Subject: [PATCH] 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