From 9cc1549dbec90a01e91def0102b83bc12039b19f Mon Sep 17 00:00:00 2001
From: Matt Thornton <matthew.thornton13@gmail.com>
Date: Thu, 20 May 2021 23:19:31 +0100
Subject: [PATCH] Use osx-x64 for mac rid rather than macos. (#5288)

---
 scripts/mk_nuget_release.py           | 4 ++--
 scripts/mk_nuget_task.py              | 4 ++--
 src/api/dotnet/Microsoft.Z3.csproj.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/mk_nuget_release.py b/scripts/mk_nuget_release.py
index 1763f457d..d872645a6 100644
--- a/scripts/mk_nuget_release.py
+++ b/scripts/mk_nuget_release.py
@@ -48,7 +48,7 @@ os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
            'x64-win' : ('dll', 'win-x64'),
 # Skip x86 as I can't get dotnet build to produce AnyCPU TargetPlatform           
 #          'x86-win' : ('dll', 'win-x86'),
-           'osx' : ('dylib', 'macos'),
+           'osx' : ('dylib', 'osx-x64'),
            'debian' : ('so', 'debian.8-x64') }
 
 def classify_package(f):
@@ -69,7 +69,7 @@ def unpack():
     #    +- ubuntu.16.04-x64
     #    +- ubuntu.14.04-x64
     #    +- debian.8-x64
-    #    +- macos
+    #    +- osx-x64
     # +
     for f in os.listdir("packages"):
         print(f)
diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index 8039be69a..08f2680a8 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -28,7 +28,7 @@ os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
            'glibc-2.31' : ('so', 'glibc-x64'),
            'x64-win' : ('dll', 'win-x64'),
            'x86-win' : ('dll', 'win-x86'),
-           'osx' : ('dylib', 'macos'),
+           'osx' : ('dylib', 'osx-x64'),
            'debian' : ('so', 'debian.8-x64') }
 
 def classify_package(f):
@@ -52,7 +52,7 @@ def unpack(packages, symbols):
     #    +- win-x64
     #    +- win-x86
     #    +- ubuntu-x64
-    #    +- macos
+    #    +- osx-x64
     # +
     tmp = "tmp" if not symbols else "tmpsym"
     for f in os.listdir(packages):
diff --git a/src/api/dotnet/Microsoft.Z3.csproj.in b/src/api/dotnet/Microsoft.Z3.csproj.in
index 413c1d0ce..157334242 100644
--- a/src/api/dotnet/Microsoft.Z3.csproj.in
+++ b/src/api/dotnet/Microsoft.Z3.csproj.in
@@ -84,7 +84,7 @@ ${Z3_DOTNET_COMPILE_ITEMS}
       <PackagePath>runtimes\linux-x64\native</PackagePath>
     </Content>
     <Content Include="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz3.dylib" Condition="Exists('${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz3.dylib')">
-      <PackagePath>runtimes\macos\native</PackagePath>
+      <PackagePath>runtimes\osx-x64\native</PackagePath>
     </Content>
   </ItemGroup>