Boogie: Committing changed references

9 files changed, 37 insertions, 33 deletions

diff --git a/Source/AbsInt/AbsInt.csproj b/Source/AbsInt/AbsInt.csproj
index 0b5ffba5..9bfe22fa 100644
--- a/Source/AbsInt/AbsInt.csproj
+++ b/Source/AbsInt/AbsInt.csproj
@@ -81,7 +81,6 @@
   </ItemGroup>

   <ItemGroup>

     <Compile Include="AbstractInterpretation.cs" />

-    <Compile Include="cce.cs" />

     <Compile Include="ExprFactories.cs" />

     <Compile Include="LoopInvariantsOnDemand.cs" />

     <Compile Include="Traverse.cs" />

@@ -96,8 +95,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

   </ItemGroup>

diff --git a/Source/Boogie.sln b/Source/Boogie.sln
index bb127224..96e1337b 100644
--- a/Source/Boogie.sln
+++ b/Source/Boogie.sln
@@ -7,8 +7,6 @@ Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "AIFramework", "AIFramework\
 EndProject

 Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "Basetypes", "Basetypes\Basetypes.sscproj", "{0C692837-77EC-415F-BF04-395E3ED06E9A}"

 EndProject

-Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "Core", "Core\Core.sscproj", "{47BC34F1-A173-40BE-84C2-9332B4418387}"

-EndProject

 Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "Graph", "Graph\Graph.sscproj", "{4C28FB90-630E-4B55-A937-11A011B79765}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BoogieDriver", "BoogieDriver\BoogieDriver.csproj", "{DAB6BAA4-7AF7-449F-96AB-F58F34D03A7A}"

@@ -27,8 +25,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VCGeneration", "VCGeneratio
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VCExpr", "VCExpr\VCExpr.csproj", "{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}"

 EndProject

+<<<<<<< .mine

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{B230A69C-C466-4065-B9C1-84D80E76D802}"

+EndProject

+=======

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z3api", "Provers\Z3api\Z3api.csproj", "{966DD87B-A29D-4F3C-9406-F680A61DC0E0}"

 EndProject

+>>>>>>> .r56635

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|.NET = Debug|.NET

@@ -59,16 +62,6 @@ Global
 		{0C692837-77EC-415F-BF04-395E3ED06E9A}.Release|Any CPU.ActiveCfg = Release|.NET

 		{0C692837-77EC-415F-BF04-395E3ED06E9A}.Release|Mixed Platforms.ActiveCfg = Release|.NET

 		{0C692837-77EC-415F-BF04-395E3ED06E9A}.Release|Mixed Platforms.Build.0 = Release|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Debug|.NET.ActiveCfg = Debug|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Debug|.NET.Build.0 = Debug|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Debug|Any CPU.ActiveCfg = Debug|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Debug|Mixed Platforms.Build.0 = Debug|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Release|.NET.ActiveCfg = Release|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Release|.NET.Build.0 = Release|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Release|Any CPU.ActiveCfg = Release|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Release|Mixed Platforms.ActiveCfg = Release|.NET

-		{47BC34F1-A173-40BE-84C2-9332B4418387}.Release|Mixed Platforms.Build.0 = Release|.NET

 		{4C28FB90-630E-4B55-A937-11A011B79765}.Debug|.NET.ActiveCfg = Debug|.NET

 		{4C28FB90-630E-4B55-A937-11A011B79765}.Debug|.NET.Build.0 = Debug|.NET

 		{4C28FB90-630E-4B55-A937-11A011B79765}.Debug|Any CPU.ActiveCfg = Debug|.NET

