DafnyExtension: Cleaned up some references and disabled non-functional support for VS 2010.

8 files changed, 68 insertions, 136 deletions

diff --git a/Source/Dafny/DafnyPipeline.csproj b/Source/Dafny/DafnyPipeline.csproj
index 14f1c945..9e802eb1 100644
--- a/Source/Dafny/DafnyPipeline.csproj
+++ b/Source/Dafny/DafnyPipeline.csproj
@@ -34,8 +34,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>

     <UseApplicationTrust>false</UseApplicationTrust>

     <BootstrapperEnabled>true</BootstrapperEnabled>

-    <TargetFrameworkProfile>

-    </TargetFrameworkProfile>

+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>

   </PropertyGroup>

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

     <DebugSymbols>true</DebugSymbols>

@@ -142,9 +141,7 @@
     <Reference Include="System.Core">

       <RequiredTargetFramework>3.5</RequiredTargetFramework>

     </Reference>

-    <Reference Include="System.Data" />

     <Reference Include="System.Numerics" />

-    <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

     <Compile Include="Cloner.cs" />

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

   </Target>

   -->

-</Project>

+</Project>
\ No newline at end of file
diff --git a/Source/DafnyDriver/DafnyDriver.csproj b/Source/DafnyDriver/DafnyDriver.csproj
index 8fec9214..a62786fe 100644
--- a/Source/DafnyDriver/DafnyDriver.csproj
+++ b/Source/DafnyDriver/DafnyDriver.csproj
@@ -20,7 +20,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>

     <UpgradeBackupLocation />

     <IsWebBootstrapper>false</IsWebBootstrapper>

-    <TargetFrameworkProfile />

+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>

     <PublishUrl>publish\</PublishUrl>

     <Install>true</Install>

     <InstallFrom>Disk</InstallFrom>

@@ -141,8 +141,6 @@
       <HintPath>..\..\..\boogie\Binaries\Provers.SMTLib.dll</HintPath>

     </Reference>

     <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

     <Reference Include="VCGeneration">

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

     </Reference>

diff --git a/Source/DafnyDriver/app.config b/Source/DafnyDriver/app.config
index cb2586be..f76deb94 100644
--- a/Source/DafnyDriver/app.config
+++ b/Source/DafnyDriver/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>

 <configuration>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>

diff --git a/Source/DafnyExtension/DafnyExtension.csproj b/Source/DafnyExtension/DafnyExtension.csproj
index c9f08490..bd1a366f 100644
--- a/Source/DafnyExtension/DafnyExtension.csproj
+++ b/Source/DafnyExtension/DafnyExtension.csproj
@@ -127,9 +127,12 @@
     <Reference Include="Microsoft.VisualStudio.CoreUtility">

       <Private>False</Private>

     </Reference>

-    <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.Language.Intellisense, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+    </Reference>

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

+      <SpecificVersion>False</SpecificVersion>

+    </Reference>

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

     <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" />

@@ -167,12 +170,10 @@
       <HintPath>..\..\..\boogie\Binaries\Provers.SMTLib.dll</HintPath>

     </Reference>

     <Reference Include="System" />

-    <Reference Include="Microsoft.CSharp" />

-    <Reference Include="System.ComponentModel.Composition" />

+    <Reference Include="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+    </Reference>

     <Reference Include="System.Core" />

-    <Reference Include="System.Data.DataSetExtensions" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

     <Reference Include="System.Xaml" />

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

       <SpecificVersion>False</SpecificVersion>

diff --git a/Source/DafnyExtension/source.extension.vsixmanifest b/Source/DafnyExtension/source.extension.vsixmanifest
index e3e2623f..9b4feb14 100644
--- a/Source/DafnyExtension/source.extension.vsixmanifest
+++ b/Source/DafnyExtension/source.extension.vsixmanifest
@@ -7,9 +7,6 @@
     <Description xml:space="preserve">This is a language mode for using the Dafny language inside Visual Studio.</Description>

     <Locale>1033</Locale>

     <SupportedProducts>

-      <VisualStudio Version="10.0">

-        <Edition>Pro</Edition>

-      </VisualStudio>

       <VisualStudio Version="11.0">

         <Edition>Pro</Edition>

       </VisualStudio>

diff --git a/Source/DafnyMenu/DafnyMenu.csproj b/Source/DafnyMenu/DafnyMenu.csproj
index 11700ea4..6cd493c6 100644
--- a/Source/DafnyMenu/DafnyMenu.csproj
+++ b/Source/DafnyMenu/DafnyMenu.csproj
@@ -4,6 +4,7 @@
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>

     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>

     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

@@ -31,6 +32,7 @@
     <WarningLevel>4</WarningLevel>

     <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>

     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+    <Prefer32Bit>false</Prefer32Bit>

   </PropertyGroup>

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

     <DebugType>pdbonly</DebugType>

@@ -40,32 +42,23 @@
     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <RunCodeAnalysis>true</RunCodeAnalysis>

+    <Prefer32Bit>false</Prefer32Bit>

   </PropertyGroup>

   <ItemGroup>

     <Reference Include="DafnyPipeline">

       <HintPath>..\..\Binaries\DafnyPipeline.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.CSharp" />

     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />

+    <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" />

-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />

+    <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" />

     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />

-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">

-      <EmbedInteropTypes>true</EmbedInteropTypes>

-    </Reference>

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

-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />

-    <Reference Include="Microsoft.VisualStudio.Shell.11.0" />

