From 7d311ac2effb9f6a63477023e1f335ce101e33d4 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Sat, 25 Dec 2021 13:44:40 -0800
Subject: [PATCH] use netstandard 2.0 per recommendations

seems that now the recommended starting point is 2.0 and not lower.
---
 scripts/mk_nuget_task.py   | 6 +++---
 src/sat/smt/fpa_solver.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index 69b67abc9c5..1143110aa1f 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -65,7 +65,7 @@ def unpack(packages, symbols):
             mk_dir(f"out/runtimes/{dst}/native")
             replace(f"{tmp}/{package_dir}/bin/libz3.{ext}", f"out/runtimes/{dst}/native/libz3.{ext}")            
             if "x64-win" in f:
-                mk_dir("out/lib/netstandard1.4/")
+                mk_dir("out/lib/netstandard2.0/")
                 if symbols:
                     zip_ref.extract(f"{package_dir}/bin/libz3.pdb", f"{tmp}")
                     replace(f"{tmp}/{package_dir}/bin/libz3.pdb", f"out/runtimes/{dst}/native/libz3.pdb") 
@@ -74,7 +74,7 @@ def unpack(packages, symbols):
                     files += ["Microsoft.Z3.pdb", "Microsoft.Z3.xml"]
                 for b in files:
                     zip_ref.extract(f"{package_dir}/bin/{b}", f"{tmp}")
-                    replace(f"{tmp}/{package_dir}/bin/{b}", f"out/lib/netstandard1.4/{b}")
+                    replace(f"{tmp}/{package_dir}/bin/{b}", f"out/lib/netstandard2.0/{b}")
 
 def mk_targets(source_root):
     mk_dir("out/build")
@@ -107,7 +107,7 @@ def create_nuget_spec(version, repo, branch, commit, symbols):
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <language>en</language>
         <dependencies>
-            <group targetFramework=".NETStandard1.4" />
+            <group targetFramework=".netstandard2.0" />
         </dependencies>
     </metadata>
 </package>""".format(version, repo, branch, commit)
diff --git a/src/sat/smt/fpa_solver.cpp b/src/sat/smt/fpa_solver.cpp
index f655a0241d7..55e41fea48c 100644
--- a/src/sat/smt/fpa_solver.cpp
+++ b/src/sat/smt/fpa_solver.cpp
@@ -269,7 +269,7 @@ namespace fpa {
         expr* xe = e_x->get_expr();
         expr* ye = e_y->get_expr();
 
-        if (m_fpa_util.is_bvwrap(xe) || m_fpa_util.is_bvwrap(ye))
+        if (fu.is_bvwrap(xe) || fu.is_bvwrap(ye))
             return;
 
         expr_ref xc = convert(xe);