[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 <donsyme@fastmail.com>

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.
 

scripts/mk_nuget_release.py

@@ -94,7 +94,7 @@ def create_nuget_spec():
     contents = """<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
-        <id>Microsoft.Z3.x64</id>
+        <id>Microsoft.Z3</id>
         <version>{0}</version>
         <authors>Microsoft</authors>
         <description>
@@ -119,7 +119,7 @@ Linux Dependencies:
     </metadata>
 </package>""".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():

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 = """<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
-        <id>Microsoft.Z3.x64</id>
+        <id>Microsoft.Z3</id>
         <version>{0}</version>
         <authors>Microsoft</authors>
         <description>
@@ -114,7 +113,7 @@ Linux Dependencies:
 </package>""".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)

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: |
           [

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: |
           [