Skip to content

Commit

Permalink
Bump version to 1.0.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
harrison314 committed Sep 13, 2024
1 parent 73b22f1 commit a56d712
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build/Build.Native.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public partial class Build
AbsolutePath nativeLib = SourceDirectory / "BouncyHsm.Pkcs11Lib" / Configuration / "BouncyHsm.Pkcs11Lib.dll";
AbsolutePath destination = ArtifactsTmpDirectory / "native" / "Win-x86";
destination.CreateOrCleanDirectory();
CopyFileToDirectory(nativeLib, destination);
nativeLib.CopyToDirectory(destination);
});

Target BuildPkcs11LibX64 => _ => _
Expand All @@ -35,7 +35,7 @@ public partial class Build
AbsolutePath nativeLib = SourceDirectory / "BouncyHsm.Pkcs11Lib" / "x64" / Configuration / "BouncyHsm.Pkcs11Lib.dll";
AbsolutePath destination = ArtifactsTmpDirectory / "native" / "Win-x64";
destination.CreateOrCleanDirectory();
CopyFileToDirectory(nativeLib, destination);
nativeLib.CopyToDirectory(destination);
});

private void BuildBouncyHsmPkcs11Lib(MSBuildTargetPlatform platform)
Expand Down
14 changes: 6 additions & 8 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
InvokedTargets = new[] { nameof(BuildAll) })]
public partial class Build : NukeBuild
{
private static string ThisVersion = "0.7.1";
private static string ThisVersion = "1.0.0";
public static int Main() => Execute<Build>(x => x.BuildAll);

[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
Expand All @@ -46,7 +46,7 @@ public partial class Build : NukeBuild
[NuGetPackage(
packageId: "dotnet-project-licenses",
packageExecutable: "NugetUtility.dll",
Framework = "net7.0")]
Framework = "net8.0")]
readonly Tool DotnetProjectLicenses;

Target Clean => _ => _
Expand Down Expand Up @@ -99,7 +99,7 @@ public partial class Build : NukeBuild
.Produces(ArtifactsDirectory / "*.zip")
.Executes(() =>
{
CopyDirectoryRecursively(ArtifactsTmpDirectory / "native", ArtifactsTmpDirectory / "BouncyHsm" / "native");
(ArtifactsTmpDirectory / "native").Copy(ArtifactsTmpDirectory / "BouncyHsm" / "native");
CreateZip(ArtifactsTmpDirectory / "native" / "Win-x64" / "BouncyHsm.Pkcs11Lib.dll",
"Win X64",
ThisVersion,
Expand All @@ -112,8 +112,7 @@ public partial class Build : NukeBuild
AbsolutePath linuxNativeLibx64 = RootDirectory / "build_linux" / "BouncyHsm.Pkcs11Lib-x64.so";
if (linuxNativeLibx64.Exists("file"))
{
CopyFile(linuxNativeLibx64, ArtifactsTmpDirectory / "BouncyHsm" / "native" / "Linux-x64" / "BouncyHsm.Pkcs11Lib.so");

linuxNativeLibx64.Copy(ArtifactsTmpDirectory / "BouncyHsm" / "native" / "Linux-x64" / "BouncyHsm.Pkcs11Lib.so");
CreateZip(linuxNativeLibx64,
"Linux X64",
ThisVersion,
Expand All @@ -127,7 +126,7 @@ public partial class Build : NukeBuild
AbsolutePath linuxNativeLibx32 = RootDirectory / "build_linux" / "BouncyHsm.Pkcs11Lib-x32.so";
if (linuxNativeLibx32.Exists("file"))
{
CopyFile(linuxNativeLibx32, ArtifactsTmpDirectory / "BouncyHsm" / "native" / "Linux-x64" / "BouncyHsm.Pkcs11Lib.so");
linuxNativeLibx32.Copy(ArtifactsTmpDirectory / "BouncyHsm" / "native" / "Linux-x64" / "BouncyHsm.Pkcs11Lib.so");

CreateZip(linuxNativeLibx32,
"Linux X86",
Expand Down Expand Up @@ -155,7 +154,7 @@ private void CopyLicenses(AbsolutePath bouncyHsmPath)

AbsolutePath licensesFilePath = bouncyHsmPath / "LicensesThirdParty.txt";
// DotnetProjectLicenses($"--input \"{RootDirectory / "src" / "BouncyHsm.sln"}\" -o -t --outfile \"{licensesFilePath}\" -p false");
CopyFile(RootDirectory / "LICENSE", bouncyHsmPath / "License.txt");
(RootDirectory / "LICENSE").Copy(bouncyHsmPath / "License.txt");
}

private void CreateZip(AbsolutePath dllFile, string platform, string version, AbsolutePath destination)
Expand All @@ -181,5 +180,4 @@ private void CreateZip(AbsolutePath dllFile, string platform, string version, Ab
readmeStream.Write(content);
readmeStream.Flush();
}

}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<Copyright>Copyright (c) $([System.DateTime]::Now.ToString('yyyy')), Jozef Gajdoš</Copyright>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
<Version>0.7.1</Version>
<Version>1.0.0</Version>
</PropertyGroup>
</Project>
Binary file modified src/Src/BouncyHsm.Pkcs11Lib/BouncyHsm.Pkcs11Lib.rc
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Src/BouncyHsm.Pkcs11Lib/globalContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void GlobalContextInit();
#define BOUNCY_HSM_DEFAULT_PORT 8765
#define PKCS11_LIB_DESCRIPTION "BouncyHsm.Pkcs11 library"

#define BOUNCY_HSM_LIBVERSION "0.7.1.0"
#define BOUNCY_HSM_LIBVERSION "1.0.0.0"
#define BOUNCY_HSM_LIBVERSION_MAJOR 0
#define BOUNCY_HSM_LIBVERSION_MINOR 5

Expand Down

0 comments on commit a56d712

Please sign in to comment.