@@ -166,6 +159,18 @@ Global
 		{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}.Release|Any CPU.Build.0 = Release|Any CPU

 		{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

 		{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+<<<<<<< .mine

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|.NET.ActiveCfg = Debug|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|.NET.ActiveCfg = Release|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Any CPU.Build.0 = Release|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

+		{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+=======

 		{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|.NET.ActiveCfg = Debug|Any CPU

 		{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU

@@ -176,6 +181,7 @@ Global
 		{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Any CPU.Build.0 = Release|Any CPU

 		{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

 		{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+>>>>>>> .r56635

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/Source/BoogieDriver/BoogieDriver.csproj b/Source/BoogieDriver/BoogieDriver.csproj
index 6842c3fa..51cb7f2f 100644
--- a/Source/BoogieDriver/BoogieDriver.csproj
+++ b/Source/BoogieDriver/BoogieDriver.csproj
@@ -87,7 +87,6 @@
   <ItemGroup>

     <Compile Include="BoogieDriver.cs" />

     <Compile Include="..\version.cs" />

-    <Compile Include="cce.cs" />

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\AbsInt\AbsInt.csproj">

@@ -102,8 +101,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

     <ProjectReference Include="..\Graph\Graph.sscproj">

diff --git a/Source/Provers/Isabelle/Isabelle.csproj b/Source/Provers/Isabelle/Isabelle.csproj
index 06cdb145..6bc98823 100644
--- a/Source/Provers/Isabelle/Isabelle.csproj
+++ b/Source/Provers/Isabelle/Isabelle.csproj
@@ -81,8 +81,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

     <ProjectReference Include="..\..\VCExpr\VCExpr.csproj">

diff --git a/Source/Provers/SMTLib/SMTLib.csproj b/Source/Provers/SMTLib/SMTLib.csproj
index 5e8e8b46..344c247f 100644
--- a/Source/Provers/SMTLib/SMTLib.csproj
+++ b/Source/Provers/SMTLib/SMTLib.csproj
@@ -93,8 +93,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

     <ProjectReference Include="..\..\VCExpr\VCExpr.csproj">

diff --git a/Source/Provers/Simplify/Simplify.csproj b/Source/Provers/Simplify/Simplify.csproj
index 60f582ec..693167a3 100644
--- a/Source/Provers/Simplify/Simplify.csproj
+++ b/Source/Provers/Simplify/Simplify.csproj
@@ -45,7 +45,8 @@
     </CodeContractsCustomRewriterClass>

     <CodeContractsLibPaths>

     </CodeContractsLibPaths>

-    <CodeContractsExtraRewriteOptions>/ignore:CC1002</CodeContractsExtraRewriteOptions>

+    <CodeContractsExtraRewriteOptions>

+    </CodeContractsExtraRewriteOptions>

     <CodeContractsExtraAnalysisOptions>

     </CodeContractsExtraAnalysisOptions>

     <CodeContractsBaseLineFile>

@@ -86,8 +87,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

     <ProjectReference Include="..\..\Graph\Graph.sscproj">

diff --git a/Source/Provers/Z3/Z3.csproj b/Source/Provers/Z3/Z3.csproj
index cc84ec98..919ee5cf 100644
--- a/Source/Provers/Z3/Z3.csproj
+++ b/Source/Provers/Z3/Z3.csproj
@@ -91,8 +91,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

     <ProjectReference Include="..\..\VCExpr\VCExpr.csproj">

diff --git a/Source/VCExpr/VCExpr.csproj b/Source/VCExpr/VCExpr.csproj
index 841ed396..fdb303d3 100644
--- a/Source/VCExpr/VCExpr.csproj
+++ b/Source/VCExpr/VCExpr.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>VCExpr</AssemblyName>

     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>

+    <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>

     <SignAssembly>true</SignAssembly>

     <AssemblyOriginatorKeyFile>..\InterimKey.snk</AssemblyOriginatorKeyFile>

   </PropertyGroup>

@@ -75,7 +75,6 @@
   <ItemGroup>

     <Compile Include="BigLiteralAbstracter.cs" />

     <Compile Include="Boogie2VCExpr.cs" />

-    <Compile Include="cce.cs" />

     <Compile Include="Clustering.cs" />

     <Compile Include="LetBindingSorter.cs" />

     <Compile Include="NameClashResolver.cs" />

@@ -97,8 +96,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

   </ItemGroup>

diff --git a/Source/VCGeneration/VCGeneration.csproj b/Source/VCGeneration/VCGeneration.csproj
index 9b85b59a..4f652a5d 100644
--- a/Source/VCGeneration/VCGeneration.csproj
+++ b/Source/VCGeneration/VCGeneration.csproj
@@ -97,8 +97,8 @@
       <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

       <Name>Basetypes</Name>

     </ProjectReference>

-    <ProjectReference Include="..\Core\Core.sscproj">

-      <Project>{47BC34F1-A173-40BE-84C2-9332B4418387}</Project>

+    <ProjectReference Include="..\Core\Core.csproj">

+      <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>

       <Name>Core</Name>

     </ProjectReference>

     <ProjectReference Include="..\Graph\Graph.sscproj">