Get extension version via GitVersion

jamill · Dec 9, 2016 · 8e4b6c0 · 8e4b6c0
1 parent 4da2e25
commit 8e4b6c0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/TechTalk.SpecFlow.VsIntegration.Common.Build.targets b/TechTalk.SpecFlow.VsIntegration.Common.Build.targets
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-
-	<Target Name="BeforeBuild">
-		<Copy SourceFiles="$(VisualStudioVersion).source.extension.vsixmanifest" DestinationFiles="source.extension.vsixmanifest" />
-
-		<XmlPoke Condition="'$(VersionNumber)' != ''" XmlInputPath="source.extension.vsixmanifest" Namespaces="&lt;Namespace Prefix='d' Uri='http://schemas.microsoft.com/developer/vsx-schema-design/2011' /&gt;&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/vsx-schema/2011' /&gt;" Query="//x:PackageManifest/x:Metadata/x:Identity/@Version" Value="$(VersionNumber)" />
+
+
+
+
+
+  <Target Name="BeforeBuild">
+    <CallTarget Targets="GetVersion" />
+    <CallTarget Targets="UpdateVSIXManifest" />
 	</Target>
+
+
+  <Target Name="UpdateVSIXManifest">
+    <PropertyGroup>
+      <VersionNumber>$(GitVersion_Major).$(GitVersion_Minor).$(GitVersion_Patch)</VersionNumber>
+    </PropertyGroup>
+
+
+    <Copy SourceFiles="$(VisualStudioVersion).source.extension.vsixmanifest" DestinationFiles="source.extension.vsixmanifest" />
+
+    <XmlPoke Condition="'$(VersionNumber)' != ''" XmlInputPath="source.extension.vsixmanifest" Namespaces="&lt;Namespace Prefix='d' Uri='http://schemas.microsoft.com/developer/vsx-schema-design/2011' /&gt;&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/vsx-schema/2011' /&gt;" Query="//x:PackageManifest/x:Metadata/x:Identity/@Version" Value="$(VersionNumber)" />
+  </Target>
 
 </Project>
diff --git a/TechTalk.SpecFlow.VsIntegration.Common.targets b/TechTalk.SpecFlow.VsIntegration.Common.targets
@@ -9,8 +9,4 @@
 		<VSCommonExtensionsPath Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions')">$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions</VSCommonExtensionsPath>
 	</PropertyGroup>
 
-	<PropertyGroup>
-		<VersionNumber>2017.1.1</VersionNumber>
-	</PropertyGroup>
-
 </Project>
diff --git a/VsIntegration/Guids.cs b/VsIntegration/Guids.cs
@@ -12,6 +12,8 @@ static class GuidList
         public const string guidSpecFlowPkgString = "5d978b7f-8f91-41c1-b7ba-0b4c056118e8";
         public const string guidSpecFlowCmdSetString = "8c202d78-762d-4079-ac0e-282ee24b44b0";
 
+        public const string ProductId = "30F08A29-D27E-42FF-92D3-50391313A1EF";
+
         public static readonly Guid guidSpecFlowCmdSet = new Guid(guidSpecFlowCmdSetString);
     };
 

diff --git a/VsIntegration/SpecFlowPackage.cs b/VsIntegration/SpecFlowPackage.cs
@@ -31,7 +31,7 @@ namespace TechTalk.SpecFlow.VsIntegration
     [PackageRegistration(UseManagedResourcesOnly = true)]
     // This attribute is used to register the informations needed to show the this package
     // in the Help/About dialog of Visual Studio.
-    [InstalledProductRegistration("#110", "#112", "2017.1", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", GuidList.ProductId, IconResourceID = 400)]
     [ProvideOptionPage(typeof(OptionsPageGeneral), IntegrationOptionsProvider.SPECFLOW_OPTIONS_CATEGORY, IntegrationOptionsProvider.SPECFLOW_GENERAL_OPTIONS_PAGE, 121, 122, true)]
     [ProvideProfile(typeof(OptionsPageGeneral), IntegrationOptionsProvider.SPECFLOW_OPTIONS_CATEGORY, IntegrationOptionsProvider.SPECFLOW_GENERAL_OPTIONS_PAGE, 121, 123, true, DescriptionResourceID = 121)]
     [Guid(GuidList.guidSpecFlowPkgString)]

diff --git a/VsIntegration/TechTalk.SpecFlow.VsIntegration.2013.csproj b/VsIntegration/TechTalk.SpecFlow.VsIntegration.2013.csproj
@@ -443,9 +443,10 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
   <Import Project="..\TechTalk.SpecFlow.VsIntegration.Common.Build.targets" />
   <Import Project="..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -455,5 +456,4 @@
     <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
   </Target>
-  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
 </Project>
diff --git a/VsIntegration/TechTalk.SpecFlow.VsIntegration.2015.csproj b/VsIntegration/TechTalk.SpecFlow.VsIntegration.2015.csproj
@@ -443,9 +443,10 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
   <Import Project="..\TechTalk.SpecFlow.VsIntegration.Common.Build.targets" />
   <Import Project="..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -455,5 +456,4 @@
     <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
   </Target>
-  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
 </Project>
diff --git a/VsIntegration/TechTalk.SpecFlow.VsIntegration.2017.csproj b/VsIntegration/TechTalk.SpecFlow.VsIntegration.2017.csproj
@@ -446,6 +446,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
   <Import Project="..\TechTalk.SpecFlow.VsIntegration.Common.Build.targets" />
   <Import Project="..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -455,5 +456,5 @@
     <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.214\build\MSBuildTasks.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
   </Target>
-  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
+
 </Project>