From e79653c0e1b2156d34462971ddb18ef1cad7999f Mon Sep 17 00:00:00 2001 From: "Jan-Hendrik Peters [MSFT]" Date: Fri, 13 Apr 2018 10:58:16 +0200 Subject: [PATCH] Updated projects to use NuGet packages AlphaFS and System.Management.Automation are both NuGet packages Updated project to .NET 4.5.2 Removed AlphaFS code from Solution --- Log/Log.csproj | 9 +++++--- NTFSSecurity.sln | 21 +++++-------------- NTFSSecurity/NTFSSecurity.csproj | 21 +++++++++++-------- NTFSSecurity/Properties/Resources.Designer.cs | 4 ++-- NTFSSecurity/packages.config | 5 +++++ PrivilegeControl/PrivilegeControl.csproj | 9 +++++--- ProcessPrivileges/ProcessPrivileges.csproj | 9 +++++--- Security2/Security2.csproj | 14 +++++++------ Security2/packages.config | 4 ++++ TestClient/TestClient.csproj | 9 ++++---- TestClient/app.config | 3 +++ 11 files changed, 61 insertions(+), 47 deletions(-) create mode 100644 NTFSSecurity/packages.config create mode 100644 Security2/packages.config create mode 100644 TestClient/app.config diff --git a/Log/Log.csproj b/Log/Log.csproj index 75519e2..b875a7b 100644 --- a/Log/Log.csproj +++ b/Log/Log.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,13 +9,14 @@ Properties Log Log - v3.5 + v4.5.2 512 SAK SAK SAK SAK - Client + + true @@ -25,6 +26,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -33,6 +35,7 @@ TRACE prompt 4 + false diff --git a/NTFSSecurity.sln b/NTFSSecurity.sln index a562711..62b9bf1 100644 --- a/NTFSSecurity.sln +++ b/NTFSSecurity.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTFSSecurity", "NTFSSecurity\NTFSSecurity.csproj", "{17768E1A-1422-4BD2-A9A5-42BA9FEB82B8}" EndProject @@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessPrivileges", "Proces EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Log", "Log\Log.csproj", "{66624E57-402E-44F4-A072-9DB1827A5E20}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlphaFS", "AlphaFS\AlphaFS.csproj", "{F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTFSSecurityTest", "NTFSSecurityTest\NTFSSecurityTest.csproj", "{675D40FA-F56C-4ACC-B863-18B4A14F93E0}" EndProject Global @@ -91,18 +89,6 @@ Global {66624E57-402E-44F4-A072-9DB1827A5E20}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {66624E57-402E-44F4-A072-9DB1827A5E20}.Release|Mixed Platforms.Build.0 = Release|Any CPU {66624E57-402E-44F4-A072-9DB1827A5E20}.Release|x86.ActiveCfg = Release|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Debug|x86.ActiveCfg = Debug|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Debug|x86.Build.0 = Debug|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Release|Any CPU.Build.0 = Release|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Release|x86.ActiveCfg = Release|Any CPU - {F0F9AF1E-D5B5-4D72-804A-5380622FBDEA}.Release|x86.Build.0 = Release|Any CPU {675D40FA-F56C-4ACC-B863-18B4A14F93E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {675D40FA-F56C-4ACC-B863-18B4A14F93E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {675D40FA-F56C-4ACC-B863-18B4A14F93E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -119,4 +105,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9CE00B8E-005B-480A-9E1C-BF7A4D7887E0} + EndGlobalSection EndGlobal diff --git a/NTFSSecurity/NTFSSecurity.csproj b/NTFSSecurity/NTFSSecurity.csproj index d949182..8de27fe 100644 --- a/NTFSSecurity/NTFSSecurity.csproj +++ b/NTFSSecurity/NTFSSecurity.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,9 +10,10 @@ Properties NTFSSecurity NTFSSecurity - v3.5 + v4.5.2 512 - Client + + SAK SAK SAK @@ -40,13 +41,18 @@ bin\Release\NTFSSecurity.XML + + ..\packages\AlphaFS.2.2.1\lib\net452\AlphaFS.dll + - - ..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\WindowsPowerShell\v1.0\System.Management.Automation.dll + + ..\packages\System.Management.Automation.dll.10.0.10586.0\lib\net40\System.Management.Automation.dll + True + @@ -110,10 +116,6 @@ - - {f0f9af1e-d5b5-4d72-804a-5380622fbdea} - AlphaFS - {01EAB41B-B2CE-49FE-AB5A-0F0FF0A9A7EE} PrivilegeControl @@ -165,6 +167,7 @@ + diff --git a/NTFSSecurity/Properties/Resources.Designer.cs b/NTFSSecurity/Properties/Resources.Designer.cs index b2c9fb2..725260a 100644 --- a/NTFSSecurity/Properties/Resources.Designer.cs +++ b/NTFSSecurity/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18033 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace NTFSSecurity.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/NTFSSecurity/packages.config b/NTFSSecurity/packages.config new file mode 100644 index 0000000..169cee2 --- /dev/null +++ b/NTFSSecurity/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/PrivilegeControl/PrivilegeControl.csproj b/PrivilegeControl/PrivilegeControl.csproj index 43e7561..ed6b29b 100644 --- a/PrivilegeControl/PrivilegeControl.csproj +++ b/PrivilegeControl/PrivilegeControl.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,9 +10,10 @@ Properties PrivilegeControl PrivilegeControl - v3.5 + v4.5.2 512 - Client + + SAK SAK SAK @@ -27,6 +28,7 @@ prompt 4 false + false pdbonly @@ -35,6 +37,7 @@ TRACE prompt 4 + false diff --git a/ProcessPrivileges/ProcessPrivileges.csproj b/ProcessPrivileges/ProcessPrivileges.csproj index 945192e..bfbdbad 100644 --- a/ProcessPrivileges/ProcessPrivileges.csproj +++ b/ProcessPrivileges/ProcessPrivileges.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ProcessPrivileges ProcessPrivileges - v3.5 + v4.5.2 512 false @@ -23,7 +23,8 @@ SAK SAK SAK - Client + + true @@ -35,6 +36,7 @@ 4 AllRules.ruleset false + false pdbonly @@ -46,6 +48,7 @@ bin\Release\ProcessPrivileges.XML true AllRules.ruleset + false diff --git a/Security2/Security2.csproj b/Security2/Security2.csproj index 4869af3..385583b 100644 --- a/Security2/Security2.csproj +++ b/Security2/Security2.csproj @@ -10,9 +10,10 @@ Properties Security2 Security2 - v3.5 + v4.5.2 512 - Client + + SAK SAK SAK @@ -39,8 +40,12 @@ false + + ..\packages\AlphaFS.2.2.1\lib\net452\AlphaFS.dll + + @@ -82,10 +87,7 @@ - - {f0f9af1e-d5b5-4d72-804a-5380622fbdea} - AlphaFS - +