diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py index 69b67abc9..1143110aa 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 @@ Linux Dependencies: true en - + """.format(version, repo, branch, commit) diff --git a/src/sat/smt/fpa_solver.cpp b/src/sat/smt/fpa_solver.cpp index f655a0241..55e41fea4 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);