Fixed project files to point to references correctly and also to remove assembly signing information from AssemblyInfo.cs files (which since that was the only thing in BoogieDriver's assembly info, deleted that file). Now signing information is specified in the project files.

4 files changed, 59 insertions, 53 deletions

diff --git a/Source/BoogieDriver/BoogieDriver.csproj b/Source/BoogieDriver/BoogieDriver.csproj
index f323f58f..4b45892b 100644
--- a/Source/BoogieDriver/BoogieDriver.csproj
+++ b/Source/BoogieDriver/BoogieDriver.csproj
@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>

+    <SignAssembly>true</SignAssembly>

+    <AssemblyOriginatorKeyFile>InterimKey.snk</AssemblyOriginatorKeyFile>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -22,7 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking>

+    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>

     <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>

     <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>

     <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>

@@ -61,47 +63,11 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="AbsInt, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\AbsInt.dll</HintPath>

-    </Reference>

-    <Reference Include="AIFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\AIFramework.dll</HintPath>

-    </Reference>

-    <Reference Include="Basetypes, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Basetypes.dll</HintPath>

-    </Reference>

-    <Reference Include="Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Core.dll</HintPath>

-    </Reference>

-    <Reference Include="Graph, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Graph.dll</HintPath>

-    </Reference>

     <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL" />

     <Reference Include="Microsoft.SpecSharp, Version=1.0.21125.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\..\Binaries\Microsoft.SpecSharp.dll</HintPath>

     </Reference>

-    <Reference Include="Provers.Isabelle, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Provers.Isabelle.dll</HintPath>

-    </Reference>

-    <Reference Include="Provers.Simplify, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Provers.Simplify.dll</HintPath>

-    </Reference>

-    <Reference Include="Provers.SMTLib, Version=0.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Provers.SMTLib.dll</HintPath>

-    </Reference>

-    <Reference Include="Provers.Z3, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\Provers.Z3.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Compiler, Version=1.0.21125.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

@@ -117,20 +83,61 @@
     </Reference>

     <Reference Include="System.Data" />

     <Reference Include="System.Xml" />

-    <Reference Include="VCExpr, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\VCExpr.dll</HintPath>

-    </Reference>

-    <Reference Include="VCGeneration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\..\Binaries\VCGeneration.dll</HintPath>

-    </Reference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="BoogieDriver.cs" />

   </ItemGroup>

   <ItemGroup>

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

+    <ProjectReference Include="..\AbsInt\AbsInt.sscproj">

+      <Project>{11D06232-2039-4BCA-853B-C596E2A4EDB0}</Project>

+      <Name>AbsInt</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\AIFramework\AIFramework.sscproj">

+      <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>

+      <Name>AIFramework</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Basetypes\Basetypes.sscproj">

+      <Project>{0C692837-77EC-415F-BF04-395E3ED06E9A}</Project>

+      <Name>Basetypes</Name>

+    </ProjectReference>

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

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

+      <Name>Core</Name>

+    </ProjectReference>

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

+      <Project>{4C28FB90-630E-4B55-A937-11A011B79765}</Project>

+      <Name>Graph</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Provers\Isabelle\Isabelle.csproj">

+      <Project>{435D5BD0-6F62-49F8-BB24-33E2257519AD}</Project>

+      <Name>Isabelle</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Provers\Simplify\Simplify.sscproj">

+      <Project>{F75666DE-FB56-457C-8782-09BE243450FC}</Project>

+      <Name>Simplify</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Provers\SMTLib\SMTLib.sscproj">

+      <Project>{13C3A68C-462A-4CDA-A480-738046E37C5A}</Project>

+      <Name>SMTLib</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Provers\Z3\Z3.sscproj">

+      <Project>{F75666DE-CD56-457C-8782-09BE243450FC}</Project>

+      <Name>Z3</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\VCExpr\VCExpr.sscproj">

+      <Project>{CF42B700-10AA-4DA9-8992-48A800251C11}</Project>

+      <Name>VCExpr</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\VCGeneration\VCGeneration.sscproj">

+      <Project>{F65666DE-FB56-457C-8782-09BE243450FC}</Project>

+      <Name>VCGeneration</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="InterimKey.snk" />

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="Properties\" />

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Source/BoogieDriver/Properties/AssemblyInfo.cs b/Source/BoogieDriver/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6ed99a25..00000000
--- a/Source/BoogieDriver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-

-[assembly: AssemblyKeyFile("..\\InterimKey.snk")]

diff --git a/Source/Provers/Isabelle/Isabelle.csproj b/Source/Provers/Isabelle/Isabelle.csproj
index 7fd88a87..049f5dd5 100644
--- a/Source/Provers/Isabelle/Isabelle.csproj
+++ b/Source/Provers/Isabelle/Isabelle.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>Provers.Isabelle</AssemblyName>

     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <SignAssembly>true</SignAssembly>

+    <AssemblyOriginatorKeyFile>InterimKey.snk</AssemblyOriginatorKeyFile>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -65,6 +67,9 @@
   <ItemGroup>

     <Compile Include="Prover.cs" />

   </ItemGroup>

+  <ItemGroup>

+    <None Include="InterimKey.snk" />

+  </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Source/Provers/Isabelle/Properties/AssemblyInfo.cs b/Source/Provers/Isabelle/Properties/AssemblyInfo.cs
index ac99974f..20b53d3b 100644
--- a/Source/Provers/Isabelle/Properties/AssemblyInfo.cs
+++ b/Source/Provers/Isabelle/Properties/AssemblyInfo.cs
@@ -3,8 +3,6 @@
 using System.Reflection;

 using System.Runtime.CompilerServices;

 

-[assembly: AssemblyKeyFile("..\\..\\InterimKey.snk")]

-

 [assembly: AssemblyTitle("Boogie back-end for Isabelle")]

 [assembly: AssemblyDescription("Boogie back-end for the interactive"

   + " theorem prover Isabelle")]