Rename executables being generated during the build

iforapsy · Dec 6, 2016 · f21f82d · f21f82d
1 parent 109e340
commit f21f82d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -31,10 +31,10 @@ test_script:
 - ps: nunit-console 'C:/projects/winsw/src/Test/winswTests/bin/Release/winswTests.dll' 'C:/projects/winsw/src/Test/winswTests/bin/Release/SharedDirectoryMapper.dll' 'C:/projects/winsw/src/Test/winswTests/bin/Release/RunawayProcessKiller.dll'
 
 artifacts:
-  - path: 'src/Core/ServiceWrapper/bin/Release/winsw.exe'
-    name: WinSW
-  - path: 'src/Core/ServiceWrapper_dotNET4/bin/Release/winsw.exe'
-    name: WinSW_dotNET4
+  - path: 'src/Core/ServiceWrapper/bin/Release/WinSW.NET2.exe'
+    name: WinSW.NET2.exe
+  - path: 'src/Core/ServiceWrapper_dotNET4/bin/Release/WinSW.NET4.exe'
+    name: WinSW.NET4.exe
 
 
 

diff --git a/src/Core/ServiceWrapper/winsw.csproj b/src/Core/ServiceWrapper/winsw.csproj
@@ -137,7 +137,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <!-- Merge plugins and other DLLs into winsw.exe -->
+  <!-- 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>
@@ -148,7 +148,7 @@
       <MergeAsm Include="$(OutputPath)log4net.dll" />
     </ItemGroup>
     <PropertyGroup>
-      <MergedAssembly>$(ProjectDir)$(OutDir)winsw.exe</MergedAssembly>
+      <MergedAssembly>$(ProjectDir)$(OutDir)WinSW.NET2.exe</MergedAssembly>
       <CertificatePfxFile>$(AssemblyOriginatorKeyFile)</CertificatePfxFile>
     </PropertyGroup>
     <!-- Locate SN.EXE in Windows SDK, use the first found one-->

diff --git a/src/Core/ServiceWrapper_dotNET4/winsw_dotNET4.csproj b/src/Core/ServiceWrapper_dotNET4/winsw_dotNET4.csproj
@@ -135,7 +135,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <!-- Merge plugins and other DLLs into winsw.exe -->
+  <!-- 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>
@@ -147,7 +147,7 @@
       <MergeAsm Include="$(OutputPath)log4net.dll" />
     </ItemGroup>
     <PropertyGroup>
-      <MergedAssembly>$(ProjectDir)$(OutDir)winsw.exe</MergedAssembly>
+      <MergedAssembly>$(ProjectDir)$(OutDir)WinSW.NET4.exe</MergedAssembly>
       <CertificatePfxFile>$(AssemblyOriginatorKeyFile)</CertificatePfxFile>
     </PropertyGroup>
     <!-- Locate SN.EXE in Windows SDK, use the first found one-->