From 51d1a8e8afe77d9ddaae6fa9d61cde1c5e945e02 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Sat, 31 Jan 2015 14:40:52 +0300 Subject: [PATCH] Rework the project structure. * move WinSW core to a separate folder * create scr on the top level to store all the stuff inside Related to #66 Signed-off-by: Oleg Nenashev --- Advapi32.cs => src/Core/ServiceWrapper/Advapi32.cs | 0 Download.cs => src/Core/ServiceWrapper/Download.cs | 0 .../Core/ServiceWrapper/DynamicProxy.cs | 0 Kernel32.cs => src/Core/ServiceWrapper/Kernel32.cs | 0 .../Core/ServiceWrapper/LogAppenders.cs | 0 Main.cs => src/Core/ServiceWrapper/Main.cs | 0 .../Core/ServiceWrapper/PeriodicRollingCalendar.cs | 0 .../Core/ServiceWrapper/Properties}/AssemblyInfo.cs | 0 .../Core/ServiceWrapper/ServiceDescriptor.cs | 0 .../Core/ServiceWrapper/SigIntHelper.cs | 0 Wmi.cs => src/Core/ServiceWrapper/Wmi.cs | 0 .../Core/ServiceWrapper/WmiSchema.cs | 0 .../Core/ServiceWrapper/manifest.xml | 0 pom.xml => src/Core/ServiceWrapper/pom.xml | 0 .../Core/ServiceWrapper/winsw.csproj | 4 ++-- winsw.xml => src/Core/ServiceWrapper/winsw.xml | 0 {Tests => src/Test}/Lib/nunit.framework.dll | Bin .../Test}/winswTests/Properties/AssemblyInfo.cs | 0 .../Test}/winswTests/ServiceDescriptorTests.cs | 0 {Tests => src/Test}/winswTests/winswTests.csproj | 2 +- winsw.sln => src/winsw.sln | 4 ++-- 21 files changed, 5 insertions(+), 5 deletions(-) rename Advapi32.cs => src/Core/ServiceWrapper/Advapi32.cs (100%) rename Download.cs => src/Core/ServiceWrapper/Download.cs (100%) rename DynamicProxy.cs => src/Core/ServiceWrapper/DynamicProxy.cs (100%) rename Kernel32.cs => src/Core/ServiceWrapper/Kernel32.cs (100%) rename LogAppenders.cs => src/Core/ServiceWrapper/LogAppenders.cs (100%) rename Main.cs => src/Core/ServiceWrapper/Main.cs (100%) rename PeriodicRollingCalendar.cs => src/Core/ServiceWrapper/PeriodicRollingCalendar.cs (100%) rename {Properties => src/Core/ServiceWrapper/Properties}/AssemblyInfo.cs (100%) rename ServiceDescriptor.cs => src/Core/ServiceWrapper/ServiceDescriptor.cs (100%) rename SigIntHelper.cs => src/Core/ServiceWrapper/SigIntHelper.cs (100%) rename Wmi.cs => src/Core/ServiceWrapper/Wmi.cs (100%) rename WmiSchema.cs => src/Core/ServiceWrapper/WmiSchema.cs (100%) rename manifest.xml => src/Core/ServiceWrapper/manifest.xml (100%) rename pom.xml => src/Core/ServiceWrapper/pom.xml (100%) rename winsw.csproj => src/Core/ServiceWrapper/winsw.csproj (94%) rename winsw.xml => src/Core/ServiceWrapper/winsw.xml (100%) rename {Tests => src/Test}/Lib/nunit.framework.dll (100%) rename {Tests => src/Test}/winswTests/Properties/AssemblyInfo.cs (100%) rename {Tests => src/Test}/winswTests/ServiceDescriptorTests.cs (100%) rename {Tests => src/Test}/winswTests/winswTests.csproj (96%) rename winsw.sln => src/winsw.sln (90%) diff --git a/Advapi32.cs b/src/Core/ServiceWrapper/Advapi32.cs similarity index 100% rename from Advapi32.cs rename to src/Core/ServiceWrapper/Advapi32.cs diff --git a/Download.cs b/src/Core/ServiceWrapper/Download.cs similarity index 100% rename from Download.cs rename to src/Core/ServiceWrapper/Download.cs diff --git a/DynamicProxy.cs b/src/Core/ServiceWrapper/DynamicProxy.cs similarity index 100% rename from DynamicProxy.cs rename to src/Core/ServiceWrapper/DynamicProxy.cs diff --git a/Kernel32.cs b/src/Core/ServiceWrapper/Kernel32.cs similarity index 100% rename from Kernel32.cs rename to src/Core/ServiceWrapper/Kernel32.cs diff --git a/LogAppenders.cs b/src/Core/ServiceWrapper/LogAppenders.cs similarity index 100% rename from LogAppenders.cs rename to src/Core/ServiceWrapper/LogAppenders.cs diff --git a/Main.cs b/src/Core/ServiceWrapper/Main.cs similarity index 100% rename from Main.cs rename to src/Core/ServiceWrapper/Main.cs diff --git a/PeriodicRollingCalendar.cs b/src/Core/ServiceWrapper/PeriodicRollingCalendar.cs similarity index 100% rename from PeriodicRollingCalendar.cs rename to src/Core/ServiceWrapper/PeriodicRollingCalendar.cs diff --git a/Properties/AssemblyInfo.cs b/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs similarity index 100% rename from Properties/AssemblyInfo.cs rename to src/Core/ServiceWrapper/Properties/AssemblyInfo.cs diff --git a/ServiceDescriptor.cs b/src/Core/ServiceWrapper/ServiceDescriptor.cs similarity index 100% rename from ServiceDescriptor.cs rename to src/Core/ServiceWrapper/ServiceDescriptor.cs diff --git a/SigIntHelper.cs b/src/Core/ServiceWrapper/SigIntHelper.cs similarity index 100% rename from SigIntHelper.cs rename to src/Core/ServiceWrapper/SigIntHelper.cs diff --git a/Wmi.cs b/src/Core/ServiceWrapper/Wmi.cs similarity index 100% rename from Wmi.cs rename to src/Core/ServiceWrapper/Wmi.cs diff --git a/WmiSchema.cs b/src/Core/ServiceWrapper/WmiSchema.cs similarity index 100% rename from WmiSchema.cs rename to src/Core/ServiceWrapper/WmiSchema.cs diff --git a/manifest.xml b/src/Core/ServiceWrapper/manifest.xml similarity index 100% rename from manifest.xml rename to src/Core/ServiceWrapper/manifest.xml diff --git a/pom.xml b/src/Core/ServiceWrapper/pom.xml similarity index 100% rename from pom.xml rename to src/Core/ServiceWrapper/pom.xml diff --git a/winsw.csproj b/src/Core/ServiceWrapper/winsw.csproj similarity index 94% rename from winsw.csproj rename to src/Core/ServiceWrapper/winsw.csproj index 343c31c..bd4a9ed 100644 --- a/winsw.csproj +++ b/src/Core/ServiceWrapper/winsw.csproj @@ -16,7 +16,7 @@ false true - winsw_cert.pfx + ..\..\..\winsw_cert.pfx @@ -92,7 +92,7 @@ - + diff --git a/winsw.xml b/src/Core/ServiceWrapper/winsw.xml similarity index 100% rename from winsw.xml rename to src/Core/ServiceWrapper/winsw.xml diff --git a/Tests/Lib/nunit.framework.dll b/src/Test/Lib/nunit.framework.dll similarity index 100% rename from Tests/Lib/nunit.framework.dll rename to src/Test/Lib/nunit.framework.dll diff --git a/Tests/winswTests/Properties/AssemblyInfo.cs b/src/Test/winswTests/Properties/AssemblyInfo.cs similarity index 100% rename from Tests/winswTests/Properties/AssemblyInfo.cs rename to src/Test/winswTests/Properties/AssemblyInfo.cs diff --git a/Tests/winswTests/ServiceDescriptorTests.cs b/src/Test/winswTests/ServiceDescriptorTests.cs similarity index 100% rename from Tests/winswTests/ServiceDescriptorTests.cs rename to src/Test/winswTests/ServiceDescriptorTests.cs diff --git a/Tests/winswTests/winswTests.csproj b/src/Test/winswTests/winswTests.csproj similarity index 96% rename from Tests/winswTests/winswTests.csproj rename to src/Test/winswTests/winswTests.csproj index 9e37360..60a1612 100644 --- a/Tests/winswTests/winswTests.csproj +++ b/src/Test/winswTests/winswTests.csproj @@ -49,7 +49,7 @@ - + {0DE77F55-ADE5-43C1-999A-0BC81153B039} winsw diff --git a/winsw.sln b/src/winsw.sln similarity index 90% rename from winsw.sln rename to src/winsw.sln index efd71d1..db15cc1 100644 --- a/winsw.sln +++ b/src/winsw.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winsw", "winsw.csproj", "{0DE77F55-ADE5-43C1-999A-0BC81153B039}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winsw", "Core\ServiceWrapper\winsw.csproj", "{0DE77F55-ADE5-43C1-999A-0BC81153B039}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winswTests", "Tests\winswTests\winswTests.csproj", "{93843402-842B-44B4-B303-AEE829BE0B43}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winswTests", "Test\winswTests\winswTests.csproj", "{93843402-842B-44B4-B303-AEE829BE0B43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution