From 7ce9ea09e6c628bb0b5aca113bf3f3be636fe681 Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Sat, 29 Feb 2020 01:18:10 -0700
Subject: [PATCH] Misc build updates

---
 DotnetCliVersion.txt                   | 2 +-
 build/Build.cs                         | 4 +++-
 build/RepackNuget.cs                   | 2 +-
 build/_build.csproj                    | 2 +-
 src/hactoolnet/hactoolnet.csproj       | 2 +-
 tests/LibHac.Tests/LibHac.Tests.csproj | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/DotnetCliVersion.txt b/DotnetCliVersion.txt
index a43bc739..f7744831 100644
--- a/DotnetCliVersion.txt
+++ b/DotnetCliVersion.txt
@@ -1 +1 @@
-3.1.100
\ No newline at end of file
+3.1.101
\ No newline at end of file
diff --git a/build/Build.cs b/build/Build.cs
index 83379fbc..d7603261 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -326,6 +326,7 @@ namespace LibHacBuild
             .After(Compile)
             .Executes(BuildNative);
 
+        // ReSharper disable once UnusedMember.Local
         Target AppVeyorBuild => _ => _
             .DependsOn(Zip, Native, Publish)
             .Unlisted()
@@ -335,6 +336,7 @@ namespace LibHacBuild
             .DependsOn(Test, Zip)
             .Executes(PrintResults);
 
+        // ReSharper disable once UnusedMember.Local
         Target Full => _ => _
             .DependsOn(Sign, Native)
             .Executes(PrintResults);
@@ -372,7 +374,7 @@ namespace LibHacBuild
 
             if (EnvironmentInfo.IsUnix && !Untrimmed)
             {
-                File.Copy(CliNativeExe, CliNativeExe + "_unstripped");
+                File.Copy(CliNativeExe, CliNativeExe + "_unstripped", true);
                 ProcessTasks.StartProcess("strip", CliNativeExe).AssertZeroExitCode();
             }
 
diff --git a/build/RepackNuget.cs b/build/RepackNuget.cs
index 882a1f3e..2de40ce1 100644
--- a/build/RepackNuget.cs
+++ b/build/RepackNuget.cs
@@ -7,9 +7,9 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Xml.Linq;
 using ICSharpCode.SharpZipLib.Zip;
+using Nuke.Common.IO;
 using Nuke.Common.Tools.NuGet;
 using static Nuke.Common.IO.FileSystemTasks;
-using static Nuke.Common.IO.PathConstruction;
 
 namespace LibHacBuild
 {
diff --git a/build/_build.csproj b/build/_build.csproj
index a5b96802..33ce19a2 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -13,7 +13,7 @@
     <PackageDownload Include="GitVersion.Tool" Version="[5.1.3]" />
     <PackageReference Include="CsvHelper" Version="15.0.0" />
     <PackageReference Include="NuGet.CommandLine" Version="5.4.0" />
-    <PackageReference Include="Nuke.Common" Version="0.23.4" />
+    <PackageReference Include="Nuke.Common" Version="0.24.2" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
   </ItemGroup>
 
diff --git a/src/hactoolnet/hactoolnet.csproj b/src/hactoolnet/hactoolnet.csproj
index df282e67..6a3cf580 100644
--- a/src/hactoolnet/hactoolnet.csproj
+++ b/src/hactoolnet/hactoolnet.csproj
@@ -32,7 +32,7 @@
     <RootAllApplicationAssemblies>false</RootAllApplicationAssemblies>
   </PropertyGroup>
 
-  <ItemGroup Condition=" $(BuildType.StartsWith('native')) and '$(BuildType)' != 'native-untrimmed' ">
+  <ItemGroup Condition=" $(BuildType.StartsWith('native')) and '$(OS)' == 'Windows_NT' and '$(BuildType)' != 'native-untrimmed' ">
     <IlcArg Include="--removefeature:EventSource" />
   </ItemGroup>
 
diff --git a/tests/LibHac.Tests/LibHac.Tests.csproj b/tests/LibHac.Tests/LibHac.Tests.csproj
index d5c07371..7a208ee4 100644
--- a/tests/LibHac.Tests/LibHac.Tests.csproj
+++ b/tests/LibHac.Tests/LibHac.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
     <PackageReference Include="xunit.analyzers" Version="0.10.0" />
     <PackageReference Include="xunit.assert.source" Version="2.4.1" />