mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Code Activity

use netstandard 2.0 per recommendations

Browse source 
seems that now the recommended starting point is 2.0 and not lower.
This commit is contained in:
Nikolaj Bjorner 2021-12-25 13:44:40 -08:00
parent 6b0dc6d144
commit 7d311ac2ef
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/mk_nuget_task.py
View file

@ -65,7 +65,7 @@ def unpack(packages, symbols):
mk_dir(f"out/runtimes/{dst}/native") mk_dir(f"out/runtimes/{dst}/native")
replace(f"{tmp}/{package_dir}/bin/libz3.{ext}", f"out/runtimes/{dst}/native/libz3.{ext}") replace(f"{tmp}/{package_dir}/bin/libz3.{ext}", f"out/runtimes/{dst}/native/libz3.{ext}")
if "x64-win" in f: if "x64-win" in f:
mk_dir("out/lib/netstandard1.4/") mk_dir("out/lib/netstandard2.0/")
if symbols: if symbols:
zip_ref.extract(f"{package_dir}/bin/libz3.pdb", f"{tmp}") 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") 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"] files += ["Microsoft.Z3.pdb", "Microsoft.Z3.xml"]
for b in files: for b in files:
zip_ref.extract(f"{package_dir}/bin/{b}", f"{tmp}") 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): def mk_targets(source_root):
mk_dir("out/build") mk_dir("out/build")
@ -107,7 +107,7 @@ Linux Dependencies:
<requireLicenseAcceptance>true</requireLicenseAcceptance> <requireLicenseAcceptance>true</requireLicenseAcceptance>
<language>en</language> <language>en</language>
<dependencies> <dependencies>
<group targetFramework=".NETStandard1.4" /> <group targetFramework=".netstandard2.0" />
</dependencies> </dependencies>
</metadata> </metadata>
</package>""".format(version, repo, branch, commit) </package>""".format(version, repo, branch, commit)

2
src/sat/smt/fpa_solver.cpp
View file

@ -269,7 +269,7 @@ namespace fpa {
expr* xe = e_x->get_expr(); expr* xe = e_x->get_expr();
expr* ye = e_y->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; return;
expr_ref xc = convert(xe); expr_ref xc = convert(xe);