Updated several project files.

Note that the 'boogie' directory is expected to be a sibling of the
'dafny' directory.

5 files changed, 55 insertions, 38 deletions

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 00000000..bdb60e95
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,13 @@
+syntax: regexp

+^Source/.*\.(user|suo|cache|vs10x)$

+^Binaries/.*\.(dll|pdb|exe|manifest|config|smt2|vsix|vsixmanifest|bpl)$

+^Source/.*\.(smt2|bpl)$

+^.*(bin|obj)/([^/]*/)?(Debug|Release|Checked|Debug All|DEBUG ALL)/.*$

+Test/.*/Output

+Test/([^/]*)/([^/]*)\.sx

+syntax: glob

+*.exe

+*.pdb

+*.dll

+*.tmp

+*.tmp.dfy

diff --git a/Source/Dafny/DafnyPipeline.csproj b/Source/Dafny/DafnyPipeline.csproj
index b4c2ae1e..14f1c945 100644
--- a/Source/Dafny/DafnyPipeline.csproj
+++ b/Source/Dafny/DafnyPipeline.csproj
@@ -129,14 +129,14 @@
   <ItemGroup>

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\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>

+      <HintPath>..\..\..\boogie\Binaries\Core.dll</HintPath>

     </Reference>

     <Reference Include="ParserHelper">

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

+      <HintPath>..\..\..\boogie\Binaries\ParserHelper.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

@@ -196,4 +196,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Source/DafnyDriver/DafnyDriver.csproj b/Source/DafnyDriver/DafnyDriver.csproj
index 52e3d827..0097058e 100644
--- a/Source/DafnyDriver/DafnyDriver.csproj
+++ b/Source/DafnyDriver/DafnyDriver.csproj
@@ -125,27 +125,27 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="AbsInt">

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

+      <HintPath>..\..\..\boogie\Binaries\AbsInt.dll</HintPath>

     </Reference>

     <Reference Include="BVD, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\..\boogie\Binaries\BVD.exe</HintPath>

     </Reference>

     <Reference Include="Core">

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

+      <HintPath>..\..\..\boogie\Binaries\Core.dll</HintPath>

     </Reference>

     <Reference Include="Provers.SMTLib">

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

+      <HintPath>..\..\..\boogie\Binaries\Provers.SMTLib.dll</HintPath>

     </Reference>

     <Reference Include="ParserHelper, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\ParserHelper.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Data" />

     <Reference Include="System.Xml" />

     <Reference Include="VCGeneration">

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

+      <HintPath>..\..\..\boogie\Binaries\VCGeneration.dll</HintPath>

     </Reference>

   </ItemGroup>

   <ItemGroup>

@@ -189,4 +189,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Source/DafnyExtension/DafnyExtension.csproj b/Source/DafnyExtension/DafnyExtension.csproj
index 92082148..3534366e 100644
--- a/Source/DafnyExtension/DafnyExtension.csproj
+++ b/Source/DafnyExtension/DafnyExtension.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>DafnyLanguage</RootNamespace>

     <AssemblyName>DafnyLanguageService</AssemblyName>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <GeneratePkgDefFile>false</GeneratePkgDefFile>

     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>

@@ -22,12 +22,14 @@
     </UpgradeBackupLocation>

     <OldToolsVersion>4.0</OldToolsVersion>

     <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>

+    <TargetFrameworkProfile>

+    </TargetFrameworkProfile>

   </PropertyGroup>

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

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\Binaries\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -63,34 +65,39 @@
     <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>

     <CodeContractsReferenceAssembly>Build</CodeContractsReferenceAssembly>

     <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>

+    <Prefer32Bit>false</Prefer32Bit>

+    <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>

+    <CopyVsixExtensionLocation>

+    </CopyVsixExtensionLocation>

   </PropertyGroup>

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

     <DebugType>pdbonly</DebugType>

     <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

+    <OutputPath>..\..\Binaries\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

