From 904de2d797341a6b9b39034afb64fb47c214e300 Mon Sep 17 00:00:00 2001 From: Mathieu Morrissette Date: Mon, 7 Oct 2019 08:27:27 -0400 Subject: [PATCH] improve nuget build script --- wrappers/csharp/nuget/GenerateNuget.py | 7 ++++--- ...tions.Crypto.nuspec => Devolutions.Crypto.Linux.nuspec} | 2 +- ...ons.Crypto.targets => Devolutions.Crypto.Linux.targets} | 0 ...ons.Crypto.nuspec => Devolutions.Crypto.Windows.nuspec} | 2 +- ...s.Crypto.targets => Devolutions.Crypto.Windows.targets} | 0 ...ns.Crypto.nuspec => Devolutions.Crypto.Mac.Full.nuspec} | 2 +- ....Crypto.targets => Devolutions.Crypto.Mac.Full.targets} | 0 7 files changed, 7 insertions(+), 6 deletions(-) rename wrappers/csharp/nuget/Linux/{Devolutions.Crypto.nuspec => Devolutions.Crypto.Linux.nuspec} (94%) rename wrappers/csharp/nuget/Linux/{Devolutions.Crypto.targets => Devolutions.Crypto.Linux.targets} (100%) rename wrappers/csharp/nuget/Windows/{Devolutions.Crypto.nuspec => Devolutions.Crypto.Windows.nuspec} (93%) rename wrappers/csharp/nuget/Windows/{Devolutions.Crypto.targets => Devolutions.Crypto.Windows.targets} (100%) rename wrappers/csharp/nuget/macOS/Full/{Devolutions.Crypto.nuspec => Devolutions.Crypto.Mac.Full.nuspec} (93%) rename wrappers/csharp/nuget/macOS/Full/{Devolutions.Crypto.targets => Devolutions.Crypto.Mac.Full.targets} (100%) diff --git a/wrappers/csharp/nuget/GenerateNuget.py b/wrappers/csharp/nuget/GenerateNuget.py index b10d2222a..90b47c5aa 100644 --- a/wrappers/csharp/nuget/GenerateNuget.py +++ b/wrappers/csharp/nuget/GenerateNuget.py @@ -21,7 +21,7 @@ if sys.argv[1] == "WIN" or everything: print("Generating WINDOWS nuget...") - command= subprocess.Popen(["nuget", "pack", "./Windows/Devolutions.Crypto.nuspec", "-Version", version, "-OutputDirectory", "./Windows/package", "-Properties", "platform=windows"], stdout=subprocess.PIPE) + command= subprocess.Popen(["nuget", "pack", "./Windows/Devolutions.Crypto.Windows.nuspec", "-Version", version, "-OutputDirectory", "./Windows/package", "-Properties", "platform=windows"], stdout=subprocess.PIPE) output = command.stdout.read().decode('utf-8') print(output) @@ -29,7 +29,7 @@ if sys.argv[1] == "LINUX" or everything: print("Generating LINUX nuget...") - command= subprocess.Popen(["nuget", "pack", "./Linux/Devolutions.Crypto.nuspec", "-Version", version, "-OutputDirectory", "./Linux/package", "-Properties", "platform=linux"], stdout=subprocess.PIPE) + command= subprocess.Popen(["nuget", "pack", "./Linux/Devolutions.Crypto.Linux.nuspec", "-Version", version, "-OutputDirectory", "./Linux/package", "-Properties", "platform=linux"], stdout=subprocess.PIPE) output = command.stdout.read().decode('utf-8') print(output) @@ -67,7 +67,8 @@ if sys.argv[1] == "MAC-FULL" or everything: print("Generating MAC FULL nuget...") - command= subprocess.Popen(["nuget", "pack", "./macOS/Full/Devolutions.Crypto.nuspec", "-Version", version, "-OutputDirectory", "./macOS/Full/package", "-Properties", "platform=macos"], stdout=subprocess.PIPE) + # platform windows (since the managed mac dll only supports xamarin modern, windows managed dll is compatible) + command= subprocess.Popen(["nuget", "pack", "./macOS/Full/Devolutions.Crypto.Mac.Full.nuspec", "-Version", version, "-OutputDirectory", "./macOS/Full/package", "-Properties", "platform=windows"], stdout=subprocess.PIPE) output = command.stdout.read().decode('utf-8') print(output) diff --git a/wrappers/csharp/nuget/Linux/Devolutions.Crypto.nuspec b/wrappers/csharp/nuget/Linux/Devolutions.Crypto.Linux.nuspec similarity index 94% rename from wrappers/csharp/nuget/Linux/Devolutions.Crypto.nuspec rename to wrappers/csharp/nuget/Linux/Devolutions.Crypto.Linux.nuspec index 0acf05bcd..37d09f846 100644 --- a/wrappers/csharp/nuget/Linux/Devolutions.Crypto.nuspec +++ b/wrappers/csharp/nuget/Linux/Devolutions.Crypto.Linux.nuspec @@ -26,6 +26,6 @@ - + \ No newline at end of file diff --git a/wrappers/csharp/nuget/Linux/Devolutions.Crypto.targets b/wrappers/csharp/nuget/Linux/Devolutions.Crypto.Linux.targets similarity index 100% rename from wrappers/csharp/nuget/Linux/Devolutions.Crypto.targets rename to wrappers/csharp/nuget/Linux/Devolutions.Crypto.Linux.targets diff --git a/wrappers/csharp/nuget/Windows/Devolutions.Crypto.nuspec b/wrappers/csharp/nuget/Windows/Devolutions.Crypto.Windows.nuspec similarity index 93% rename from wrappers/csharp/nuget/Windows/Devolutions.Crypto.nuspec rename to wrappers/csharp/nuget/Windows/Devolutions.Crypto.Windows.nuspec index 24579e8e4..f3d5c0291 100644 --- a/wrappers/csharp/nuget/Windows/Devolutions.Crypto.nuspec +++ b/wrappers/csharp/nuget/Windows/Devolutions.Crypto.Windows.nuspec @@ -26,6 +26,6 @@ - + \ No newline at end of file diff --git a/wrappers/csharp/nuget/Windows/Devolutions.Crypto.targets b/wrappers/csharp/nuget/Windows/Devolutions.Crypto.Windows.targets similarity index 100% rename from wrappers/csharp/nuget/Windows/Devolutions.Crypto.targets rename to wrappers/csharp/nuget/Windows/Devolutions.Crypto.Windows.targets diff --git a/wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.nuspec b/wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.Mac.Full.nuspec similarity index 93% rename from wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.nuspec rename to wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.Mac.Full.nuspec index 4f0510380..ff0ca189c 100644 --- a/wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.nuspec +++ b/wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.Mac.Full.nuspec @@ -25,6 +25,6 @@ - + \ No newline at end of file diff --git a/wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.targets b/wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.Mac.Full.targets similarity index 100% rename from wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.targets rename to wrappers/csharp/nuget/macOS/Full/Devolutions.Crypto.Mac.Full.targets