From d677da366454f90ee433672667234f89c904ac0a Mon Sep 17 00:00:00 2001
From: NextTurn <45985406+NextTurn@users.noreply.github.com>
Date: Sat, 24 Nov 2018 00:00:00 +0800
Subject: [PATCH] Introduce WinSW Lite

---
 eng/build.yml          | 12 ------------
 src/NuGet.Config       |  1 +
 src/WinSW/WinSW.csproj |  3 ++-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/eng/build.yml b/eng/build.yml
index 33733f4..da6f998 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -41,9 +41,6 @@ jobs:
       arguments: -c $(BuildConfiguration) -p:Version=$(BuildVersion)
   - script: |
       dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0 -r win-x64 -p:Version=$(BuildVersion)
-      dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0 -r win-x86 -p:Version=$(BuildVersion)
-      dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0 -r win-x64 -p:Version=$(BuildVersion) -p:IncludeNativeLibrariesInSingleFile=true
-      dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0 -r win-x86 -p:Version=$(BuildVersion) -p:IncludeNativeLibrariesInSingleFile=true
     displayName: Build
   - task: DotNetCoreCLI@2
     displayName: Test
@@ -65,18 +62,9 @@ jobs:
   - publish: artifacts\publish\WinSW.NET461.exe
     artifact: WinSW.NET461.exe_$(BuildConfiguration)
     displayName: Publish .NET 4.6.1
-  - publish: artifacts\publish\WinSW.NETCore.x64.zip
-    artifact: WinSW.NETCore.x64.zip_$(BuildConfiguration)
-    displayName: Publish .NET Core x64 .zip
-  - publish: artifacts\publish\WinSW.NETCore.x86.zip
-    artifact: WinSW.NETCore.x86.zip_$(BuildConfiguration)
-    displayName: Publish .NET Core x86 .zip
   - publish: artifacts\publish\WinSW.NETCore.x64.exe
     artifact: WinSW.NETCore.x64.exe_$(BuildConfiguration)
     displayName: Publish .NET Core x64 .exe
-  - publish: artifacts\publish\WinSW.NETCore.x86.exe
-    artifact: WinSW.NETCore.x86.exe_$(BuildConfiguration)
-    displayName: Publish .NET Core x86 .exe
   - publish: $(Build.ArtifactStagingDirectory)\WinSW.$(BuildVersion).nupkg
     artifact: WinSW.nupkg_$(BuildConfiguration)
     displayName: Publish Nuget
diff --git a/src/NuGet.Config b/src/NuGet.Config
index 765346e..2ba88b8 100644
--- a/src/NuGet.Config
+++ b/src/NuGet.Config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/WinSW/WinSW.csproj b/src/WinSW/WinSW.csproj
index e5dc85b..f22bd39 100644
--- a/src/WinSW/WinSW.csproj
+++ b/src/WinSW/WinSW.csproj
@@ -28,6 +28,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-*" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" />
   </ItemGroup>
 
@@ -57,7 +58,7 @@
   <Target Name="PublishCoreExe" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net5.0' and '$(IncludeNativeLibrariesInSingleFile)' == 'true'">
 
     <MakeDir Directories="$(ArtifactsPublishDir)" />
-    <Copy SourceFiles="$(PublishDir)$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW.NETCore.$(PlatformTarget).exe" />
+    <Copy SourceFiles="$(OutputPath)native\$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW.NETCore.$(PlatformTarget).exe" />
 
   </Target>