diff --git a/.gitignore b/.gitignore index e821825..3c7ab01 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ obj /src/packages/ /winsw_key.snk /winsw_key.pfx -/src/.vs/winsw/v15/sqlite3/storage.ide +/src/.vs/ /src/Core/WinSWCore/WinSWCore.csproj.DotSettings -/src/.vs/winsw/v15/Server/sqlite3 diff --git a/DEVELOPER.md b/DEVELOPER.md index f6595ee..6e8a3bb 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -3,10 +3,10 @@ WinSW Developer Information ### Build Environment -* IDE: [Visual Studio Community 2013](http://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx) (free for open-source projects) -* `winsw_key.snk` should be available in the project's root in order to build the executable - * You can generate the certificate in "Project Settings/Signing" - * The certificate is in .gitignore list. Please do not add it to the repository +* IDE: [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/) (free for open-source projects) +* *winsw_key.snk* should be available in the project's root in order to build the executable +* You can generate the certificate by running *generate-key.ps1* +* The certificate is in *.gitignore* list. Please do not add it to the repository ### Testing diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..25481be --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,8 @@ + + + + full + $(MSBuildThisFileDirectory)winsw_key.snk + + + diff --git a/WinSW.nuspec b/WinSW.nuspec index f44956d..e115ff4 100644 --- a/WinSW.nuspec +++ b/WinSW.nuspec @@ -25,8 +25,8 @@ More info about the wrapper is available in the projects GitHub repository. - - + + diff --git a/appveyor.yml b/appveyor.yml index 09681c9..6a8e6d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,9 +3,10 @@ skip_tags: true skip_branch_with_pr: true # Project configuration -image: Visual Studio 2013 +image: Visual Studio 2019 platform: Any CPU configuration: Release +version: 2.0.{build} # Automatically register private account and/or project AppVeyor NuGet feeds. nuget: @@ -16,32 +17,29 @@ nuget: before_build: # Check SDKs - ECHO "Installed SDKs:" - - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\"" + - ps: "ls \"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\\"" # Generates a temporary SNK. Not for real signing - - cmd: "\"C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin/sn.exe\" -k winsw_key.snk" + - cmd: "\"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.8 Tools\\sn.exe\" -k winsw_key.snk" -assembly_info: +dotnet_csproj: patch: true - file: "**\\AssemblyInfo.*" - assembly_version: $(appveyor_build_version) - assembly_file_version: $(appveyor_build_version) - assembly_informational_version: '$(appveyor_build_version)-rc' - -build: - parallel: true - project: src\winsw.sln + file: "**\\*.csproj" + version: $(appveyor_build_version) + +build_script: + - dotnet.exe build src\winsw.sln after_build: - ps: nuget pack WinSW.nuspec -Version $env:APPVEYOR_BUILD_VERSION test_script: # Runner for NUnit2 -- ps: nunit-console 'src/Test/winswTests/bin/Release/winswTests.dll' 'src/Test/winswTests/bin/Release/SharedDirectoryMapper.dll' 'src/Test/winswTests/bin/Release/RunawayProcessKiller.dll' +- ps: nunit-console 'src/Test/winswTests/bin/Release/net40/winswTests.dll' 'src/Test/winswTests/bin/Release/net40/SharedDirectoryMapper.dll' 'src/Test/winswTests/bin/Release/net40/RunawayProcessKiller.dll' artifacts: - - path: 'src/Core/ServiceWrapper/bin/Release/WinSW.NET2.exe' + - path: 'src/Core/ServiceWrapper/bin/Release/net20/WinSW.exe' name: WinSW.NET2.exe - - path: 'src/Core/ServiceWrapper_dotNET4/bin/Release/WinSW.NET4.exe' + - path: 'src/Core/ServiceWrapper/bin/Release/net40/WinSW.exe' name: WinSW.NET4.exe - path: 'WinSW.$(appveyor_build_version).nupkg' name: WinSW.nupkg @@ -49,7 +47,3 @@ artifacts: name: 'sample-allOptions.xml' - path: 'examples/sample-minimal.xml' name: 'sample-minimal.xml' - - - - diff --git a/generate-key.ps1 b/generate-key.ps1 new file mode 100644 index 0000000..4b5f6f8 --- /dev/null +++ b/generate-key.ps1 @@ -0,0 +1,3 @@ +$files = Get-ChildItem -Path 'C:\Program Files (x86)\Microsoft SDKs\Windows\' -Filter 'sn.exe' -Recurse | Select-Object -Property FullName +$files +& $files[0].FullName -k winsw_key.snk diff --git a/sign.sh b/sign.sh deleted file mode 100755 index 8124c08..0000000 --- a/sign.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -ex -export "PATH=$PATH:/cygdrive/c/Program Files/Windows Kits/8.1/bin/x86" -for f in Release Debug; -do - signtool sign /f winsw-key.snk /t http://timestamp.verisign.com/scripts/timestamp.dll bin/$f/winsw.exe - signtool verify /v /pa bin/$f/winsw.exe -done -echo success diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config deleted file mode 100644 index 67f8ea0..0000000 --- a/src/.nuget/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe deleted file mode 100644 index 8dd7e45..0000000 Binary files a/src/.nuget/NuGet.exe and /dev/null differ diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets deleted file mode 100644 index 3f8c37b..0000000 --- a/src/.nuget/NuGet.targets +++ /dev/null @@ -1,144 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - - - - - $(SolutionDir).nuget - - - - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config - - - - $(MSBuildProjectDirectory)\packages.config - $(PackagesProjectConfig) - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 "$(NuGetExePath)" - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config deleted file mode 100644 index e1e92a3..0000000 --- a/src/.nuget/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs b/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs deleted file mode 100644 index 5456f5d..0000000 --- a/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Windows Service Wrapper")] -[assembly: AssemblyDescription("Allows arbitrary process to run as a Windows service by wrapping it")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CloudBees, Inc.")] -[assembly: AssemblyProduct("Windows Service Wrapper")] -[assembly: AssemblyCopyright("Copyright 2008-2013 Sun Microsystems, Inc., CloudBees, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("59ce18df-cacb-4360-bb80-798bd6459ca3")] - -// 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 Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Core/ServiceWrapper/packages.config b/src/Core/ServiceWrapper/packages.config deleted file mode 100644 index bc1ca85..0000000 --- a/src/Core/ServiceWrapper/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Core/ServiceWrapper/winsw.csproj b/src/Core/ServiceWrapper/winsw.csproj index ed01ebe..a28a710 100644 --- a/src/Core/ServiceWrapper/winsw.csproj +++ b/src/Core/ServiceWrapper/winsw.csproj @@ -1,98 +1,40 @@ - - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {0DE77F55-ADE5-43C1-999A-0BC81153B039} Exe - Properties + net20;net40 + + + Windows Service Wrapper + Allows arbitrary process to run as a Windows service by wrapping it. + CloudBees, Inc. + Windows Service Wrapper + Copyright 2008-2016 Oleg Nenashev, CloudBees, Inc. and other contributors winsw WindowsService - v2.0 - 512 - - - false true - $(SolutionDir)..\winsw_key.snk - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\..\ - true - - - true - full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - + + + + + + + + - - ..\..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll - - - ..\..\packages\log4net.2.0.8\lib\net20-full\log4net.dll - - - - - - - - - - Component - - - - + + - - Designer - + False @@ -105,77 +47,47 @@ true + - - {57284b7a-82a4-407a-b706-ebea6bf8ea13} - RunawayProcessKiller - - - {ca5c71db-c5a8-4c27-bf83-8e6daed9d6b5} - SharedDirectoryMapper - - - {9d0c63e2-b6ff-4a85-bd36-b3e5d7f27d06} - WinSWCore - + + + - - - - - - - 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}. - - - + - - - - - - - - - + + + + v2 + + + + + v4 + + + + + + - $(ProjectDir)$(OutDir)WinSW.NET2.exe - $(AssemblyOriginatorKeyFile) + "$(OutDir)$(TargetFileName)" + $(InputAssemblies) "$(OutDir)WinSWCore.dll" + $(InputAssemblies) "$(OutDir)SharedDirectoryMapper.dll" + $(InputAssemblies) "$(OutDir)RunawayProcessKiller.dll" + $(InputAssemblies) "$(OutDir)log4net.dll" + "$(OutDir)WinSW.exe" - + - $(OutputPath)sn-path.txt + $(NuGetPackageRoot)ilmerge\3.0.29\tools\net452\ILMerge.exe + /keyfile:"$(AssemblyOriginatorKeyFile)" /targetplatform:$(TargetPlatform) /out:$(OutputAssembly) $(InputAssemblies) + "$(ILMerge)" $(ILMergeArgs) - - - - - - - - - - - $([System.Text.RegularExpressions.Regex]::Replace('$(SNPath)', ';.*', '')) - - - - - - $(SolutionDir)packages\ilmerge.2.14.1208\tools - $(OutputPath)winsw_cert.pub - - - - - - + + + + - \ No newline at end of file + + diff --git a/src/Core/ServiceWrapper_dotNET4/Main.cs b/src/Core/ServiceWrapper_dotNET4/Main.cs deleted file mode 100644 index f7b80bf..0000000 --- a/src/Core/ServiceWrapper_dotNET4/Main.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace winsw.dotNET4 -{ - /// - /// Just a wrapper class, which redirects the Main entry point to the WinSW main method. - /// - public class dotNET4Support - { - public static int Main(string[] args) - { - return winsw.WrapperService.Main(args); - } - } -} diff --git a/src/Core/ServiceWrapper_dotNET4/Properties/AssemblyInfo.cs b/src/Core/ServiceWrapper_dotNET4/Properties/AssemblyInfo.cs deleted file mode 100644 index 700ae0a..0000000 --- a/src/Core/ServiceWrapper_dotNET4/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Windows Service Wrapper for .NET4")] -[assembly: AssemblyDescription("Allows arbitrary process to run as a Windows service by wrapping it")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CloudBees, Inc.")] -[assembly: AssemblyProduct("Windows Service Wrapper")] -[assembly: AssemblyCopyright("Copyright 2008-2016 Oleg Nenashev, CloudBees, Inc. and other contributors")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("59ce18df-cacb-4360-bb80-798bd6459ca3")] - -// 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 Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Core/ServiceWrapper_dotNET4/packages.config b/src/Core/ServiceWrapper_dotNET4/packages.config deleted file mode 100644 index 8a07f2e..0000000 --- a/src/Core/ServiceWrapper_dotNET4/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Core/ServiceWrapper_dotNET4/winsw_dotNET4.csproj b/src/Core/ServiceWrapper_dotNET4/winsw_dotNET4.csproj deleted file mode 100644 index f11a680..0000000 --- a/src/Core/ServiceWrapper_dotNET4/winsw_dotNET4.csproj +++ /dev/null @@ -1,185 +0,0 @@ - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {419AEEA7-E7DE-4A76-B001-76DB5F98C838} - Exe - Properties - winsw.dotNET4 - WindowsService_dotNET4 - v4.0 - 512 - - - false - true - $(SolutionDir)..\winsw_key.snk - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\..\ - true - - - - true - full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - - - ..\..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll - False - - - ..\..\packages\log4net.2.0.8\lib\net20-full\log4net.dll - - - - - - - - - - - - - - - - Designer - - - - - Designer - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - - - {57284b7a-82a4-407a-b706-ebea6bf8ea13} - RunawayProcessKiller - - - {ca5c71db-c5a8-4c27-bf83-8e6daed9d6b5} - SharedDirectoryMapper - - - {0de77f55-ade5-43c1-999a-0bc81153b039} - winsw - - - {9d0c63e2-b6ff-4a85-bd36-b3e5d7f27d06} - WinSWCore - - - - - - - - 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}. - - - - - - - - - - - - - - - - $(ProjectDir)$(OutDir)WinSW.NET4.exe - $(AssemblyOriginatorKeyFile) - - - - $(OutputPath)sn-path.txt - - - - - - - - - - - - $([System.Text.RegularExpressions.Regex]::Replace('$(SNPath)', ';.*', '')) - - - - - - $(SolutionDir)packages\ilmerge.2.14.1208\tools - $(OutputPath)winsw_cert.pub - - - - - - - - \ No newline at end of file diff --git a/src/Core/WinSWCore/Properties/AssemblyInfo.cs b/src/Core/WinSWCore/Properties/AssemblyInfo.cs deleted file mode 100644 index a21c377..0000000 --- a/src/Core/WinSWCore/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -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("WinSWCore")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WinSWCore")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8f845354-ba20-455d-82d1-9b6ec4e0e517")] - -// 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 Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Core/WinSWCore/WinSWCore.csproj b/src/Core/WinSWCore/WinSWCore.csproj index 0703740..7836980 100644 --- a/src/Core/WinSWCore/WinSWCore.csproj +++ b/src/Core/WinSWCore/WinSWCore.csproj @@ -1,96 +1,21 @@ - - - + + - Debug - AnyCPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06} - Library - Properties + net20;net40 + + winsw - WinSWCore - v2.0 - 512 - ..\..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - true - $(SolutionDir)..\winsw_key.snk + + + + + + + - - ..\..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll - - - ..\..\packages\log4net.2.0.8\lib\net20-full\log4net.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/src/Core/WinSWCore/packages.config b/src/Core/WinSWCore/packages.config deleted file mode 100644 index 8087085..0000000 --- a/src/Core/WinSWCore/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs b/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs deleted file mode 100644 index a86ad03..0000000 --- a/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -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("RunawayProcessKiller")] -[assembly: AssemblyDescription("Kills runaway process on startup")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RunawayProcessKiller")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d962c792-b900-4e60-8ae6-6c8d05b23a61")] - -// 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 Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj b/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj index 1fc250e..d899262 100644 --- a/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj +++ b/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj @@ -1,76 +1,20 @@ - - - + + - Debug - AnyCPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13} - Library - Properties + net20;net40 + + winsw.Plugins.RunawayProcessKiller - RunawayProcessKiller - v2.0 - 512 - ..\..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - true - $(SolutionDir)..\winsw_key.snk + - - ..\..\packages\log4net.2.0.8\lib\net20-full\log4net.dll - - - - + + + - - + - - - {9d0c63e2-b6ff-4a85-bd36-b3e5d7f27d06} - WinSWCore - - - - - Designer - - - - - - - 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/src/Plugins/RunawayProcessKiller/packages.config b/src/Plugins/RunawayProcessKiller/packages.config deleted file mode 100644 index bf20b5f..0000000 --- a/src/Plugins/RunawayProcessKiller/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs b/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs deleted file mode 100644 index bc7eb3d..0000000 --- a/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -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("SharedDirectoryMapper")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SharedDirectoryMapper")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d962c792-b900-4e60-8ae6-6c8d05b23a61")] - -// 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 Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj b/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj index 4ec4c38..c96d452 100644 --- a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj +++ b/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj @@ -1,76 +1,20 @@ - - - + + - Debug - AnyCPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5} - Library - Properties + net20;net40 + + winsw.Plugins.SharedDirectoryMapper - SharedDirectoryMapper - v2.0 - 512 - ..\..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - true - $(SolutionDir)..\winsw_key.snk + - - ..\..\packages\log4net.2.0.8\lib\net20-full\log4net.dll - - - - + + + - - - - + - - - {9d0c63e2-b6ff-4a85-bd36-b3e5d7f27d06} - WinSWCore - - - - - - - - - - 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/src/Plugins/SharedDirectoryMapper/packages.config b/src/Plugins/SharedDirectoryMapper/packages.config deleted file mode 100644 index bf20b5f..0000000 --- a/src/Plugins/SharedDirectoryMapper/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Test/winswTests/Configuration/ExamplesTest.cs b/src/Test/winswTests/Configuration/ExamplesTest.cs index f501bdf..454239b 100644 --- a/src/Test/winswTests/Configuration/ExamplesTest.cs +++ b/src/Test/winswTests/Configuration/ExamplesTest.cs @@ -45,7 +45,7 @@ namespace winswTests.Configuration private ServiceDescriptor doLoad(string exampleName) { var dir = Directory.GetCurrentDirectory(); - string path = dir + "\\..\\..\\..\\..\\..\\examples\\sample-" + exampleName + ".xml"; + string path = Path.GetFullPath(dir + "\\..\\..\\..\\..\\..\\..\\examples\\sample-" + exampleName + ".xml"); if (!File.Exists(path)) { throw new FileNotFoundException("Cannot find the XML file " + path, path); diff --git a/src/Test/winswTests/NunitTest.nunit b/src/Test/winswTests/NunitTest.nunit index 6bf5283..2231d59 100644 --- a/src/Test/winswTests/NunitTest.nunit +++ b/src/Test/winswTests/NunitTest.nunit @@ -1,9 +1,9 @@ - + - + diff --git a/src/Test/winswTests/Properties/AssemblyInfo.cs b/src/Test/winswTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 22480bd..0000000 --- a/src/Test/winswTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -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("winswTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("winswTests")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("01ee65cd-18ae-4f3b-8eac-c9f790d5f24e")] - -// 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 Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Test/winswTests/Util/ProcessHelperTest.cs b/src/Test/winswTests/Util/ProcessHelperTest.cs index 1bbcf7d..44b5b80 100644 --- a/src/Test/winswTests/Util/ProcessHelperTest.cs +++ b/src/Test/winswTests/Util/ProcessHelperTest.cs @@ -18,6 +18,8 @@ namespace winswTests.Util [Test] public void ShouldPropagateVariablesInUppercase() { + Environment.SetEnvironmentVariable("TEST_KEY", "TEST_VALUE"); + var tmpDir = FilesystemTestHelper.CreateTmpDirectory(); String envFile = Path.Combine(tmpDir, "env.properties"); String scriptFile = Path.Combine(tmpDir, "printenv.bat"); @@ -40,12 +42,10 @@ namespace winswTests.Util String[] keys = new String[envVars.Count]; envVars.Keys.CopyTo(keys, 0); String availableVars = "[" + String.Join(",", keys) + "]"; - Assert.That(envVars.ContainsKey("PROCESSOR_ARCHITECTURE"), "No PROCESSOR_ARCHITECTURE in the injected vars: " + availableVars); - Assert.That(envVars.ContainsKey("COMPUTERNAME"), "No COMPUTERNAME in the injected vars: " + availableVars); - Assert.That(envVars.ContainsKey("PATHEXT"), "No PATHEXT in the injected vars: " + availableVars); + Assert.That(envVars.ContainsKey("TEST_KEY"), "No TEST_KEY in the injected vars: " + availableVars); // And just ensure that the parsing logic is case-sensitive - Assert.That(!envVars.ContainsKey("computername"), "Test error: the environment parsing logic is case-insensitive"); + Assert.That(!envVars.ContainsKey("test_key"), "Test error: the environment parsing logic is case-insensitive"); } diff --git a/src/Test/winswTests/packages.config b/src/Test/winswTests/packages.config deleted file mode 100644 index 87bb897..0000000 --- a/src/Test/winswTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Test/winswTests/winswTests.csproj b/src/Test/winswTests/winswTests.csproj index 6c8e47a..8d87847 100644 --- a/src/Test/winswTests/winswTests.csproj +++ b/src/Test/winswTests/winswTests.csproj @@ -1,110 +1,30 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {93843402-842B-44B4-B303-AEE829BE0B43} - Library - Properties + net20;net40 + + winswTests - winswTests - v2.0 - 512 - - - - - 3.5 - ..\..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + + + + + + + + + - - False - ..\..\packages\JetBrains.Annotations.8.0.5.0\lib\net20\JetBrains.Annotations.dll - - - False - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - - - ..\..\packages\log4net.2.0.8\lib\net20-full\log4net.dll - - - - + - - - - - - - - - - - - - - + + + + - - - {0DE77F55-ADE5-43C1-999A-0BC81153B039} - winsw - - - {9d0c63e2-b6ff-4a85-bd36-b3e5d7f27d06} - WinSWCore - - - {57284b7a-82a4-407a-b706-ebea6bf8ea13} - RunawayProcessKiller - - - {ca5c71db-c5a8-4c27-bf83-8e6daed9d6b5} - SharedDirectoryMapper - - - - - - - - - - - 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/src/packages/repositories.config b/src/packages/repositories.config deleted file mode 100644 index cc6dab9..0000000 --- a/src/packages/repositories.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/winsw.sln b/src/winsw.sln index 2dc6902..b4e6aa8 100644 --- a/src/winsw.sln +++ b/src/winsw.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 @@ -6,12 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winsw", "Core\ServiceWrappe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winswTests", "Test\winswTests\winswTests.csproj", "{93843402-842B-44B4-B303-AEE829BE0B43}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6BDF4025-D46C-4C69-BDB2-5CE434C857AA}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - EndProjectSection -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}" @@ -22,17 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{5297623A-1 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinSWCore", "Core\WinSWCore\WinSWCore.csproj", "{9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{D8806424-4640-440C-952D-37790B603C27}" - ProjectSection(SolutionItems) = preProject - Build.proj = Build.proj - .build\MSBuild.Community.Tasks.dll = .build\MSBuild.Community.Tasks.dll - .build\MSBuild.Community.Tasks.targets = .build\MSBuild.Community.Tasks.targets - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunawayProcessKiller", "Plugins\RunawayProcessKiller\RunawayProcessKiller.csproj", "{57284B7A-82A4-407A-B706-EBEA6BF8EA13}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winsw_dotNET4", "Core\ServiceWrapper_dotNET4\winsw_dotNET4.csproj", "{419AEEA7-E7DE-4A76-B001-76DB5F98C838}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AA414F46-B863-473A-A0E0-C2971B3396AE}" ProjectSection(SolutionItems) = preProject ..\examples\sample-allOptions.xml = ..\examples\sample-allOptions.xml @@ -42,81 +27,51 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms 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|Mixed Platforms.ActiveCfg = Release|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Debug|Mixed Platforms.Build.0 = Release|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|Mixed Platforms.ActiveCfg = Release|Any CPU - {0DE77F55-ADE5-43C1-999A-0BC81153B039}.Release|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Debug|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Debug|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Release|Any CPU - {93843402-842B-44B4-B303-AEE829BE0B43}.Release|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Debug|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Release|Any CPU - {CA5C71DB-C5A8-4C27-BF83-8E6DAED9D6B5}.Release|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Debug|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Release|Any CPU - {9D0C63E2-B6FF-4A85-BD36-B3E5D7F27D06}.Release|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Debug|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Debug|Mixed Platforms.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|Mixed Platforms.ActiveCfg = Release|Any CPU - {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Mixed Platforms.Build.0 = Release|Any CPU {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Win32.ActiveCfg = Release|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Debug|Any CPU.Build.0 = Debug|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Debug|Win32.ActiveCfg = Debug|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Release|Any CPU.ActiveCfg = Release|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Release|Any CPU.Build.0 = Release|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {419AEEA7-E7DE-4A76-B001-76DB5F98C838}.Release|Win32.ActiveCfg = Release|Any CPU + {57284B7A-82A4-407A-B706-EBEA6BF8EA13}.Release|Win32.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -127,6 +82,5 @@ Global {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} - {419AEEA7-E7DE-4A76-B001-76DB5F98C838} = {5297623A-1A95-4F89-9AAE-DA634081EC86} EndGlobalSection EndGlobal diff --git a/winsw.csproj b/winsw.csproj deleted file mode 100644 index fc6a167..0000000 --- a/winsw.csproj +++ /dev/null @@ -1,119 +0,0 @@ - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {0DE77F55-ADE5-43C1-999A-0BC81153B039} - Exe - Properties - winsw - winsw - v2.0 - 512 - - - false - false - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - Designer - - - Designer - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - - - - - - - \ No newline at end of file