Updates of various .sln and .*proj files

5 files changed, 26 insertions, 23 deletions

diff --git a/Source/DafnyExtension/DafnyExtension.csproj b/Source/DafnyExtension/DafnyExtension.csproj
index 2580c396..d65c511b 100644
--- a/Source/DafnyExtension/DafnyExtension.csproj
+++ b/Source/DafnyExtension/DafnyExtension.csproj
@@ -178,8 +178,8 @@
     </PostBuildEvent>

   </PropertyGroup>

   <PropertyGroup>

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

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

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

+copy ..\..\..\..\..\boogie\Binaries\UnivBackPred2.smt2 $(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/InterimKey.snk b/Source/InterimKey.snk
new file mode 100644
index 00000000..8fc79508
--- /dev/null
+++ b/Source/InterimKey.snk
diff --git a/Source/Jennisys.sln b/Source/Jennisys.sln
index 3f213e27..539d6971 100644
--- a/Source/Jennisys.sln
+++ b/Source/Jennisys.sln
@@ -1,12 +1,12 @@
 

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2012

 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Jennisys", "Jennisys\Jennisys.fsproj", "{F2FF4B3A-2FE8-474A-88DF-6950F7D78908}"

 	ProjectSection(ProjectDependencies) = postProject

 		{ACEF88D5-DADD-46DA-BAE1-2144D63F4C83} = {ACEF88D5-DADD-46DA-BAE1-2144D63F4C83}

 	EndProjectSection

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "..\Source\Model\Model.csproj", "{ACEF88D5-DADD-46DA-BAE1-2144D63F4C83}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "..\..\boogie\Source\Model\Model.csproj", "{ACEF88D5-DADD-46DA-BAE1-2144D63F4C83}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Source/Jennisys/Jennisys.fsproj b/Source/Jennisys/Jennisys.fsproj
index d3493749..2215ba83 100644
--- a/Source/Jennisys/Jennisys.fsproj
+++ b/Source/Jennisys/Jennisys.fsproj
@@ -36,7 +36,12 @@
     <PlatformTarget>x86</PlatformTarget>

     <DocumentationFile>bin\Release\Language.XML</DocumentationFile>

   </PropertyGroup>

-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" />

+  <PropertyGroup>

+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>

+  </PropertyGroup>

+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />

+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />

+  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />

   <Import Project="$(MSBuildExtensionsPath32)\..\FSharpPowerPack-2.0.0.0\bin\FSharp.PowerPack.targets" />

   <PropertyGroup>

     <FsLexOutputFolder>$(IntermediateOutputPath)</FsLexOutputFolder>

@@ -80,34 +85,20 @@
     <Compile Include="Jennisys.fs" />

   </ItemGroup>

   <ItemGroup>

-    <Reference Include="Boogie">

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

-    </Reference>

-    <Reference Include="FSharp.PowerPack">

-      <HintPath>C:\Program Files\FSharpPowerPack-1.9.9.9\bin\FSharp.PowerPack.dll</HintPath>

-    </Reference>

+    <Reference Include="FSharp.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+    <Reference Include="FSharp.PowerPack, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a19089b1c74d0809" />

     <Reference Include="mscorlib" />

-    <Reference Include="FSharp.Core" />

     <Reference Include="System" />

     <Reference Include="System.Core" />

     <Reference Include="System.Numerics" />

   </ItemGroup>

   <ItemGroup>

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

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

       <Name>Model</Name>

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

       <Private>True</Private>

     </ProjectReference>

   </ItemGroup>

-  <!--

-  <ItemGroup>

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

-      <Name>Model</Name>

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

-      <Private>True</Private>

-    </ProjectReference>

-  </ItemGroup>

-  -->

   <!-- 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.

   <Target Name="BeforeBuild">

diff --git a/Source/version.cs b/Source/version.cs
new file mode 100644
index 00000000..fd211b1c
--- /dev/null
+++ b/Source/version.cs
@@ -0,0 +1,12 @@
+// ==++==

+// 

+//   

+// 

+// ==--==

+// Warning: Automatically generated file. DO NOT EDIT

+// Generated at Dienstag, 5. Juli 2011 11:26:45

+

+using System.Reflection;

+[assembly: AssemblyVersion("2.2.30705.1126")]

+[assembly: AssemblyFileVersion("2.2.30705.1126")]

+