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

remove platformtarget for dotnetcore spec

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-03-14 12:48:27 -07:00
parent 90b78eb64a
commit 038f992ff4
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/mk_util.py
View file

@ -1889,20 +1889,12 @@ class DotNetCoreDLLComponent(Component):
key = "<AssemblyOriginatorKeyFile>%s</AssemblyOriginatorKeyFile>" % self.key_file key = "<AssemblyOriginatorKeyFile>%s</AssemblyOriginatorKeyFile>" % self.key_file
key += "\n<SignAssembly>true</SignAssembly>" key += "\n<SignAssembly>true</SignAssembly>"
if VS_X64:
platform = 'x64'
elif VS_ARM:
platform = 'ARM'
else:
platform = 'x86'
version = get_version_string(3) version = get_version_string(3)
core_csproj_str = """<Project Sdk="Microsoft.NET.Sdk"> core_csproj_str = """<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard1.4</TargetFramework> <TargetFramework>netstandard1.4</TargetFramework>
<PlatformTarget>%s</PlatformTarget>
<DefineConstants>$(DefineConstants);DOTNET_CORE</DefineConstants> <DefineConstants>$(DefineConstants);DOTNET_CORE</DefineConstants>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<AssemblyName>Microsoft.Z3</AssemblyName> <AssemblyName>Microsoft.Z3</AssemblyName>
@ -1923,7 +1915,7 @@ class DotNetCoreDLLComponent(Component):
<Compile Include="..\%s\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> <Compile Include="..\%s\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup> </ItemGroup>
</Project>""" % (platform, version, key, self.to_src_dir) </Project>""" % (version, key, self.to_src_dir)
mk_dir(os.path.join(BUILD_DIR, 'dotnet')) mk_dir(os.path.join(BUILD_DIR, 'dotnet'))
csproj = os.path.join('dotnet', 'z3.csproj') csproj = os.path.join('dotnet', 'z3.csproj')

2
src/smt/theory_lra.cpp
View file

@ -1517,7 +1517,7 @@ public:
} }
final_check_status final_check_eh() { final_check_status final_check_eh() {
IF_VERBOSE(2, verbose_stream() << "final-check " << m_solver->get_status() << "\n"); IF_VERBOSE(12, verbose_stream() << "final-check " << m_solver->get_status() << "\n");
m_use_nra_model = false; m_use_nra_model = false;
lbool is_sat = l_true; lbool is_sat = l_true;
if (m_solver->get_status() != lp::lp_status::OPTIMAL) { if (m_solver->get_status() != lp::lp_status::OPTIMAL) {