From 3e17692a25d03be40b8b7e208ef915d85a58e1b0 Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Fri, 17 Dec 2021 15:37:14 -0700
Subject: [PATCH] Update version to v0.15.0 and .NET 6.0

---
 GitVersion.yml                         | 2 +-
 build/Build.cs                         | 9 +++++----
 src/LibHac/LibHac.csproj               | 7 +++----
 src/hactoolnet/hactoolnet.csproj       | 5 ++---
 tests/LibHac.Tests/LibHac.Tests.csproj | 2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/GitVersion.yml b/GitVersion.yml
index 4e3cb407..5cf72528 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,6 +1,6 @@
 mode: ContinuousDeployment
 increment: Patch
-next-version: 0.14.0
+next-version: 0.15.0
 branches:
   master:
     tag: alpha
\ No newline at end of file
diff --git a/build/Build.cs b/build/Build.cs
index bbd255e7..f6e72269 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -44,7 +44,7 @@ partial class Build : NukeBuild
     AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
     AbsolutePath SignedArtifactsDirectory => ArtifactsDirectory / "signed";
     AbsolutePath TempDirectory => RootDirectory / ".nuke" / "temp";
-    AbsolutePath CliCoreDir => TempDirectory / "hactoolnet_net5.0";
+    AbsolutePath CliCoreDir => TempDirectory / "hactoolnet_net6.0";
     AbsolutePath CliNativeDir => TempDirectory / $"hactoolnet_{HostOsName}";
     AbsolutePath CliNativeExe => CliNativeDir / $"hactoolnet{NativeProgramExtension}";
     AbsolutePath CliCoreZip => ArtifactsDirectory / $"hactoolnet-{VersionString}-netcore.zip";
@@ -221,7 +221,7 @@ partial class Build : NukeBuild
 
             DotNetPublish(s => publishSettings
                 .SetProject(HactoolnetProject)
-                .SetFramework("net5.0")
+                .SetFramework("net6.0")
                 .SetOutput(CliCoreDir)
                 .SetNoBuild(true)
                 .SetProperties(VersionProps));
@@ -271,7 +271,7 @@ partial class Build : NukeBuild
                 .EnableNoBuild()
                 .SetConfiguration(Configuration);
 
-            if (EnvironmentInfo.IsUnix) settings = settings.SetProperty("TargetFramework", "net5.0");
+            if (EnvironmentInfo.IsUnix) settings = settings.SetProperty("TargetFramework", "net6.0");
 
             DotNetTest(s => settings);
         });
@@ -374,6 +374,7 @@ partial class Build : NukeBuild
             .SetConfiguration(Configuration)
             .SetProject(HactoolnetProject)
             .SetRuntime(NativeRuntime)
+            .SetSelfContained(true)
             .SetOutput(CliNativeDir)
             .SetProperties(VersionProps)
             .AddProperty("BuildType", buildType);
@@ -585,7 +586,7 @@ partial class Build : NukeBuild
             SignAssemblies(password, toSign.Select(x => x.ToString()).ToArray());
 
             // Avoid having multiple signed versions of the same file
-            File.Copy(nupkgDir / "lib" / "net5.0" / "LibHac.dll", coreFxDir / "LibHac.dll", true);
+            File.Copy(nupkgDir / "lib" / "net6.0" / "LibHac.dll", coreFxDir / "LibHac.dll", true);
 
             ZipDirectory(SignedArtifactsDirectory / Path.GetFileName(nupkgFile), nupkgDir, pkgFileList);
             ZipDirectory(SignedArtifactsDirectory / Path.GetFileName(CliCoreZip), coreFxDir);
diff --git a/src/LibHac/LibHac.csproj b/src/LibHac/LibHac.csproj
index e9b06ddb..5d599adc 100644
--- a/src/LibHac/LibHac.csproj
+++ b/src/LibHac/LibHac.csproj
@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <VersionPrefix>0.14.0</VersionPrefix>
-    <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <VersionPrefix>0.15.0</VersionPrefix>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
@@ -42,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.5.2" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.6.0" PrivateAssets="All" />
     <PackageReference Include="InlineIL.Fody" Version="1.7.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/hactoolnet/hactoolnet.csproj b/src/hactoolnet/hactoolnet.csproj
index 206f6822..7193d04d 100644
--- a/src/hactoolnet/hactoolnet.csproj
+++ b/src/hactoolnet/hactoolnet.csproj
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>0.14.0</VersionPrefix>
+    <VersionPrefix>0.15.0</VersionPrefix>
     <PathMap Condition=" '$(BuildType)' == 'Release' ">$(MSBuildProjectDirectory)=C:/hactoolnet/</PathMap>
   </PropertyGroup>
 
diff --git a/tests/LibHac.Tests/LibHac.Tests.csproj b/tests/LibHac.Tests/LibHac.Tests.csproj
index bb4bd65c..6c4ff547 100644
--- a/tests/LibHac.Tests/LibHac.Tests.csproj
+++ b/tests/LibHac.Tests/LibHac.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.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" />