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 build dependencies

Browse source
This commit is contained in:
Alex Barney 2022-04-01 19:57:16 -07:00
parent 8756d722d5
commit b80ec8d5a6
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
build/Build.cs
View file

@ -108,16 +108,16 @@ partial class Build : NukeBuild
{ {
if (!e.Message.Contains("not a git repository", StringComparison.OrdinalIgnoreCase)) if (!e.Message.Contains("not a git repository", StringComparison.OrdinalIgnoreCase))
{ {
Logger.Error(e); Serilog.Log.Error(e, e.Message);
} }
} }
if (gitRepository == null || gitVersion == null) if (gitRepository == null || gitVersion == null)
{ {
Logger.Normal("Unable to read Git version."); Serilog.Log.Debug("Unable to read Git version.");
VersionString = GetCsprojVersion(); VersionString = GetCsprojVersion();
Logger.Normal($"Using version from .csproj: {VersionString}"); Serilog.Log.Debug($"Using version from .csproj: {VersionString}");
return; return;
} }
@ -165,7 +165,7 @@ partial class Build : NukeBuild
["VersionSuffix"] = suffix ["VersionSuffix"] = suffix
}; };
Logger.Normal($"Building version {VersionString}"); Serilog.Log.Debug($"Building version {VersionString}");
}); });
Target Clean => _ => _ Target Clean => _ => _
@ -288,7 +288,7 @@ partial class Build : NukeBuild
EnsureExistingDirectory(ArtifactsDirectory); EnsureExistingDirectory(ArtifactsDirectory);
ZipFiles(CliCoreZip, namesCore); ZipFiles(CliCoreZip, namesCore);
Logger.Normal($"Created {CliCoreZip}"); Serilog.Log.Debug($"Created {CliCoreZip}");
PushArtifact(CliCoreZip); PushArtifact(CliCoreZip);
}); });
@ -319,7 +319,7 @@ partial class Build : NukeBuild
if (pwd == string.Empty) if (pwd == string.Empty)
{ {
Logger.Normal("Skipping sign task"); Serilog.Log.Debug("Skipping sign task");
return; return;
} }
@ -348,7 +348,7 @@ partial class Build : NukeBuild
public void PrintResults() public void PrintResults()
{ {
Logger.Normal("SHA-1:"); Serilog.Log.Debug("SHA-1:");
using (var sha = SHA1.Create()) using (var sha = SHA1.Create())
{ {
foreach (string filename in Directory.EnumerateFiles(ArtifactsDirectory)) foreach (string filename in Directory.EnumerateFiles(ArtifactsDirectory))
@ -356,7 +356,7 @@ partial class Build : NukeBuild
using (var stream = new FileStream(filename, FileMode.Open)) using (var stream = new FileStream(filename, FileMode.Open))
{ {
string hash = BitConverter.ToString(sha.ComputeHash(stream)).Replace("-", ""); string hash = BitConverter.ToString(sha.ComputeHash(stream)).Replace("-", "");
Logger.Normal($"{hash} - {Path.GetFileName(filename)}"); Serilog.Log.Debug($"{hash} - {Path.GetFileName(filename)}");
} }
} }
} }
@ -391,7 +391,8 @@ partial class Build : NukeBuild
EnsureExistingDirectory(ArtifactsDirectory); EnsureExistingDirectory(ArtifactsDirectory);
ZipFile(CliNativeZip, CliNativeExe, $"hactoolnet{NativeProgramExtension}"); ZipFile(CliNativeZip, CliNativeExe, $"hactoolnet{NativeProgramExtension}");
Logger.Normal($"Created {CliNativeZip}"); Serilog.Log.Debug($"Created {CliNativeZip}");
Serilog.Log.Debug($"Created {CliNativeZip}");
PushArtifact(CliNativeZip); PushArtifact(CliNativeZip);
} }
@ -530,12 +531,12 @@ partial class Build : NukeBuild
if (!File.Exists(path)) if (!File.Exists(path))
{ {
Logger.Warn($"Unable to add artifact {path}"); Serilog.Log.Warning($"Unable to add artifact {path}");
} }
appVeyor.PushArtifact(path, name); appVeyor.PushArtifact(path, name);
Logger.Normal($"Added AppVeyor artifact {path}"); Serilog.Log.Debug($"Added AppVeyor artifact {path}");
} }
public static void ReplaceLineEndings(string filename) public static void ReplaceLineEndings(string filename)
@ -565,7 +566,7 @@ partial class Build : NukeBuild
AbsolutePath coreFxDir = TempDirectory / ("sign_" + Path.GetFileName(CliCoreZip)); AbsolutePath coreFxDir = TempDirectory / ("sign_" + Path.GetFileName(CliCoreZip));
AbsolutePath nativeZipDir = TempDirectory / ("sign_" + Path.GetFileName(CliNativeZip)); AbsolutePath nativeZipDir = TempDirectory / ("sign_" + Path.GetFileName(CliNativeZip));
bool signNative = FileExists(CliNativeExe); bool signNative = CliNativeExe.FileExists();
try try
{ {
@ -647,7 +648,7 @@ partial class Build : NukeBuild
public void RunCodegenStage2() public void RunCodegenStage2()
{ {
Logger.Normal("\nBuilding stage 2 codegen project."); Serilog.Log.Debug("\nBuilding stage 2 codegen project.");
DotNetRunSettings settings = new DotNetRunSettings() DotNetRunSettings settings = new DotNetRunSettings()
.SetProjectFile(CodeGenProject.Path); .SetProjectFile(CodeGenProject.Path);
@ -656,11 +657,11 @@ partial class Build : NukeBuild
try try
{ {
DotNetRun(settings); DotNetRun(settings);
Logger.Normal(); Serilog.Log.Debug("");
} }
catch (ProcessException) catch (ProcessException)
{ {
Logger.Error("\nError running stage 2 codegen. Skipping...\n"); Serilog.Log.Error("\nError running stage 2 codegen. Skipping...\n");
} }
} }
} }

6
build/CodeGen/Common.cs
View file

@ -67,11 +67,11 @@ public static class Common
if (oldFile?.SequenceEqual(newFile) == true) if (oldFile?.SequenceEqual(newFile) == true)
{ {
Logger.Normal($"{relativePath} is already up-to-date"); Serilog.Log.Debug($"{relativePath} is already up-to-date");
return; return;
} }
Logger.Normal($"Generated file {relativePath}"); Serilog.Log.Debug($"Generated file {relativePath}");
File.WriteAllBytes(fullPath, newFile); File.WriteAllBytes(fullPath, newFile);
} }
@ -105,4 +105,4 @@ public static class Common
return Path.Combine(currentDir, "src"); return Path.Combine(currentDir, "src");
} }
} }

2
build/CodeGen/_buildCodeGen.csproj
View file

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Nuke.Common" Version="5.3.0" /> <PackageReference Include="Nuke.Common" Version="6.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
build/_build.csproj
View file

@ -13,10 +13,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageDownload Include="GitVersion.Tool" Version="[5.8.0]" /> <PackageDownload Include="GitVersion.Tool" Version="[5.9.0]" />
<PackageReference Include="CsvHelper" Version="27.2.1" /> <PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="NuGet.CommandLine" Version="6.0.0" /> <PackageReference Include="NuGet.CommandLine" Version="6.0.0" />
<PackageReference Include="Nuke.Common" Version="5.3.0" /> <PackageReference Include="Nuke.Common" Version="6.0.1" />
<PackageReference Include="SharpZipLib" Version="1.3.3" /> <PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup> </ItemGroup>

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

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.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" />