mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update version to v0.15.0 and .NET 6.0

Browse source
This commit is contained in:
Alex Barney 2021-12-17 15:37:14 -07:00
parent fc1e098118
commit 3e17692a25
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GitVersion.yml
View file

@ -1,6 +1,6 @@
mode: ContinuousDeployment mode: ContinuousDeployment
increment: Patch increment: Patch
next-version: 0.14.0 next-version: 0.15.0
branches: branches:
master: master:
tag: alpha tag: alpha

9
build/Build.cs
View file

@ -44,7 +44,7 @@ partial class Build : NukeBuild
AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts"; AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
AbsolutePath SignedArtifactsDirectory => ArtifactsDirectory / "signed"; AbsolutePath SignedArtifactsDirectory => ArtifactsDirectory / "signed";
AbsolutePath TempDirectory => RootDirectory / ".nuke" / "temp"; AbsolutePath TempDirectory => RootDirectory / ".nuke" / "temp";
AbsolutePath CliCoreDir => TempDirectory / "hactoolnet_net5.0"; AbsolutePath CliCoreDir => TempDirectory / "hactoolnet_net6.0";
AbsolutePath CliNativeDir => TempDirectory / $"hactoolnet_{HostOsName}"; AbsolutePath CliNativeDir => TempDirectory / $"hactoolnet_{HostOsName}";
AbsolutePath CliNativeExe => CliNativeDir / $"hactoolnet{NativeProgramExtension}"; AbsolutePath CliNativeExe => CliNativeDir / $"hactoolnet{NativeProgramExtension}";
AbsolutePath CliCoreZip => ArtifactsDirectory / $"hactoolnet-{VersionString}-netcore.zip"; AbsolutePath CliCoreZip => ArtifactsDirectory / $"hactoolnet-{VersionString}-netcore.zip";
@ -221,7 +221,7 @@ partial class Build : NukeBuild
DotNetPublish(s => publishSettings DotNetPublish(s => publishSettings
.SetProject(HactoolnetProject) .SetProject(HactoolnetProject)
.SetFramework("net5.0") .SetFramework("net6.0")
.SetOutput(CliCoreDir) .SetOutput(CliCoreDir)
.SetNoBuild(true) .SetNoBuild(true)
.SetProperties(VersionProps)); .SetProperties(VersionProps));
@ -271,7 +271,7 @@ partial class Build : NukeBuild
.EnableNoBuild() .EnableNoBuild()
.SetConfiguration(Configuration); .SetConfiguration(Configuration);
if (EnvironmentInfo.IsUnix) settings = settings.SetProperty("TargetFramework", "net5.0"); if (EnvironmentInfo.IsUnix) settings = settings.SetProperty("TargetFramework", "net6.0");
DotNetTest(s => settings); DotNetTest(s => settings);
}); });
@ -374,6 +374,7 @@ partial class Build : NukeBuild
.SetConfiguration(Configuration) .SetConfiguration(Configuration)
.SetProject(HactoolnetProject) .SetProject(HactoolnetProject)
.SetRuntime(NativeRuntime) .SetRuntime(NativeRuntime)
.SetSelfContained(true)
.SetOutput(CliNativeDir) .SetOutput(CliNativeDir)
.SetProperties(VersionProps) .SetProperties(VersionProps)
.AddProperty("BuildType", buildType); .AddProperty("BuildType", buildType);
@ -585,7 +586,7 @@ partial class Build : NukeBuild
SignAssemblies(password, toSign.Select(x => x.ToString()).ToArray()); SignAssemblies(password, toSign.Select(x => x.ToString()).ToArray());
// Avoid having multiple signed versions of the same file // 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(nupkgFile), nupkgDir, pkgFileList);
ZipDirectory(SignedArtifactsDirectory / Path.GetFileName(CliCoreZip), coreFxDir); ZipDirectory(SignedArtifactsDirectory / Path.GetFileName(CliCoreZip), coreFxDir);

7
src/LibHac/LibHac.csproj
View file

@ -2,9 +2,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<VersionPrefix>0.14.0</VersionPrefix> <VersionPrefix>0.15.0</VersionPrefix>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
@ -42,7 +41,7 @@
</ItemGroup> </ItemGroup>
<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="InlineIL.Fody" Version="1.7.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup> </ItemGroup>

5
src/hactoolnet/hactoolnet.csproj
View file

@ -2,12 +2,11 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<LangVersion>10.0</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<VersionPrefix>0.14.0</VersionPrefix> <VersionPrefix>0.15.0</VersionPrefix>
<PathMap Condition=" '$(BuildType)' == 'Release' ">$(MSBuildProjectDirectory)=C:/hactoolnet/</PathMap> <PathMap Condition=" '$(BuildType)' == 'Release' ">$(MSBuildProjectDirectory)=C:/hactoolnet/</PathMap>
</PropertyGroup> </PropertyGroup>

2
tests/LibHac.Tests/LibHac.Tests.csproj
View file

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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.core" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" /> <PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.assert.source" Version="2.4.1" /> <PackageReference Include="xunit.assert.source" Version="2.4.1" />