+    <Prefer32Bit>false</Prefer32Bit>

   </PropertyGroup>

   <ItemGroup>

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\AbsInt.dll</HintPath>

     </Reference>

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\Basetypes.dll</HintPath>

     </Reference>

     <Reference Include="BVD">

-      <HintPath>..\..\Binaries\BVD.exe</HintPath>

+      <HintPath>..\..\..\boogie\Binaries\BVD.exe</HintPath>

     </Reference>

     <Reference Include="CodeContractsExtender, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\CodeContractsExtender.dll</HintPath>

     </Reference>

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\Core.dll</HintPath>

     </Reference>

     <Reference Include="Dafny, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <HintPath>..\..\Binaries\Dafny.exe</HintPath>

@@ -105,24 +112,23 @@
     </Reference>

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\Graph.dll</HintPath>

     </Reference>

     <Reference Include="Microsoft.VisualStudio.CoreUtility">

       <Private>False</Private>

     </Reference>

-    <Reference Include="Microsoft.VisualStudio.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

-    <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

-    <Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Editor, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-    <Reference Include="Microsoft.VisualStudio.Shell, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

-      <Private>False</Private>

-    </Reference>

+    <Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

       <EmbedInteropTypes>True</EmbedInteropTypes>

     </Reference>

     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

     <Reference Include="Microsoft.VisualStudio.Text.Data">

       <Private>False</Private>

     </Reference>

@@ -138,17 +144,17 @@
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

     <Reference Include="Model, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\Model.dll</HintPath>

     </Reference>

     <Reference Include="ParserHelper, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\ParserHelper.dll</HintPath>

     </Reference>

     <Reference Include="PresentationCore" />

     <Reference Include="PresentationFramework" />

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\Provers.SMTLib.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="Microsoft.CSharp" />

@@ -160,11 +166,11 @@
     <Reference Include="System.Xaml" />

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\VCExpr.dll</HintPath>

     </Reference>

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

       <SpecificVersion>False</SpecificVersion>

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

+      <HintPath>..\..\..\boogie\Binaries\VCGeneration.dll</HintPath>

     </Reference>

     <Reference Include="WindowsBase" />

   </ItemGroup>

@@ -187,15 +193,13 @@
   <ItemGroup>

     <Content Include="DafnyPrelude.bpl">

       <IncludeInVSIX>true</IncludeInVSIX>

-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

-    <None Include="source.extension.vsixmanifest">

-      <SubType>Designer</SubType>

-    </None>

     <Content Include="UnivBackPred2.smt2">

       <IncludeInVSIX>true</IncludeInVSIX>

-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

+    <None Include="source.extension.vsixmanifest">

+      <SubType>Designer</SubType>

+    </None>

   </ItemGroup>

   <ItemGroup>

     <WCFMetadata Include="Service References\" />

@@ -213,8 +217,8 @@
     </PostBuildEvent>

   </PropertyGroup>

   <PropertyGroup>

-    <PreBuildEvent>copy ..\..\..\..\Binaries\DafnyPrelude.bpl $(ProjectDir)

-copy ..\..\..\..\..\boogie\Binaries\UnivBackPred2.smt2 $(ProjectDir)</PreBuildEvent>

+    <PreBuildEvent>copy /y $(SolutionDir)\..\..\boogie\Binaries\UnivBackPred2.smt2 $(ProjectDir)

+copy /y $(SolutionDir)\..\Binaries\DafnyPrelude.bpl $(ProjectDir)</PreBuildEvent>

   </PropertyGroup>

   <!-- 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/Jennisys/Jennisys.fsproj b/Source/Jennisys/Jennisys.fsproj
index 2215ba83..36ce3a47 100644
--- a/Source/Jennisys/Jennisys.fsproj
+++ b/Source/Jennisys/Jennisys.fsproj
@@ -93,7 +93,7 @@
     <Reference Include="System.Numerics" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\boogie\Source\Model\Model.csproj">

+    <ProjectReference Include="..\..\..\boogie\Source\Model\Model.csproj">

       <Name>Model</Name>

       <Project>{acef88d5-dadd-46da-bae1-2144d63f4c83}</Project>

       <Private>True</Private>