-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />

-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />

     <Reference Include="System" />

     <Reference Include="System.Core" />

-    <Reference Include="System.Data" />

     <Reference Include="System.Design" />

-    <Reference Include="System.Drawing" />

-    <Reference Include="System.Windows.Forms" />

-    <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

     <COMReference Include="EnvDTE">

@@ -77,51 +70,6 @@
       <Isolated>False</Isolated>

       <EmbedInteropTypes>False</EmbedInteropTypes>

     </COMReference>

-    <COMReference Include="EnvDTE100">

-      <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>

-      <VersionMajor>10</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-      <EmbedInteropTypes>False</EmbedInteropTypes>

-    </COMReference>

-    <COMReference Include="EnvDTE80">

-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>

-      <VersionMajor>8</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-      <EmbedInteropTypes>False</EmbedInteropTypes>

-    </COMReference>

-    <COMReference Include="EnvDTE90">

-      <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>

-      <VersionMajor>9</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-      <EmbedInteropTypes>False</EmbedInteropTypes>

-    </COMReference>

-    <COMReference Include="Microsoft.VisualStudio.CommandBars">

-      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>

-      <VersionMajor>8</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-      <EmbedInteropTypes>False</EmbedInteropTypes>

-    </COMReference>

-    <COMReference Include="stdole">

-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>

-      <VersionMajor>2</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-      <EmbedInteropTypes>False</EmbedInteropTypes>

-    </COMReference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="Guids.cs" />

diff --git a/Source/DafnyMenu/Resources.Designer.cs b/Source/DafnyMenu/Resources.Designer.cs
index f9fefb73..d934633f 100644
--- a/Source/DafnyMenu/Resources.Designer.cs
+++ b/Source/DafnyMenu/Resources.Designer.cs
@@ -8,65 +8,56 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace DafnyLanguage.DafnyMenu

-{

-  using System;

-

-

-  /// <summary>

-  ///   A strongly-typed resource class, for looking up localized strings, etc.

-  /// </summary>

-  // This class was auto-generated by the StronglyTypedResourceBuilder

-  // class via a tool like ResGen or Visual Studio.

-  // To add or remove a member, edit your .ResX file then rerun ResGen

-  // with the /str option, or rebuild your VS project.

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  internal class Resources

-  {

-

-    private static global::System.Resources.ResourceManager resourceMan;

-

-    private static global::System.Globalization.CultureInfo resourceCulture;

-

-    [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

-    internal Resources()

-    {

-    }

-

+namespace DafnyLanguage.DafnyMenu {

+    using System;

+    

+    

     /// <summary>

-    ///   Returns the cached ResourceManager instance used by this class.

+    ///   A strongly-typed resource class, for looking up localized strings, etc.

     /// </summary>

-    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-    internal static global::System.Resources.ResourceManager ResourceManager

-    {

-      get

-      {

-        if (object.ReferenceEquals(resourceMan, null))

-        {

-          global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DafnyLanguage.DafnyMenu.Resources", typeof(Resources).Assembly);

-          resourceMan = temp;

+    // This class was auto-generated by the StronglyTypedResourceBuilder

+    // class via a tool like ResGen or Visual Studio.

+    // To add or remove a member, edit your .ResX file then rerun ResGen

+    // with the /str option, or rebuild your VS project.

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

+    internal class Resources {

+        

+        private static global::System.Resources.ResourceManager resourceMan;

+        

+        private static global::System.Globalization.CultureInfo resourceCulture;

+        

+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

+        internal Resources() {

+        }

+        

+        /// <summary>

+        ///   Returns the cached ResourceManager instance used by this class.

+        /// </summary>

+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

+        internal static global::System.Resources.ResourceManager ResourceManager {

+            get {

+                if (object.ReferenceEquals(resourceMan, null)) {

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DafnyLanguage.DafnyMenu.Resources", typeof(Resources).Assembly);

+                    resourceMan = temp;

+                }

+                return resourceMan;

+            }

+        }

+        

+        /// <summary>

+        ///   Overrides the current thread's CurrentUICulture property for all

+        ///   resource lookups using this strongly typed resource class.

+        /// </summary>

+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

+        internal static global::System.Globalization.CultureInfo Culture {

+            get {

+                return resourceCulture;

+            }

+            set {

+                resourceCulture = value;

+            }

         }

-        return resourceMan;

-      }

-    }

-

-    /// <summary>

-    ///   Overrides the current thread's CurrentUICulture property for all

-    ///   resource lookups using this strongly typed resource class.

-    /// </summary>

-    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-    internal static global::System.Globalization.CultureInfo Culture

-    {

-      get

-      {

-        return resourceCulture;

-      }

-      set

-      {

-        resourceCulture = value;

-      }

     }

-  }

 }

diff --git a/Source/DafnyMenu/source.extension.vsixmanifest b/Source/DafnyMenu/source.extension.vsixmanifest
index 08ea6bef..2e21caed 100644
--- a/Source/DafnyMenu/source.extension.vsixmanifest
+++ b/Source/DafnyMenu/source.extension.vsixmanifest
@@ -6,7 +6,7 @@
     <Description xml:space="preserve">This is a menu for interacting with Dafny.</Description>

   </Metadata>

   <Installation InstalledByMsi="false">

-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />

+    <InstallationTarget Version="[11.0,12.0)" Id="Microsoft.VisualStudio.Pro" />

   </Installation>

   <Dependencies>

     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />