Ticked version to 1.0.0 and fixed some reference issues that caused s…

…ome TFS assemblies to be included in VSIX
jakobehn · Jan 19, 2016 · 5b08355 · 5b08355
1 parent f1329a2
commit 5b08355
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/GitFlow.VS.Extension/Properties/AssemblyInfo.cs b/GitFlow.VS.Extension/Properties/AssemblyInfo.cs
@@ -29,8 +29,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.10.13.0")]
-[assembly: AssemblyFileVersion("0.10.13.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
 
 
 
diff --git a/GitFlow.VS.Extension/source.extension.2013.vsixmanifest b/GitFlow.VS.Extension/source.extension.2013.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="19ffe08d-8c71-4125-a024-6296bd27fce8" Version="0.10.13.0" Language="en-US" Publisher="Jakob Ehn" />
+    <Identity Id="19ffe08d-8c71-4125-a024-6296bd27fce8" Version="1.0.0.0" Language="en-US" Publisher="Jakob Ehn" />
     <DisplayName>GitFlow for Visual Studio</DisplayName>
     <Description xml:space="preserve">Integrates GitFlow in Visual Studio Team Explorer 2013. Requires VS 2013 Update 3 or higher</Description>
     <MoreInfo>https://github.com/jakobehn/GitFlow.VS</MoreInfo>

diff --git a/GitFlow.VS.Extension/source.extension.2015.vsixmanifest b/GitFlow.VS.Extension/source.extension.2015.vsixmanifest
@@ -1,6 +1,6 @@
 <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="3CD51F76-D7A1-4745-B750-D966C228A85C" Version="0.10.13.0" Language="en-US" Publisher="Jakob Ehn" />
+    <Identity Id="3CD51F76-D7A1-4745-B750-D966C228A85C" Version="1.0.0.0" Language="en-US" Publisher="Jakob Ehn" />
     <DisplayName>GitFlow for Visual Studio 2015</DisplayName>
     <Description xml:space="preserve">Integrates GitFlow in Visual Studio Team Explorer 2015</Description>
     <MoreInfo>https://github.com/jakobehn/GitFlow.VS</MoreInfo>

diff --git a/GitFlow.VS/Properties/AssemblyInfo.cs b/GitFlow.VS/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.10.13.0")]
-[assembly: AssemblyFileVersion("0.10.13.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TeamExplorer.Common/Properties/AssemblyInfo.cs b/TeamExplorer.Common/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.10.13.0")]
-[assembly: AssemblyFileVersion("0.10.13.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TeamExplorer.Common/TeamExplorer.Common.csproj b/TeamExplorer.Common/TeamExplorer.Common.csproj
@@ -62,9 +62,15 @@
   <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='VS2013'">
-    <Reference Include="Microsoft.TeamFoundation.Client, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.TeamFoundation.Controls, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-  <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.TeamFoundation.Client, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.TeamFoundation.Controls, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>