From 504b6559ab19dd4454531b1fbf031742538fd6fc Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 11 Feb 2021 17:29:32 +0000 Subject: [PATCH] [WIP] Suggestion: build .NET package for both x86 and x64 and rename (#5021) * build package for x86 * build package for x86 * build package for x86 Co-authored-by: Don Syme --- README.md | 2 +- scripts/mk_nuget_release.py | 4 ++-- scripts/mk_nuget_task.py | 9 ++++----- scripts/nightly.yaml | 6 +++--- scripts/release.yml | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d56784bef..bbbe2e361 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ Z3 has bindings for various programming languages. ### ``.NET`` -You can install a nuget package for the latest release Z3 from [nuget.org](https://www.nuget.org/packages/Microsoft.Z3.x64/). +You can install a nuget package for the latest release Z3 from [nuget.org](https://www.nuget.org/packages/Microsoft.Z3/). Use the ``--dotnet`` command line flag with ``mk_make.py`` to enable building these. diff --git a/scripts/mk_nuget_release.py b/scripts/mk_nuget_release.py index baca0b086..1763f457d 100644 --- a/scripts/mk_nuget_release.py +++ b/scripts/mk_nuget_release.py @@ -94,7 +94,7 @@ def create_nuget_spec(): contents = """ - Microsoft.Z3.x64 + Microsoft.Z3 {0} Microsoft @@ -119,7 +119,7 @@ Linux Dependencies: """.format(release_version, release_commit) - with open("out/Microsoft.Z3.x64.nuspec", 'w') as f: + with open("out/Microsoft.Z3.nuspec", 'w') as f: f.write(contents) def create_nuget_package(): diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py index aa188136f..c69028757 100644 --- a/scripts/mk_nuget_task.py +++ b/scripts/mk_nuget_task.py @@ -26,8 +26,7 @@ os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'), 'ubuntu-18' : ('so', 'ubuntu-x64'), 'ubuntu-20' : ('so', 'ubuntu-x64'), 'x64-win' : ('dll', 'win-x64'), -# Skip x86 as I can't get dotnet build to produce AnyCPU TargetPlatform -# 'x86-win' : ('dll', 'win-x86'), + 'x86-win' : ('dll', 'win-x86'), 'osx' : ('dylib', 'macos'), 'debian' : ('so', 'debian.8-x64') } @@ -79,7 +78,7 @@ def unpack(packages, symbols): def mk_targets(source_root): mk_dir("out/build") - shutil.copy(f"{source_root}/src/api/dotnet/Microsoft.Z3.targets.in", "out/build/Microsoft.Z3.x64.targets") + shutil.copy(f"{source_root}/src/api/dotnet/Microsoft.Z3.targets.in", "out/build/Microsoft.Z3.targets") def mk_icon(source_root): mk_dir("out/content") @@ -90,7 +89,7 @@ def create_nuget_spec(version, repo, branch, commit, symbols): contents = """ - Microsoft.Z3.x64 + Microsoft.Z3 {0} Microsoft @@ -114,7 +113,7 @@ Linux Dependencies: """.format(version, repo, branch, commit) print(contents) sym = "sym." if symbols else "" - file = f"out/Microsoft.Z3.x64.{sym}nuspec" + file = f"out/Microsoft.Z3.{sym}nuspec" print(file) with open(file, 'w') as f: f.write(contents) diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index 029dbf6e7..96ef85ebc 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -181,13 +181,13 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom - arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x64.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' + arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' - task: EsrpCodeSigning@1 displayName: 'Sign Package' inputs: ConnectedServiceName: 'z3-esrp-signing' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.x64.$(ReleaseVersion).nupkg + Pattern: Microsoft.Z3.$(ReleaseVersion).nupkg signConfigType: 'inlineSignParams' inlineOperation: | [ @@ -214,7 +214,7 @@ stages: inputs: ConnectedServiceName: 'z3-esrp-signing' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.x64.$(ReleaseVersion).snupkg + Pattern: Microsoft.Z3.$(ReleaseVersion).snupkg signConfigType: 'inlineSignParams' inlineOperation: | [ diff --git a/scripts/release.yml b/scripts/release.yml index 0e3ead60e..22b047b63 100644 --- a/scripts/release.yml +++ b/scripts/release.yml @@ -168,13 +168,13 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom - arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x64.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' + arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.sym.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' - task: EsrpCodeSigning@1 displayName: 'Sign Package' inputs: ConnectedServiceName: 'z3-esrp-signing' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.x64.$(ReleaseVersion).nupkg + Pattern: Microsoft.Z3.$(ReleaseVersion).nupkg signConfigType: 'inlineSignParams' inlineOperation: | [ @@ -201,7 +201,7 @@ stages: inputs: ConnectedServiceName: 'z3-esrp-signing' FolderPath: $(Build.ArtifactStagingDirectory) - Pattern: Microsoft.Z3.x64.$(ReleaseVersion).snupkg + Pattern: Microsoft.Z3.$(ReleaseVersion).snupkg signConfigType: 'inlineSignParams' inlineOperation: | [