From 9d0851b3b091f2b48ad7a4a63015495f96ba6dd6 Mon Sep 17 00:00:00 2001
From: NextTurn <45985406+NextTurn@users.noreply.github.com>
Date: Sun, 8 Mar 2020 00:00:00 +0800
Subject: [PATCH] Rename self-contained deliverables

---
 eng/build.yml          | 16 ++++++++--------
 src/WinSW/WinSW.csproj |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eng/build.yml b/eng/build.yml
index fe7c601..867a871 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -63,20 +63,20 @@ jobs:
     artifact: WinSW.NET461.exe_$(BuildConfiguration)
     displayName: Publish .NET 4.6.1
 
-  - publish: artifacts\publish\WinSW.NETCore.x64.zip
-    artifact: WinSW.NETCore.x64.zip_$(BuildConfiguration)
+  - publish: artifacts\publish\WinSW-x64.zip
+    artifact: WinSW-x64.zip_$(BuildConfiguration)
     displayName: Publish .NET Core x64 .zip
 
-  - publish: artifacts\publish\WinSW.NETCore.x86.zip
-    artifact: WinSW.NETCore.x86.zip_$(BuildConfiguration)
+  - publish: artifacts\publish\WinSW-x86.zip
+    artifact: WinSW-x86.zip_$(BuildConfiguration)
     displayName: Publish .NET Core x86 .zip
 
-  - publish: artifacts\publish\WinSW.NETCore.x64.exe
-    artifact: WinSW.NETCore.x64.exe_$(BuildConfiguration)
+  - publish: artifacts\publish\WinSW-x64.exe
+    artifact: WinSW-x64.exe_$(BuildConfiguration)
     displayName: Publish .NET Core x64 .exe
 
-  - publish: artifacts\publish\WinSW.NETCore.x86.exe
-    artifact: WinSW.NETCore.x86.exe_$(BuildConfiguration)
+  - publish: artifacts\publish\WinSW-x86.exe
+    artifact: WinSW-x86.exe_$(BuildConfiguration)
     displayName: Publish .NET Core x86 .exe
 
   - publish: $(Build.ArtifactStagingDirectory)\WinSW.$(BuildVersion).nupkg
diff --git a/src/WinSW/WinSW.csproj b/src/WinSW/WinSW.csproj
index 16bb9f5..5e1648f 100644
--- a/src/WinSW/WinSW.csproj
+++ b/src/WinSW/WinSW.csproj
@@ -51,14 +51,14 @@
   <Target Name="PublishCoreZip" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net5.0-windows' and '$(IncludeNativeLibrariesForSelfExtract)' != 'true'">
 
     <MakeDir Directories="$(ArtifactsPublishDir)" />
-    <ZipDirectory SourceDirectory="$(PublishDir)" DestinationFile="$(ArtifactsPublishDir)WinSW.NETCore.$(PlatformTarget).zip" Overwrite="true" />
+    <ZipDirectory SourceDirectory="$(PublishDir)" DestinationFile="$(ArtifactsPublishDir)WinSW-$(PlatformTarget).zip" Overwrite="true" />
 
   </Target>
 
   <Target Name="PublishCoreExe" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net5.0-windows' and '$(IncludeNativeLibrariesForSelfExtract)' == 'true'">
 
     <MakeDir Directories="$(ArtifactsPublishDir)" />
-    <Copy SourceFiles="$(PublishDir)$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW.NETCore.$(PlatformTarget).exe" />
+    <Copy SourceFiles="$(PublishDir)$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW-$(PlatformTarget).exe" />
 
   </Target>