diff --git a/eng/build.yml b/eng/build.yml index 4efc609..41829ed 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -29,10 +29,10 @@ jobs: BuildConfiguration: Release steps: - script: | - dotnet build -c $(BuildConfiguration) src\winsw.sln -p:Version=$(BuildVersion) - dotnet publish -c $(BuildConfiguration) -f netcoreapp3.1 src\Core\ServiceWrapper\winsw.csproj -p:Version=$(BuildVersion) - dotnet publish -c $(BuildConfiguration) -f netcoreapp3.1 -r win-x64 src\Core\ServiceWrapper\winsw.csproj -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=$(BuildVersion) - dotnet publish -c $(BuildConfiguration) -f netcoreapp3.1 -r win-x86 src\Core\ServiceWrapper\winsw.csproj -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=$(BuildVersion) + dotnet build -c $(BuildConfiguration) src\WinSW.sln -p:Version=$(BuildVersion) + dotnet publish -c $(BuildConfiguration) -f netcoreapp3.1 src\WinSW\WinSW.csproj -p:Version=$(BuildVersion) + dotnet publish -c $(BuildConfiguration) -f netcoreapp3.1 -r win-x64 src\WinSW\WinSW.csproj -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=$(BuildVersion) + dotnet publish -c $(BuildConfiguration) -f netcoreapp3.1 -r win-x86 src\WinSW\WinSW.csproj -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=$(BuildVersion) displayName: Build - task: NuGetToolInstaller@1 displayName: Install Nuget @@ -45,7 +45,7 @@ jobs: packagesToPack: WinSW.nuspec versioningScheme: byEnvVar versionEnvVar: BuildVersion - - script: dotnet test -c $(BuildConfiguration) --collect "XPlat Code Coverage" --no-build src\Test\winswTests\winswTests.csproj + - script: dotnet test -c $(BuildConfiguration) --collect "XPlat Code Coverage" --no-build src\WinSW.Tests\WinSW.Tests.csproj displayName: Test - script: dotnet tool restore displayName: Restore tools diff --git a/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs b/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs deleted file mode 100644 index f05656e..0000000 --- a/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("winswTests")] diff --git a/src/Core/WinSWCore/AssemblyInfo.cs b/src/Core/WinSWCore/AssemblyInfo.cs deleted file mode 100644 index eb3e0b0..0000000 --- a/src/Core/WinSWCore/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("WindowsService")] diff --git a/src/Plugins/RunawayProcessKiller/sampleConfig.xml b/src/Plugins/RunawayProcessKiller/sampleConfig.xml deleted file mode 100644 index 24feefa..0000000 --- a/src/Plugins/RunawayProcessKiller/sampleConfig.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - SERVICE_NAME - Jenkins Slave - This service runs a slave for Jenkins continuous integration system. - C:\Program Files\Java\jre7\bin\java.exe - -Xrs -jar "%BASE%\slave.jar" -jnlpUrl ... - - - - - - - %BASE%\pid.txt - - 5000 - - true - - - diff --git a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj b/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj deleted file mode 100644 index b401e4b..0000000 --- a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net20;net40;net461;netcoreapp3.1 - latest - enable - - winsw.Plugins.SharedDirectoryMapper - - - - - - - - - - - diff --git a/src/Plugins/SharedDirectoryMapper/sampleConfig.xml b/src/Plugins/SharedDirectoryMapper/sampleConfig.xml deleted file mode 100644 index 8a6392d..0000000 --- a/src/Plugins/SharedDirectoryMapper/sampleConfig.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - SERVICE_NAME - Jenkins Slave - This service runs a slave for Jenkins continuous integration system. - C:\Program Files\Java\jre7\bin\java.exe - -Xrs -jar "%BASE%\slave.jar" -jnlpUrl ... - - - - - - - - - - - diff --git a/src/WinSW.Core/AssemblyInfo.cs b/src/WinSW.Core/AssemblyInfo.cs new file mode 100644 index 0000000..3e8e4d2 --- /dev/null +++ b/src/WinSW.Core/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("WinSW")] diff --git a/src/Core/WinSWCore/Configuration/DefaultSettings.cs b/src/WinSW.Core/Configuration/DefaultSettings.cs similarity index 100% rename from src/Core/WinSWCore/Configuration/DefaultSettings.cs rename to src/WinSW.Core/Configuration/DefaultSettings.cs diff --git a/src/Core/WinSWCore/Configuration/IWinSWConfiguration.cs b/src/WinSW.Core/Configuration/IWinSWConfiguration.cs similarity index 100% rename from src/Core/WinSWCore/Configuration/IWinSWConfiguration.cs rename to src/WinSW.Core/Configuration/IWinSWConfiguration.cs diff --git a/src/Core/WinSWCore/Configuration/Log.cs b/src/WinSW.Core/Configuration/Log.cs similarity index 100% rename from src/Core/WinSWCore/Configuration/Log.cs rename to src/WinSW.Core/Configuration/Log.cs diff --git a/src/Core/WinSWCore/Configuration/ServiceAccount.cs b/src/WinSW.Core/Configuration/ServiceAccount.cs similarity index 100% rename from src/Core/WinSWCore/Configuration/ServiceAccount.cs rename to src/WinSW.Core/Configuration/ServiceAccount.cs diff --git a/src/Core/WinSWCore/Configuration/YamlConfiguration.cs b/src/WinSW.Core/Configuration/YamlConfiguration.cs similarity index 100% rename from src/Core/WinSWCore/Configuration/YamlConfiguration.cs rename to src/WinSW.Core/Configuration/YamlConfiguration.cs diff --git a/src/Core/WinSWCore/Configuration/YamlExtensionConfiguration.cs b/src/WinSW.Core/Configuration/YamlExtensionConfiguration.cs similarity index 100% rename from src/Core/WinSWCore/Configuration/YamlExtensionConfiguration.cs rename to src/WinSW.Core/Configuration/YamlExtensionConfiguration.cs diff --git a/src/Core/WinSWCore/Download.cs b/src/WinSW.Core/Download.cs similarity index 100% rename from src/Core/WinSWCore/Download.cs rename to src/WinSW.Core/Download.cs diff --git a/src/Core/WinSWCore/DynamicProxy.cs b/src/WinSW.Core/DynamicProxy.cs similarity index 100% rename from src/Core/WinSWCore/DynamicProxy.cs rename to src/WinSW.Core/DynamicProxy.cs diff --git a/src/Core/WinSWCore/Extensions/AbstractWinSWExtension.cs b/src/WinSW.Core/Extensions/AbstractWinSWExtension.cs similarity index 100% rename from src/Core/WinSWCore/Extensions/AbstractWinSWExtension.cs rename to src/WinSW.Core/Extensions/AbstractWinSWExtension.cs diff --git a/src/Core/WinSWCore/Extensions/ExtensionException.cs b/src/WinSW.Core/Extensions/ExtensionException.cs similarity index 100% rename from src/Core/WinSWCore/Extensions/ExtensionException.cs rename to src/WinSW.Core/Extensions/ExtensionException.cs diff --git a/src/Core/WinSWCore/Extensions/ExtensionPointAttribute.cs b/src/WinSW.Core/Extensions/ExtensionPointAttribute.cs similarity index 100% rename from src/Core/WinSWCore/Extensions/ExtensionPointAttribute.cs rename to src/WinSW.Core/Extensions/ExtensionPointAttribute.cs diff --git a/src/Core/WinSWCore/Extensions/IWinSWExtension.cs b/src/WinSW.Core/Extensions/IWinSWExtension.cs similarity index 100% rename from src/Core/WinSWCore/Extensions/IWinSWExtension.cs rename to src/WinSW.Core/Extensions/IWinSWExtension.cs diff --git a/src/Core/WinSWCore/Extensions/WinSWExtensionDescriptor.cs b/src/WinSW.Core/Extensions/WinSWExtensionDescriptor.cs similarity index 100% rename from src/Core/WinSWCore/Extensions/WinSWExtensionDescriptor.cs rename to src/WinSW.Core/Extensions/WinSWExtensionDescriptor.cs diff --git a/src/Core/WinSWCore/Extensions/WinSWExtensionManager.cs b/src/WinSW.Core/Extensions/WinSWExtensionManager.cs similarity index 94% rename from src/Core/WinSWCore/Extensions/WinSWExtensionManager.cs rename to src/WinSW.Core/Extensions/WinSWExtensionManager.cs index 112fcaf..763ce44 100644 --- a/src/Core/WinSWCore/Extensions/WinSWExtensionManager.cs +++ b/src/WinSW.Core/Extensions/WinSWExtensionManager.cs @@ -228,7 +228,16 @@ namespace WinSW.Extensions try { - Type? t = Type.GetType(className, throwOnError: false, ignoreCase: true); + if (className == "winsw.Plugins.RunawayProcessKiller.RunawayProcessKillerExtension") + { + className = "WinSW.Plugins.RunawayProcessKillerExtension"; + } + else if (className == "winsw.Plugins.SharedDirectoryMapper.SharedDirectoryMapper") + { + className = "WinSW.Plugins.SharedDirectoryMapper"; + } + + Type? t = Type.GetType(className); if (t is null) { throw new ExtensionException(id, "Class " + className + " does not exist"); diff --git a/src/Core/WinSWCore/LogAppenders.cs b/src/WinSW.Core/LogAppenders.cs similarity index 100% rename from src/Core/WinSWCore/LogAppenders.cs rename to src/WinSW.Core/LogAppenders.cs diff --git a/src/Core/WinSWCore/Logging/IServiceEventLogProvider.cs b/src/WinSW.Core/Logging/IServiceEventLogProvider.cs similarity index 100% rename from src/Core/WinSWCore/Logging/IServiceEventLogProvider.cs rename to src/WinSW.Core/Logging/IServiceEventLogProvider.cs diff --git a/src/Core/WinSWCore/Logging/ServiceEventLogAppender.cs b/src/WinSW.Core/Logging/ServiceEventLogAppender.cs similarity index 100% rename from src/Core/WinSWCore/Logging/ServiceEventLogAppender.cs rename to src/WinSW.Core/Logging/ServiceEventLogAppender.cs diff --git a/src/Core/WinSWCore/Native/ConsoleApis.cs b/src/WinSW.Core/Native/ConsoleApis.cs similarity index 100% rename from src/Core/WinSWCore/Native/ConsoleApis.cs rename to src/WinSW.Core/Native/ConsoleApis.cs diff --git a/src/Core/WinSWCore/Native/Errors.cs b/src/WinSW.Core/Native/Errors.cs similarity index 100% rename from src/Core/WinSWCore/Native/Errors.cs rename to src/WinSW.Core/Native/Errors.cs diff --git a/src/Core/WinSWCore/Native/HandleApis.cs b/src/WinSW.Core/Native/HandleApis.cs similarity index 100% rename from src/Core/WinSWCore/Native/HandleApis.cs rename to src/WinSW.Core/Native/HandleApis.cs diff --git a/src/Core/WinSWCore/Native/Kernel32.cs b/src/WinSW.Core/Native/Kernel32.cs similarity index 100% rename from src/Core/WinSWCore/Native/Kernel32.cs rename to src/WinSW.Core/Native/Kernel32.cs diff --git a/src/Core/WinSWCore/Native/Libraries.cs b/src/WinSW.Core/Native/Libraries.cs similarity index 100% rename from src/Core/WinSWCore/Native/Libraries.cs rename to src/WinSW.Core/Native/Libraries.cs diff --git a/src/Core/WinSWCore/Native/ProcessApis.cs b/src/WinSW.Core/Native/ProcessApis.cs similarity index 100% rename from src/Core/WinSWCore/Native/ProcessApis.cs rename to src/WinSW.Core/Native/ProcessApis.cs diff --git a/src/Core/WinSWCore/Native/Security.cs b/src/WinSW.Core/Native/Security.cs similarity index 100% rename from src/Core/WinSWCore/Native/Security.cs rename to src/WinSW.Core/Native/Security.cs diff --git a/src/Core/WinSWCore/Native/SecurityApis.cs b/src/WinSW.Core/Native/SecurityApis.cs similarity index 100% rename from src/Core/WinSWCore/Native/SecurityApis.cs rename to src/WinSW.Core/Native/SecurityApis.cs diff --git a/src/Core/WinSWCore/Native/Service.cs b/src/WinSW.Core/Native/Service.cs similarity index 100% rename from src/Core/WinSWCore/Native/Service.cs rename to src/WinSW.Core/Native/Service.cs diff --git a/src/Core/WinSWCore/Native/ServiceApis.cs b/src/WinSW.Core/Native/ServiceApis.cs similarity index 100% rename from src/Core/WinSWCore/Native/ServiceApis.cs rename to src/WinSW.Core/Native/ServiceApis.cs diff --git a/src/Core/WinSWCore/Native/Throw.cs b/src/WinSW.Core/Native/Throw.cs similarity index 100% rename from src/Core/WinSWCore/Native/Throw.cs rename to src/WinSW.Core/Native/Throw.cs diff --git a/src/Core/WinSWCore/NullableAttributes.cs b/src/WinSW.Core/NullableAttributes.cs similarity index 100% rename from src/Core/WinSWCore/NullableAttributes.cs rename to src/WinSW.Core/NullableAttributes.cs diff --git a/src/Core/WinSWCore/PeriodicRollingCalendar.cs b/src/WinSW.Core/PeriodicRollingCalendar.cs similarity index 100% rename from src/Core/WinSWCore/PeriodicRollingCalendar.cs rename to src/WinSW.Core/PeriodicRollingCalendar.cs diff --git a/src/Core/WinSWCore/ServiceDescriptor.cs b/src/WinSW.Core/ServiceDescriptor.cs similarity index 100% rename from src/Core/WinSWCore/ServiceDescriptor.cs rename to src/WinSW.Core/ServiceDescriptor.cs diff --git a/src/Core/WinSWCore/ServiceDescriptorYaml.cs b/src/WinSW.Core/ServiceDescriptorYaml.cs similarity index 100% rename from src/Core/WinSWCore/ServiceDescriptorYaml.cs rename to src/WinSW.Core/ServiceDescriptorYaml.cs diff --git a/src/Core/WinSWCore/Util/ConfigHelper.cs b/src/WinSW.Core/Util/ConfigHelper.cs similarity index 100% rename from src/Core/WinSWCore/Util/ConfigHelper.cs rename to src/WinSW.Core/Util/ConfigHelper.cs diff --git a/src/Core/WinSWCore/Util/FileHelper.cs b/src/WinSW.Core/Util/FileHelper.cs similarity index 100% rename from src/Core/WinSWCore/Util/FileHelper.cs rename to src/WinSW.Core/Util/FileHelper.cs diff --git a/src/Core/WinSWCore/Util/ProcessHelper.cs b/src/WinSW.Core/Util/ProcessHelper.cs similarity index 100% rename from src/Core/WinSWCore/Util/ProcessHelper.cs rename to src/WinSW.Core/Util/ProcessHelper.cs diff --git a/src/Core/WinSWCore/Util/SignalHelper.cs b/src/WinSW.Core/Util/SignalHelper.cs similarity index 100% rename from src/Core/WinSWCore/Util/SignalHelper.cs rename to src/WinSW.Core/Util/SignalHelper.cs diff --git a/src/Core/WinSWCore/Util/XmlHelper.cs b/src/WinSW.Core/Util/XmlHelper.cs similarity index 100% rename from src/Core/WinSWCore/Util/XmlHelper.cs rename to src/WinSW.Core/Util/XmlHelper.cs diff --git a/src/Core/WinSWCore/WinSWCore.csproj b/src/WinSW.Core/WinSW.Core.csproj similarity index 98% rename from src/Core/WinSWCore/WinSWCore.csproj rename to src/WinSW.Core/WinSW.Core.csproj index a3beb21..4041a04 100644 --- a/src/Core/WinSWCore/WinSWCore.csproj +++ b/src/WinSW.Core/WinSW.Core.csproj @@ -6,7 +6,7 @@ enable true - winsw + WinSW diff --git a/src/Core/WinSWCore/WinSWException.cs b/src/WinSW.Core/WinSWException.cs similarity index 100% rename from src/Core/WinSWCore/WinSWException.cs rename to src/WinSW.Core/WinSWException.cs diff --git a/src/Core/WinSWCore/WinSWSystem.cs b/src/WinSW.Core/WinSWSystem.cs similarity index 100% rename from src/Core/WinSWCore/WinSWSystem.cs rename to src/WinSW.Core/WinSWSystem.cs diff --git a/src/Core/WinSWCore/Wmi.cs b/src/WinSW.Core/Wmi.cs similarity index 100% rename from src/Core/WinSWCore/Wmi.cs rename to src/WinSW.Core/Wmi.cs diff --git a/src/Core/WinSWCore/WmiSchema.cs b/src/WinSW.Core/WmiSchema.cs similarity index 100% rename from src/Core/WinSWCore/WmiSchema.cs rename to src/WinSW.Core/WmiSchema.cs diff --git a/src/Plugins/RunawayProcessKiller/NativeMethods.cs b/src/WinSW.Plugins/NativeMethods.cs similarity index 99% rename from src/Plugins/RunawayProcessKiller/NativeMethods.cs rename to src/WinSW.Plugins/NativeMethods.cs index 60c5db2..9a917e9 100644 --- a/src/Plugins/RunawayProcessKiller/NativeMethods.cs +++ b/src/WinSW.Plugins/NativeMethods.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace WinSW.Plugins.RunawayProcessKiller +namespace WinSW.Plugins { public partial class RunawayProcessKillerExtension { diff --git a/src/Plugins/RunawayProcessKiller/RunawayProcessKillerExtension.cs b/src/WinSW.Plugins/RunawayProcessKillerExtension.cs similarity index 99% rename from src/Plugins/RunawayProcessKiller/RunawayProcessKillerExtension.cs rename to src/WinSW.Plugins/RunawayProcessKillerExtension.cs index 13a82f5..1ecab93 100644 --- a/src/Plugins/RunawayProcessKiller/RunawayProcessKillerExtension.cs +++ b/src/WinSW.Plugins/RunawayProcessKillerExtension.cs @@ -9,9 +9,9 @@ using log4net; using WinSW.Configuration; using WinSW.Extensions; using WinSW.Util; -using static WinSW.Plugins.RunawayProcessKiller.RunawayProcessKillerExtension.NativeMethods; +using static WinSW.Plugins.RunawayProcessKillerExtension.NativeMethods; -namespace WinSW.Plugins.RunawayProcessKiller +namespace WinSW.Plugins { public partial class RunawayProcessKillerExtension : AbstractWinSWExtension { diff --git a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.cs b/src/WinSW.Plugins/SharedDirectoryMapper.cs similarity index 98% rename from src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.cs rename to src/WinSW.Plugins/SharedDirectoryMapper.cs index f638e5c..e09c51f 100644 --- a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.cs +++ b/src/WinSW.Plugins/SharedDirectoryMapper.cs @@ -6,8 +6,7 @@ using WinSW.Configuration; using WinSW.Extensions; using WinSW.Util; - -namespace WinSW.Plugins.SharedDirectoryMapper +namespace WinSW.Plugins { public class SharedDirectoryMapper : AbstractWinSWExtension { diff --git a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapperConfig.cs b/src/WinSW.Plugins/SharedDirectoryMapperConfig.cs similarity index 97% rename from src/Plugins/SharedDirectoryMapper/SharedDirectoryMapperConfig.cs rename to src/WinSW.Plugins/SharedDirectoryMapperConfig.cs index 0a9402c..6ba02ce 100644 --- a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapperConfig.cs +++ b/src/WinSW.Plugins/SharedDirectoryMapperConfig.cs @@ -3,7 +3,7 @@ using System.IO; using System.Xml; using WinSW.Util; -namespace WinSW.Plugins.SharedDirectoryMapper +namespace WinSW.Plugins { /// /// Stores configuration entries for SharedDirectoryMapper extension. diff --git a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapperHelper.cs b/src/WinSW.Plugins/SharedDirectoryMapperHelper.cs similarity index 98% rename from src/Plugins/SharedDirectoryMapper/SharedDirectoryMapperHelper.cs rename to src/WinSW.Plugins/SharedDirectoryMapperHelper.cs index 1c4d05b..7ad7b88 100644 --- a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapperHelper.cs +++ b/src/WinSW.Plugins/SharedDirectoryMapperHelper.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace WinSW.Plugins.SharedDirectoryMapper +namespace WinSW.Plugins { class SharedDirectoryMappingHelper { diff --git a/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj b/src/WinSW.Plugins/WinSW.Plugins.csproj similarity index 77% rename from src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj rename to src/WinSW.Plugins/WinSW.Plugins.csproj index 45f5d2d..ae5d002 100644 --- a/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj +++ b/src/WinSW.Plugins/WinSW.Plugins.csproj @@ -5,8 +5,6 @@ latest enable true - - winsw.Plugins.RunawayProcessKiller @@ -14,7 +12,7 @@ - + diff --git a/src/Test/winswTests/Configuration/ExamplesTest.cs b/src/WinSW.Tests/Configuration/ExamplesTest.cs similarity index 100% rename from src/Test/winswTests/Configuration/ExamplesTest.cs rename to src/WinSW.Tests/Configuration/ExamplesTest.cs diff --git a/src/Test/winswTests/DownloadConfigTests.cs b/src/WinSW.Tests/DownloadConfigTests.cs similarity index 100% rename from src/Test/winswTests/DownloadConfigTests.cs rename to src/WinSW.Tests/DownloadConfigTests.cs diff --git a/src/Test/winswTests/DownloadTests.cs b/src/WinSW.Tests/DownloadTests.cs similarity index 100% rename from src/Test/winswTests/DownloadTests.cs rename to src/WinSW.Tests/DownloadTests.cs diff --git a/src/Test/winswTests/Extensions/ExtensionTestBase.cs b/src/WinSW.Tests/Extensions/ExtensionTestBase.cs similarity index 100% rename from src/Test/winswTests/Extensions/ExtensionTestBase.cs rename to src/WinSW.Tests/Extensions/ExtensionTestBase.cs diff --git a/src/Test/winswTests/Extensions/RunawayProcessKillerTest.cs b/src/WinSW.Tests/Extensions/RunawayProcessKillerTest.cs similarity index 99% rename from src/Test/winswTests/Extensions/RunawayProcessKillerTest.cs rename to src/WinSW.Tests/Extensions/RunawayProcessKillerTest.cs index dea027a..134ec8f 100644 --- a/src/Test/winswTests/Extensions/RunawayProcessKillerTest.cs +++ b/src/WinSW.Tests/Extensions/RunawayProcessKillerTest.cs @@ -6,7 +6,7 @@ using NUnit.Framework; using WinSW; using WinSW.Configuration; using WinSW.Extensions; -using WinSW.Plugins.RunawayProcessKiller; +using WinSW.Plugins; using WinSW.Util; using winswTests.Util; diff --git a/src/Test/winswTests/Extensions/SharedDirectoryMapperTest.cs b/src/WinSW.Tests/Extensions/SharedDirectoryMapperTest.cs similarity index 98% rename from src/Test/winswTests/Extensions/SharedDirectoryMapperTest.cs rename to src/WinSW.Tests/Extensions/SharedDirectoryMapperTest.cs index 3b0136c..28b4f34 100644 --- a/src/Test/winswTests/Extensions/SharedDirectoryMapperTest.cs +++ b/src/WinSW.Tests/Extensions/SharedDirectoryMapperTest.cs @@ -2,7 +2,7 @@ using WinSW; using WinSW.Configuration; using WinSW.Extensions; -using WinSW.Plugins.SharedDirectoryMapper; +using WinSW.Plugins; namespace winswTests.Extensions { diff --git a/src/Test/winswTests/MainTest.cs b/src/WinSW.Tests/MainTest.cs similarity index 100% rename from src/Test/winswTests/MainTest.cs rename to src/WinSW.Tests/MainTest.cs diff --git a/src/Test/winswTests/ServiceDescriptorTests.cs b/src/WinSW.Tests/ServiceDescriptorTests.cs similarity index 100% rename from src/Test/winswTests/ServiceDescriptorTests.cs rename to src/WinSW.Tests/ServiceDescriptorTests.cs diff --git a/src/Test/winswTests/ServiceDescriptorYamlTest.cs b/src/WinSW.Tests/ServiceDescriptorYamlTest.cs similarity index 100% rename from src/Test/winswTests/ServiceDescriptorYamlTest.cs rename to src/WinSW.Tests/ServiceDescriptorYamlTest.cs diff --git a/src/Test/winswTests/Util/AsyncAssert.cs b/src/WinSW.Tests/Util/AsyncAssert.cs similarity index 100% rename from src/Test/winswTests/Util/AsyncAssert.cs rename to src/WinSW.Tests/Util/AsyncAssert.cs diff --git a/src/Test/winswTests/Util/CLITestHelper.cs b/src/WinSW.Tests/Util/CLITestHelper.cs similarity index 100% rename from src/Test/winswTests/Util/CLITestHelper.cs rename to src/WinSW.Tests/Util/CLITestHelper.cs diff --git a/src/Test/winswTests/Util/ConfigXmlBuilder.cs b/src/WinSW.Tests/Util/ConfigXmlBuilder.cs similarity index 99% rename from src/Test/winswTests/Util/ConfigXmlBuilder.cs rename to src/WinSW.Tests/Util/ConfigXmlBuilder.cs index e8e974a..3923a6b 100644 --- a/src/Test/winswTests/Util/ConfigXmlBuilder.cs +++ b/src/WinSW.Tests/Util/ConfigXmlBuilder.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using WinSW; -using WinSW.Plugins.RunawayProcessKiller; +using WinSW.Plugins; using winswTests.Extensions; namespace winswTests.Util diff --git a/src/Test/winswTests/Util/DateTimeExtensions.cs b/src/WinSW.Tests/Util/DateTimeExtensions.cs similarity index 100% rename from src/Test/winswTests/Util/DateTimeExtensions.cs rename to src/WinSW.Tests/Util/DateTimeExtensions.cs diff --git a/src/Test/winswTests/Util/FilesystemTestHelper.cs b/src/WinSW.Tests/Util/FilesystemTestHelper.cs similarity index 100% rename from src/Test/winswTests/Util/FilesystemTestHelper.cs rename to src/WinSW.Tests/Util/FilesystemTestHelper.cs diff --git a/src/Test/winswTests/Util/ProcessHelperTest.cs b/src/WinSW.Tests/Util/ProcessHelperTest.cs similarity index 100% rename from src/Test/winswTests/Util/ProcessHelperTest.cs rename to src/WinSW.Tests/Util/ProcessHelperTest.cs diff --git a/src/Test/winswTests/Util/ServiceDescriptorAssert.cs b/src/WinSW.Tests/Util/ServiceDescriptorAssert.cs similarity index 100% rename from src/Test/winswTests/Util/ServiceDescriptorAssert.cs rename to src/WinSW.Tests/Util/ServiceDescriptorAssert.cs diff --git a/src/Test/winswTests/Util/TestHelper.cs b/src/WinSW.Tests/Util/TestHelper.cs similarity index 100% rename from src/Test/winswTests/Util/TestHelper.cs rename to src/WinSW.Tests/Util/TestHelper.cs diff --git a/src/Test/winswTests/winswTests.csproj b/src/WinSW.Tests/WinSW.Tests.csproj similarity index 70% rename from src/Test/winswTests/winswTests.csproj rename to src/WinSW.Tests/WinSW.Tests.csproj index b25779e..95a3e48 100644 --- a/src/Test/winswTests/winswTests.csproj +++ b/src/WinSW.Tests/WinSW.Tests.csproj @@ -3,8 +3,6 @@ net40;net461;netcoreapp3.1 latest - - winswTests @@ -23,10 +21,9 @@ - - - - + + + diff --git a/src/WinSW.sln b/src/WinSW.sln new file mode 100644 index 0000000..9b3287d --- /dev/null +++ b/src/WinSW.sln @@ -0,0 +1,48 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30128.74 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinSW", "WinSW\WinSW.csproj", "{87BD4253-6957-4D83-B75D-5C4C2F114694}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinSW.Core", "WinSW.Core\WinSW.Core.csproj", "{560E6F6A-18DD-4245-AD1A-D02A9AB9CDD7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinSW.Plugins", "WinSW.Plugins\WinSW.Plugins.csproj", "{B50AD8AA-54BD-4FD9-95A9-8AADC84DD46E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinSW.Tests", "WinSW.Tests\WinSW.Tests.csproj", "{691DE22D-4565-4E3C-9CC7-918A0098219E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4975DCF4-C32C-43ED-A731-8FCC1F7E6746}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {87BD4253-6957-4D83-B75D-5C4C2F114694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87BD4253-6957-4D83-B75D-5C4C2F114694}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87BD4253-6957-4D83-B75D-5C4C2F114694}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87BD4253-6957-4D83-B75D-5C4C2F114694}.Release|Any CPU.Build.0 = Release|Any CPU + {560E6F6A-18DD-4245-AD1A-D02A9AB9CDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {560E6F6A-18DD-4245-AD1A-D02A9AB9CDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {560E6F6A-18DD-4245-AD1A-D02A9AB9CDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {560E6F6A-18DD-4245-AD1A-D02A9AB9CDD7}.Release|Any CPU.Build.0 = Release|Any CPU + {B50AD8AA-54BD-4FD9-95A9-8AADC84DD46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B50AD8AA-54BD-4FD9-95A9-8AADC84DD46E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B50AD8AA-54BD-4FD9-95A9-8AADC84DD46E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B50AD8AA-54BD-4FD9-95A9-8AADC84DD46E}.Release|Any CPU.Build.0 = Release|Any CPU + {691DE22D-4565-4E3C-9CC7-918A0098219E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {691DE22D-4565-4E3C-9CC7-918A0098219E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {691DE22D-4565-4E3C-9CC7-918A0098219E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {691DE22D-4565-4E3C-9CC7-918A0098219E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A508CEB3-957E-4B4D-9365-60E5A35EA009} + EndGlobalSection +EndGlobal diff --git a/src/Core/ServiceWrapper/Logging/WrapperServiceEventLogProvider.cs b/src/WinSW/Logging/WrapperServiceEventLogProvider.cs similarity index 100% rename from src/Core/ServiceWrapper/Logging/WrapperServiceEventLogProvider.cs rename to src/WinSW/Logging/WrapperServiceEventLogProvider.cs diff --git a/src/Core/ServiceWrapper/NullableAttributes.cs b/src/WinSW/NullableAttributes.cs similarity index 100% rename from src/Core/ServiceWrapper/NullableAttributes.cs rename to src/WinSW/NullableAttributes.cs diff --git a/src/Core/ServiceWrapper/Program.cs b/src/WinSW/Program.cs similarity index 100% rename from src/Core/ServiceWrapper/Program.cs rename to src/WinSW/Program.cs diff --git a/src/WinSW/Properties/AssemblyInfo.cs b/src/WinSW/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..46e0067 --- /dev/null +++ b/src/WinSW/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Winsw.Tests")] diff --git a/src/Core/ServiceWrapper/winsw.csproj b/src/WinSW/WinSW.csproj similarity index 86% rename from src/Core/ServiceWrapper/winsw.csproj rename to src/WinSW/WinSW.csproj index 27d568e..88c1902 100644 --- a/src/Core/ServiceWrapper/winsw.csproj +++ b/src/WinSW/WinSW.csproj @@ -12,8 +12,6 @@ CloudBees, Inc. Windows Service Wrapper Copyright 2008-2016 Oleg Nenashev, CloudBees, Inc. and other contributors - winsw - WindowsService @@ -31,9 +29,8 @@ - - - + + @@ -79,9 +76,8 @@ "$(OutDir)$(TargetFileName)" - $(InputAssemblies) "$(OutDir)WinSWCore.dll" - $(InputAssemblies) "$(OutDir)SharedDirectoryMapper.dll" - $(InputAssemblies) "$(OutDir)RunawayProcessKiller.dll" + $(InputAssemblies) "$(OutDir)WinSW.Core.dll" + $(InputAssemblies) "$(OutDir)WinSW.Plugins.dll" $(InputAssemblies) "$(OutDir)log4net.dll" $(InputAssemblies) "$(OutDir)YamlDotNet.dll" "$(ArtifactsDir)WinSW.$(IdentifierSuffix).exe" diff --git a/src/Core/ServiceWrapper/WrapperService.cs b/src/WinSW/WrapperService.cs similarity index 100% rename from src/Core/ServiceWrapper/WrapperService.cs rename to src/WinSW/WrapperService.cs diff --git a/src/winsw.sln b/src/winsw.sln deleted file mode 100644 index e41dfdf..0000000 --- a/src/winsw.sln +++ /dev/null @@ -1,87 +0,0 @@ -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", "Core\ServiceWrapper\winsw.csproj", "{0DE77F55-ADE5-43C1-999A-0BC81153B039}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winswTests", "Test\winswTests\winswTests.csproj", "{93843402-842B-44B4-B303-AEE829BE0B43}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedDirectoryMapper", "Plugins\SharedDirectoryMapper\SharedDirectoryMapper.csproj", "{CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{077C2CEC-B687-4B53-86E9-C1A1BF5554E5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{BC4AD891-E87E-4F30-867C-FD8084A29E5D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{5297623A-1A95-4F89-9AAE-DA634081EC86}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinSWCore", "Core\WinSWCore\WinSWCore.csproj", "{9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunawayProcessKiller", "Plugins\RunawayProcessKiller\RunawayProcessKiller.csproj", "{57284B7A-82A4-407A-B706-EBEA6BF8EA13}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AA414F46-B863-473A-A0E0-C2971B3396AE}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - ..\examples\sample-allOptions.xml = ..\examples\sample-allOptions.xml - ..\examples\sample-minimal.xml = ..\examples\sample-minimal.xml - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Win32 = Debug|Win32 - Release|Any CPU = Release|Any CPU - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Debug|Win32.ActiveCfg = Debug|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Debug|Win32.Build.0 = Debug|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Release|Any CPU.Build.0 = Release|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Release|Win32.ActiveCfg = Release|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Release|Win32.Build.0 = Release|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Debug|Win32.ActiveCfg = Debug|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Debug|Win32.Build.0 = Debug|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Release|Any CPU.Build.0 = Release|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Release|Win32.ActiveCfg = Release|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Release|Win32.Build.0 = Release|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Debug|Win32.ActiveCfg = Debug|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Debug|Win32.Build.0 = Debug|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Release|Any CPU.Build.0 = Release|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Release|Win32.ActiveCfg = Release|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Release|Win32.Build.0 = Release|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Debug|Win32.ActiveCfg = Debug|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Debug|Win32.Build.0 = Debug|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Release|Any CPU.Build.0 = Release|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Release|Win32.ActiveCfg = Release|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Release|Win32.Build.0 = Release|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Debug|Win32.ActiveCfg = Debug|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Debug|Win32.Build.0 = Debug|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Any CPU.Build.0 = Release|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Win32.ActiveCfg = Release|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Win32.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0DE77F55-ADE5-43C1-999A-0BC81153B039} = {5297623A-1A95-4F89-9AAE-DA634081EC86} - {93843402-842B-44B4-B303-AEE829BE0B43} = {077C2CEC-B687-4B53-86E9-C1A1BF5554E5} - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5} = {BC4AD891-E87E-4F30-867C-FD8084A29E5D} - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06} = {5297623A-1A95-4F89-9AAE-DA634081EC86} - {57284B7A-82A4-407A-B706-EBEA6BF8EA13} = {BC4AD891-E87E-4F30-867C-FD8084A29E5D} - EndGlobalSection -EndGlobal