forked from winsw/winsw
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request winsw#147 from kohsuke/dotNet4_executable
Provide the new .NET4-compatible executable
- Loading branch information
Showing
8 changed files
with
268 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
|
|
||
| namespace winsw.dotNET4 | ||
| { | ||
| /// <summary> | ||
| /// Just a wrapper class, which redirects the Main entry point to the WinSW main method. | ||
| /// </summary> | ||
| public class dotNET4Support | ||
| { | ||
| public static int Main(string[] args) | ||
| { | ||
| return winsw.WrapperService.Main(args); | ||
| } | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/Core/ServiceWrapper_dotNET4/Properties/AssemblyInfo.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| 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.*")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="ILMerge" version="2.14.1208" targetFramework="net20" /> | ||
| <package id="log4net" version="2.0.3" targetFramework="net20" requireReinstallation="True" /> | ||
| <package id="MSBuildTasks" version="1.4.0.88" targetFramework="net20" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProductVersion>9.0.21022</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{419AEEA7-E7DE-4A76-B001-76DB5F98C838}</ProjectGuid> | ||
| <OutputType>Exe</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>winsw.dotNET4</RootNamespace> | ||
| <AssemblyName>WindowsService_dotNET4</AssemblyName> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <StartupObject> | ||
| </StartupObject> | ||
| <SignManifests>false</SignManifests> | ||
| <SignAssembly>true</SignAssembly> | ||
| <AssemblyOriginatorKeyFile>$(SolutionDir)..\winsw_key.snk</AssemblyOriginatorKeyFile> | ||
| <FileUpgradeFlags> | ||
| </FileUpgradeFlags> | ||
| <UpgradeBackupLocation> | ||
| </UpgradeBackupLocation> | ||
| <OldToolsVersion>3.5</OldToolsVersion> | ||
| <PublishUrl>publish\</PublishUrl> | ||
| <Install>true</Install> | ||
| <InstallFrom>Disk</InstallFrom> | ||
| <UpdateEnabled>false</UpdateEnabled> | ||
| <UpdateMode>Foreground</UpdateMode> | ||
| <UpdateInterval>7</UpdateInterval> | ||
| <UpdateIntervalUnits>Days</UpdateIntervalUnits> | ||
| <UpdatePeriodically>false</UpdatePeriodically> | ||
| <UpdateRequired>false</UpdateRequired> | ||
| <MapFileExtensions>true</MapFileExtensions> | ||
| <ApplicationRevision>0</ApplicationRevision> | ||
| <ApplicationVersion>1.0.0.%2a</ApplicationVersion> | ||
| <IsWebBootstrapper>false</IsWebBootstrapper> | ||
| <UseApplicationTrust>false</UseApplicationTrust> | ||
| <BootstrapperEnabled>true</BootstrapperEnabled> | ||
| <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> | ||
| <RestorePackages>true</RestorePackages> | ||
| <TargetFrameworkProfile /> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <DocumentationFile> | ||
| </DocumentationFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="log4net"> | ||
| <HintPath>..\..\packages\log4net.2.0.3\lib\net20-full\log4net.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Drawing" /> | ||
| <Reference Include="System.Management" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.ServiceProcess" /> | ||
| <Reference Include="System.Windows.Forms" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="Main.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="manifest.xml" /> | ||
| <Content Include="winsw.xml"> | ||
| <SubType>Designer</SubType> | ||
| </Content> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config"> | ||
| <SubType>Designer</SubType> | ||
| </None> | ||
| <None Include="$(AssemblyOriginatorKeyFile)" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> | ||
| <Visible>False</Visible> | ||
| <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> | ||
| <Install>false</Install> | ||
| </BootstrapperPackage> | ||
| <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> | ||
| <Visible>False</Visible> | ||
| <ProductName>.NET Framework 3.5 SP1</ProductName> | ||
| <Install>true</Install> | ||
| </BootstrapperPackage> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Plugins\RunawayProcessKiller\RunawayProcessKiller.csproj"> | ||
| <Project>{57284b7a-82a4-407a-b706-ebea6bf8ea13}</Project> | ||
| <Name>RunawayProcessKiller</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\Plugins\SharedDirectoryMapper\SharedDirectoryMapper.csproj"> | ||
| <Project>{ca5c71db-c5a8-4c27-bf83-8e6daed9d6b5}</Project> | ||
| <Name>SharedDirectoryMapper</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\ServiceWrapper\winsw.csproj"> | ||
| <Project>{0de77f55-ade5-43c1-999a-0bc81153b039}</Project> | ||
| <Name>winsw</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\WinSWCore\WinSWCore.csproj"> | ||
| <Project>{9d0c63e2-b6ff-4a85-bd36-b3e5d7f27d06}</Project> | ||
| <Name>WinSWCore</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> | ||
| <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| <PropertyGroup> | ||
| <ErrorText>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}.</ErrorText> | ||
| </PropertyGroup> | ||
| <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" /> | ||
| </Target> | ||
| <!-- Merge plugins and other DLLs into the executable --> | ||
| <UsingTask TaskName="MSBuild.Community.Tasks.ILMerge" AssemblyFile="$(SolutionDir)\packages\MSBuildTasks.1.4.0.88\tools\MSBuild.Community.Tasks.dll" /> | ||
| <Target Name="AfterBuild"> | ||
| <ItemGroup> | ||
| <MergeAsm Include="$(OutputPath)$(TargetFileName)" /> | ||
| <MergeAsm Include="$(OutputPath)WindowsService.exe" /> | ||
| <MergeAsm Include="$(OutputPath)WinSWCore.dll" /> | ||
| <MergeAsm Include="$(OutputPath)SharedDirectoryMapper.dll" /> | ||
| <MergeAsm Include="$(OutputPath)RunawayProcessKiller.dll" /> | ||
| <MergeAsm Include="$(OutputPath)log4net.dll" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <MergedAssembly>$(ProjectDir)$(OutDir)WinSW.NET4.exe</MergedAssembly> | ||
| <CertificatePfxFile>$(AssemblyOriginatorKeyFile)</CertificatePfxFile> | ||
| </PropertyGroup> | ||
| <!-- Locate SN.EXE in Windows SDK, use the first found one--> | ||
| <PropertyGroup> | ||
| <SnPathTmpFile>$(OutputPath)sn-path.txt</SnPathTmpFile> | ||
| </PropertyGroup> | ||
| <GetFrameworkSdkPath> | ||
| <Output TaskParameter="Path" PropertyName="WindowsSdkPath" /> | ||
| </GetFrameworkSdkPath> | ||
| <Message Text="Using SDK from $(WindowsSdkPath)" Importance="high" /> | ||
| <Exec Command="WHERE /r "$(WindowsSdkPath.TrimEnd('\\'))" sn > $(SnPathTmpFile)" /> | ||
| <ReadLinesFromFile File="$(SnPathTmpFile)"> | ||
| <Output TaskParameter="Lines" PropertyName="SNPath" /> | ||
| </ReadLinesFromFile> | ||
| <Delete Files="$(SnPathTmpFile)" /> | ||
| <PropertyGroup> | ||
| <SNPath>$([System.Text.RegularExpressions.Regex]::Replace('$(SNPath)', ';.*', ''))</SNPath> | ||
| </PropertyGroup> | ||
| <Error Condition="!Exists('$(SNPath)')" Text="Cannot find SN.EXE utility in $(WindowsSdkPath)" /> | ||
| <Message Text="Using SN.EXE utility from $(SNPath)" Importance="high" /> | ||
| <!-- Merge and re-sign assemblies --> | ||
| <PropertyGroup> | ||
| <ILMergePath>$(SolutionDir)packages\ilmerge.2.14.1208\tools</ILMergePath> | ||
| <CertificateTmpPubFile>$(OutputPath)winsw_cert.pub</CertificateTmpPubFile> | ||
| </PropertyGroup> | ||
| <Message Text="Extracting public key from $(AssemblyOriginatorKeyFile)" /> | ||
| <Exec Command=""$(SNPath)" -p "$(AssemblyOriginatorKeyFile)" "$(CertificateTmpPubFile)"" /> | ||
| <Message Text="ILMerge @(MergeAsm) -> $(MergedAssembly)" Importance="high" /> | ||
| <ILMerge ToolPath="$(ILMergePath)" InputAssemblies="@(MergeAsm)" OutputFile="$(MergedAssembly)" TargetKind="SameAsPrimaryAssembly" KeyFile="$(CertificateTmpPubFile)" DelaySign="true" /> | ||
| <Exec Command=""$(SNPath)" -R "$(MergedAssembly)" "$(AssemblyOriginatorKeyFile)"" /> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters