diff --git a/build/Build.Native.cs b/build/Build.Native.cs index f1729c6..7b7b3f4 100644 --- a/build/Build.Native.cs +++ b/build/Build.Native.cs @@ -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 => _ => _ @@ -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) diff --git a/build/Build.cs b/build/Build.cs index a472396..11b62d5 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -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(x => x.BuildAll); [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] @@ -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 => _ => _ @@ -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, @@ -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, @@ -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", @@ -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) @@ -181,5 +180,4 @@ private void CreateZip(AbsolutePath dllFile, string platform, string version, Ab readmeStream.Write(content); readmeStream.Flush(); } - } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4879586..254f26f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -10,6 +10,6 @@ Copyright (c) $([System.DateTime]::Now.ToString('yyyy')), Jozef GajdoĊĦ False BSD-3-Clause - 0.7.1 + 1.0.0 diff --git a/src/Src/BouncyHsm.Pkcs11Lib/BouncyHsm.Pkcs11Lib.rc b/src/Src/BouncyHsm.Pkcs11Lib/BouncyHsm.Pkcs11Lib.rc index 9291c95..47ac5d2 100644 Binary files a/src/Src/BouncyHsm.Pkcs11Lib/BouncyHsm.Pkcs11Lib.rc and b/src/Src/BouncyHsm.Pkcs11Lib/BouncyHsm.Pkcs11Lib.rc differ diff --git a/src/Src/BouncyHsm.Pkcs11Lib/globalContext.h b/src/Src/BouncyHsm.Pkcs11Lib/globalContext.h index 96f27bb..e97f229 100644 --- a/src/Src/BouncyHsm.Pkcs11Lib/globalContext.h +++ b/src/Src/BouncyHsm.Pkcs11Lib/globalContext.h @@ -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