DafnyExtension: Use the same version number as Dafny (unfortunately needs to be updated separately in the vsixmanifests).

6 files changed, 6 insertions, 30 deletions

diff --git a/Source/DafnyExtension/DafnyExtension.csproj b/Source/DafnyExtension/DafnyExtension.csproj
index 31e344a1..bad5f4c2 100644
--- a/Source/DafnyExtension/DafnyExtension.csproj
+++ b/Source/DafnyExtension/DafnyExtension.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

   <PropertyGroup>

     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>

@@ -157,6 +157,7 @@
     <Compile Include="TokenTagger.cs" />

     <Compile Include="ClassificationTagger.cs" />

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

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

   </ItemGroup>

   <ItemGroup>

     <Content Include="DafnyPrelude.bpl">

@@ -199,4 +200,4 @@ copy /y "..\Binaries\DafnyRuntime.cs" "$(ProjectDir)"</PreBuildEvent>
   <Target Name="AfterBuild">

   </Target>

   -->

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

diff --git a/Source/DafnyExtension/Properties/AssemblyInfo.cs b/Source/DafnyExtension/Properties/AssemblyInfo.cs
index a9922c2f..02da8a8a 100644
--- a/Source/DafnyExtension/Properties/AssemblyInfo.cs
+++ b/Source/DafnyExtension/Properties/AssemblyInfo.cs
@@ -17,16 +17,3 @@ using System.Runtime.InteropServices;
 // to COM components.  If you need to access a type in this assembly from 

 // COM, set the ComVisible attribute to true on that type.

 [assembly: ComVisible(false)]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/Source/DafnyExtension/source.extension.vsixmanifest b/Source/DafnyExtension/source.extension.vsixmanifest
index 9fda1773..5654b6cd 100644
--- a/Source/DafnyExtension/source.extension.vsixmanifest
+++ b/Source/DafnyExtension/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">

   <Metadata>

-    <Identity Id="6c7ed99a-206a-4937-9e08-b389de175f68" Version="1.0" Language="en-US" Publisher="Microsoft Research" />

+    <Identity Id="6c7ed99a-206a-4937-9e08-b389de175f68" Version="1.6.3.00320" Language="en-US" Publisher="Microsoft Research" />

     <DisplayName>DafnyLanguageMode</DisplayName>

     <Description xml:space="preserve">This is a language mode for using the Dafny language inside Visual Studio.</Description>

   </Metadata>

diff --git a/Source/DafnyMenu/DafnyMenu.csproj b/Source/DafnyMenu/DafnyMenu.csproj
index 7e9fb302..a7679e04 100644
--- a/Source/DafnyMenu/DafnyMenu.csproj
+++ b/Source/DafnyMenu/DafnyMenu.csproj
@@ -106,6 +106,7 @@
     <Compile Include="GlobalSuppressions.cs" />

     <Compile Include="DafnyMenuPackage.cs" />

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

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

     <Compile Include="PkgCmdID.cs" />

   </ItemGroup>

   <ItemGroup>

diff --git a/Source/DafnyMenu/Properties/AssemblyInfo.cs b/Source/DafnyMenu/Properties/AssemblyInfo.cs
index b1a5687d..9ceb8360 100644
--- a/Source/DafnyMenu/Properties/AssemblyInfo.cs
+++ b/Source/DafnyMenu/Properties/AssemblyInfo.cs
@@ -17,16 +17,3 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]     

 [assembly: CLSCompliant(false)]

 [assembly: NeutralResourcesLanguage("en-US")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/Source/DafnyMenu/source.extension.vsixmanifest b/Source/DafnyMenu/source.extension.vsixmanifest
index 2e21caed..3ddc722c 100644
--- a/Source/DafnyMenu/source.extension.vsixmanifest
+++ b/Source/DafnyMenu/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">

   <Metadata>

-    <Identity Id="e1baf989-88a6-4acf-8d97-e0dc243476aa" Version="1.0" Language="en-US" Publisher="Microsoft Research" />

+    <Identity Id="e1baf989-88a6-4acf-8d97-e0dc243476aa" Version="1.6.3.00320" Language="en-US" Publisher="Microsoft Research" />

     <DisplayName>DafnyMenu</DisplayName>

     <Description xml:space="preserve">This is a menu for interacting with Dafny.</Description>

   </Metadata>