From 2bce5bb210987f876e6ca61f1d670c93d6863b40 Mon Sep 17 00:00:00 2001 From: Martin Karing Date: Wed, 11 Jul 2018 00:50:12 +0200 Subject: [PATCH] Updated Project System to SDK Style Projects Preparing the .NET Standard compatibility --- Confuser.CLI/Confuser.CLI.csproj | 12 +- Confuser.Core/Confuser.Core.csproj | 178 +++--------------- Confuser.Core/Properties/AssemblyInfo.cs | 5 - Confuser.DynCipher/Confuser.DynCipher.csproj | 117 ++---------- Confuser.DynCipher/Properties/AssemblyInfo.cs | 5 - .../Confuser.Protections.csproj | 176 ++--------------- .../Properties/AssemblyInfo.cs | 5 - Confuser.Renamer/Confuser.Renamer.csproj | 134 ++----------- Confuser.Renamer/Properties/AssemblyInfo.cs | 5 - Confuser.Runtime/Confuser.Runtime.csproj | 90 ++------- Confuser.Runtime/Properties/AssemblyInfo.cs | 5 - Confuser2.sln | 31 +-- ConfuserEx.Common.props | 28 +++ ConfuserEx.Common.targets | 10 + ConfuserEx/ConfuserEx.csproj | 29 +-- ConfuserEx/packages.config | 5 +- version.json | 21 +++ 17 files changed, 194 insertions(+), 662 deletions(-) delete mode 100644 Confuser.Core/Properties/AssemblyInfo.cs delete mode 100644 Confuser.DynCipher/Properties/AssemblyInfo.cs delete mode 100644 Confuser.Protections/Properties/AssemblyInfo.cs delete mode 100644 Confuser.Renamer/Properties/AssemblyInfo.cs delete mode 100644 Confuser.Runtime/Properties/AssemblyInfo.cs create mode 100644 ConfuserEx.Common.props create mode 100644 ConfuserEx.Common.targets create mode 100644 version.json diff --git a/Confuser.CLI/Confuser.CLI.csproj b/Confuser.CLI/Confuser.CLI.csproj index 47134b0..8f3340c 100644 --- a/Confuser.CLI/Confuser.CLI.csproj +++ b/Confuser.CLI/Confuser.CLI.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,7 @@ Properties Confuser.CLI Confuser.CLI - v4.0 - v4.5 + v4.6.1 512 ..\ true @@ -28,6 +27,7 @@ 4 + true AnyCPU @@ -39,6 +39,7 @@ 4 + true true @@ -80,15 +81,12 @@ {A45C184F-F98F-4258-A928-BFF437034791} Confuser.Runtime - - {FDFC1237-143F-4919-8318-4926901F4639} - dnlib - Properties\ConfuserEx.snk + diff --git a/Confuser.Core/Confuser.Core.csproj b/Confuser.Core/Confuser.Core.csproj index 6508ca3..76215a6 100644 --- a/Confuser.Core/Confuser.Core.csproj +++ b/Confuser.Core/Confuser.Core.csproj @@ -1,165 +1,35 @@  - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92} - Library - Properties - Confuser.Core - Confuser.Core - v4.0 - v4.5 - 512 - ..\ - true - - - - true - full - false - ..\Debug\bin\ - DEBUG;TRACE - prompt - 4 - ..\Debug\bin\Confuser.Core.xml - - - pdbonly - true - ..\Release\bin\ - TRACE - prompt - 4 - ..\Release\bin\Confuser.Core.xml - - + + + + + + net461;netstandard2.0 true - - ..\ConfuserEx.snk - - - - + + + ConfuserEx Core + Core framework of ConfuserEx + Bla + + + + + - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {FDFC1237-143F-4919-8318-4926901F4639} - dnlib - + + + + Designer - - - Properties\ConfuserEx.snk - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file + + + + diff --git a/Confuser.Core/Properties/AssemblyInfo.cs b/Confuser.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index 0fe6779..0000000 --- a/Confuser.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using System.Reflection; - -[assembly: AssemblyTitle("ConfuserEx Core")] -[assembly: AssemblyDescription("Core framework of ConfuserEx")] \ No newline at end of file diff --git a/Confuser.DynCipher/Confuser.DynCipher.csproj b/Confuser.DynCipher/Confuser.DynCipher.csproj index 884a5fa..669658e 100644 --- a/Confuser.DynCipher/Confuser.DynCipher.csproj +++ b/Confuser.DynCipher/Confuser.DynCipher.csproj @@ -1,106 +1,23 @@  - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {E832E9B8-2158-4FC0-89A1-56C6ECC10F6B} - Library - Properties - Confuser.DynCipher - Confuser.DynCipher - v4.0 - v4.5 - 512 - - - - true - full - false - ..\Debug\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Release\bin\ - TRACE - prompt - 4 - - + + + + + + net461;netstandard2.0 true - - ..\ConfuserEx.snk - - - + + + ConfuserEx Dynamic Cipher Library + Cipher generator of ConfuserEx + + + + - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92} - Confuser.Core - - - {FDFC1237-143F-4919-8318-4926901F4639} - dnlib - - - - - Properties\ConfuserEx.snk - - - - + + + \ No newline at end of file diff --git a/Confuser.DynCipher/Properties/AssemblyInfo.cs b/Confuser.DynCipher/Properties/AssemblyInfo.cs deleted file mode 100644 index de693e3..0000000 --- a/Confuser.DynCipher/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using System.Reflection; - -[assembly: AssemblyTitle("ConfuserEx Dynamic Cipher Library")] -[assembly: AssemblyDescription("Cipher generator of ConfuserEx")] \ No newline at end of file diff --git a/Confuser.Protections/Confuser.Protections.csproj b/Confuser.Protections/Confuser.Protections.csproj index c28762a..db0434a 100644 --- a/Confuser.Protections/Confuser.Protections.csproj +++ b/Confuser.Protections/Confuser.Protections.csproj @@ -1,163 +1,25 @@  - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {3EAB01B5-9B49-48D8-BFA1-5493B26CCB71} - Library - Properties - Confuser.Protections - Confuser.Protections - v4.0 - v4.5 - 512 - ..\ - true - - - - true - full - false - ..\Debug\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Release\bin\ - TRACE - prompt - 4 - - + + + + + + net461;netstandard2.0 true - - ..\ConfuserEx.snk - - - - + + + ConfuserEx Protections + Protections and packers of ConfuserEx + + + + + + - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - Code - - - - - - - Code - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\ConfuserEx.snk - - - - - {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92} - Confuser.Core - - - {E832E9B8-2158-4FC0-89A1-56C6ECC10F6B} - Confuser.DynCipher - - - {862DA0DA-52E1-47CD-B9C2-46B106031B28} - Confuser.Renamer - - - {A45C184F-F98F-4258-A928-BFF437034791} - Confuser.Runtime - - - {FDFC1237-143F-4919-8318-4926901F4639} - dnlib - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + \ No newline at end of file diff --git a/Confuser.Protections/Properties/AssemblyInfo.cs b/Confuser.Protections/Properties/AssemblyInfo.cs deleted file mode 100644 index 142f8fe..0000000 --- a/Confuser.Protections/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using System.Reflection; - -[assembly: AssemblyTitle("ConfuserEx Protections")] -[assembly: AssemblyDescription("Protections and packers of ConfuserEx")] \ No newline at end of file diff --git a/Confuser.Renamer/Confuser.Renamer.csproj b/Confuser.Renamer/Confuser.Renamer.csproj index c09f48c..65642de 100644 --- a/Confuser.Renamer/Confuser.Renamer.csproj +++ b/Confuser.Renamer/Confuser.Renamer.csproj @@ -1,121 +1,27 @@  - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {862DA0DA-52E1-47CD-B9C2-46B106031B28} - Library - Properties - Confuser.Renamer - Confuser.Renamer - v4.0 - v4.5 - 512 - - - - true - full - false - ..\Debug\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Release\bin\ - TRACE - prompt - 4 - - + + + + + + net461;netstandard2.0 true - - ..\ConfuserEx.snk - - - - - + + + ConfuserEx Renamer + Renaming analysis of ConfuserEx + + + + - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92} - Confuser.Core - - - {FDFC1237-143F-4919-8318-4926901F4639} - dnlib - - - - - Properties\ConfuserEx.snk - - - - + + + \ No newline at end of file diff --git a/Confuser.Renamer/Properties/AssemblyInfo.cs b/Confuser.Renamer/Properties/AssemblyInfo.cs deleted file mode 100644 index 0c38931..0000000 --- a/Confuser.Renamer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using System.Reflection; - -[assembly: AssemblyTitle("ConfuserEx Renamer")] -[assembly: AssemblyDescription("Renaming analysis of ConfuserEx")] \ No newline at end of file diff --git a/Confuser.Runtime/Confuser.Runtime.csproj b/Confuser.Runtime/Confuser.Runtime.csproj index 5fe5d23..aa9640e 100644 --- a/Confuser.Runtime/Confuser.Runtime.csproj +++ b/Confuser.Runtime/Confuser.Runtime.csproj @@ -1,82 +1,20 @@  - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {A45C184F-F98F-4258-A928-BFF437034791} - Library - Properties - Confuser.Runtime - Confuser.Runtime - v2.0 - 512 - - - - true - full - false - ..\Debug\bin\ - DEBUG;TRACE - prompt - 4 + + + + + + net20 true - - - pdbonly - true - ..\Release\bin\ - TRACE - prompt - 4 - true - - true - - ..\ConfuserEx.snk - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\ConfuserEx.snk - - - - - + + + ConfuserEx Runtime + Runtime library of ConfuserEx + + + + \ No newline at end of file diff --git a/Confuser.Runtime/Properties/AssemblyInfo.cs b/Confuser.Runtime/Properties/AssemblyInfo.cs deleted file mode 100644 index aa3a74d..0000000 --- a/Confuser.Runtime/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using System.Reflection; - -[assembly: AssemblyTitle("ConfuserEx Runtime")] -[assembly: AssemblyDescription("Runtime library of ConfuserEx")] \ No newline at end of file diff --git a/Confuser2.sln b/Confuser2.sln index c9d645f..ee4adc6 100644 --- a/Confuser2.sln +++ b/Confuser2.sln @@ -1,11 +1,11 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.Core", "Confuser.Core\Confuser.Core.csproj", "{BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2035 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.Core", "Confuser.Core\Confuser.Core.csproj", "{BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dnlib", "dnlib\src\dnlib.csproj", "{FDFC1237-143F-4919-8318-4926901F4639}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.Protections", "Confuser.Protections\Confuser.Protections.csproj", "{3EAB01B5-9B49-48D8-BFA1-5493B26CCB71}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.Protections", "Confuser.Protections\Confuser.Protections.csproj", "{3EAB01B5-9B49-48D8-BFA1-5493B26CCB71}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2C631F61-84D5-4E49-8CD7-0876A07A3B21}" ProjectSection(SolutionItems) = preProject @@ -15,17 +15,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2C631F EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.CLI", "Confuser.CLI\Confuser.CLI.csproj", "{CE61ADEE-C032-43EC-ACD8-E4A742F894A3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.Renamer", "Confuser.Renamer\Confuser.Renamer.csproj", "{862DA0DA-52E1-47CD-B9C2-46B106031B28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.Renamer", "Confuser.Renamer\Confuser.Renamer.csproj", "{862DA0DA-52E1-47CD-B9C2-46B106031B28}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.DynCipher", "Confuser.DynCipher\Confuser.DynCipher.csproj", "{E832E9B8-2158-4FC0-89A1-56C6ECC10F6B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.DynCipher", "Confuser.DynCipher\Confuser.DynCipher.csproj", "{E832E9B8-2158-4FC0-89A1-56C6ECC10F6B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.Runtime", "Confuser.Runtime\Confuser.Runtime.csproj", "{A45C184F-F98F-4258-A928-BFF437034791}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.Runtime", "Confuser.Runtime\Confuser.Runtime.csproj", "{A45C184F-F98F-4258-A928-BFF437034791}" ProjectSection(ProjectDependencies) = postProject {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92} = {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfuserEx", "ConfuserEx\ConfuserEx.csproj", "{B5205EBA-EC32-4C53-86A0-FAEEE7393EC0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dnlib.netstandard", "dnlib\src\dnlib.netstandard.csproj", "{8AF54053-37AA-4D06-90A8-CCEFDFDF902F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,10 +38,6 @@ Global {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92}.Debug|Any CPU.Build.0 = Debug|Any CPU {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92}.Release|Any CPU.ActiveCfg = Release|Any CPU {BEB67A6E-4C54-4DE5-8C6B-2C12F44A7B92}.Release|Any CPU.Build.0 = Release|Any CPU - {FDFC1237-143F-4919-8318-4926901F4639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDFC1237-143F-4919-8318-4926901F4639}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDFC1237-143F-4919-8318-4926901F4639}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDFC1237-143F-4919-8318-4926901F4639}.Release|Any CPU.Build.0 = Release|Any CPU {3EAB01B5-9B49-48D8-BFA1-5493B26CCB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3EAB01B5-9B49-48D8-BFA1-5493B26CCB71}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EAB01B5-9B49-48D8-BFA1-5493B26CCB71}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -64,8 +62,15 @@ Global {B5205EBA-EC32-4C53-86A0-FAEEE7393EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU {B5205EBA-EC32-4C53-86A0-FAEEE7393EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5205EBA-EC32-4C53-86A0-FAEEE7393EC0}.Release|Any CPU.Build.0 = Release|Any CPU + {8AF54053-37AA-4D06-90A8-CCEFDFDF902F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8AF54053-37AA-4D06-90A8-CCEFDFDF902F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8AF54053-37AA-4D06-90A8-CCEFDFDF902F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8AF54053-37AA-4D06-90A8-CCEFDFDF902F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0D937D9E-E04B-4A68-B639-D4260473A388} + EndGlobalSection EndGlobal diff --git a/ConfuserEx.Common.props b/ConfuserEx.Common.props new file mode 100644 index 0000000..53ce3cb --- /dev/null +++ b/ConfuserEx.Common.props @@ -0,0 +1,28 @@ + + + + true + 7.3 + + + + Ki;Martin Karing + Copyright © 2014 Ki, 2018 Martin Karing + https://github.com/mkaring/ConfuserEx.git + git + + + + en + + + + GitHub + $(RepositoryUrl) + + + + false + + + \ No newline at end of file diff --git a/ConfuserEx.Common.targets b/ConfuserEx.Common.targets new file mode 100644 index 0000000..d71a793 --- /dev/null +++ b/ConfuserEx.Common.targets @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/ConfuserEx/ConfuserEx.csproj b/ConfuserEx/ConfuserEx.csproj index 9e137d5..13fef03 100644 --- a/ConfuserEx/ConfuserEx.csproj +++ b/ConfuserEx/ConfuserEx.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -16,6 +16,8 @@ true ..\ true + v4.6.1 + true @@ -24,6 +26,7 @@ full AnyCPU prompt + false ..\Release\bin\ @@ -32,6 +35,7 @@ pdbonly AnyCPU prompt + false ConfuserEx.ico @@ -43,21 +47,24 @@ ..\ConfuserEx.snk - - ..\packages\MvvmLightLibs.4.3.31.1\lib\net40\GalaSoft.MvvmLight.Extras.WPF4.dll + + ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\MvvmLightLibs.4.3.31.1\lib\net40\GalaSoft.MvvmLight.WPF4.dll + + ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.dll - - ..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll + + ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Extras.dll + + + ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Platform.dll ..\deps\Ookii.Dialogs.Wpf.dll - - ..\packages\MvvmLightLibs.4.3.31.1\lib\net40\System.Windows.Interactivity.dll + + ..\packages\MvvmLightLibs.5.4.1\lib\net45\System.Windows.Interactivity.dll @@ -208,10 +215,6 @@ {A45C184F-F98F-4258-A928-BFF437034791} Confuser.Runtime - - {FDFC1237-143F-4919-8318-4926901F4639} - dnlib - diff --git a/ConfuserEx/packages.config b/ConfuserEx/packages.config index 55cb3f9..cd6c975 100644 --- a/ConfuserEx/packages.config +++ b/ConfuserEx/packages.config @@ -1,6 +1,5 @@  - - - + + \ No newline at end of file diff --git a/version.json b/version.json new file mode 100644 index 0000000..3707236 --- /dev/null +++ b/version.json @@ -0,0 +1,21 @@ +{ + "version": "1.1.0-alpha1.{height}", + "nugetPackageVersion": { + "semVer": 1 + }, + "semVer1NumericIdentifierPadding": 4, + "publicReleaseRefSpec": [ + "^refs/heads/release", + "^refs/tags/\\d+\\.\\d+(?:\\.\\d+)?" + ], + "cloudBuild": { + "setVersionVariables": true, + "buildNumber": { + "enabled": false, + "includeCommitId": { + "when": "nonPublicReleaseOnly", + "where": "buildMetadata" + } + } + } +} \ No newline at end of file