Merge pull request #589 from Particular/DowngradeGitVersionTask

Downgrade git version task

src/ServiceInsight.Tests/ServiceInsight.Tests.csproj

@@ -165,5 +165,8 @@
       <Name>ServiceInsight</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/ServiceInsight/GlobalSuppressions.cs

@@ -4,4 +4,7 @@
 // a specific target and scoped to a namespace, type, member, etc.
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1508:Closing braces must not be preceded by blank line", Justification = "Generated File", Scope = "type", Target = "~T:GitVersionInformation")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1516:Elements must be separated by blank line", Justification = "Generated File", Scope = "member", Target = "~P:ReleaseDateAttribute.Date")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1518:Code must not contain blank lines at end of file", Justification = "Generated File", Scope = "type", Target = "~T:GitVersionInformation")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1516:Elements must be separated by blank line", Justification = "Generated File", Scope = "member", Target = "~P:ReleaseDateAttribute.Date")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1517:CodeMustNotContainBlankLinesAtStartOfFile", Justification = "Generated File. Bring back when updated to GitVersionTask v3.x")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1518:CodeMustNotContainBlankLinesAtEndOfFile", Justification = "Generated File. Bring back when updated to GitVersionTask v3.x")]

src/ServiceInsight/ServiceInsight.csproj

@@ -830,10 +830,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\PropertyChanged.Fody.1.50.3\build\dotnet\PropertyChanged.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.1.50.3\build\dotnet\PropertyChanged.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets'))" />
     <Error Condition="!Exists('..\packages\Particular.CodeRules.0.1.1\build\Particular.CodeRules.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Particular.CodeRules.0.1.1\build\Particular.CodeRules.props'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets'))" />
   </Target>
   <Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
   <Import Project="..\packages\PropertyChanged.Fody.1.50.3\build\dotnet\PropertyChanged.Fody.targets" Condition="Exists('..\packages\PropertyChanged.Fody.1.50.3\build\dotnet\PropertyChanged.Fody.targets')" />
-  <Import Project="..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets')" />
+  <Import Project="..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets')" />
 </Project>

src/ServiceInsight/packages.config

@@ -9,7 +9,7 @@
   <package id="Comparers" version="4.0.0" targetFramework="net45" />
   <package id="EmptyConstructor.Fody" version="1.1.1.0" targetFramework="net45" />
   <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
-  <package id="GitVersionTask" version="3.5.4" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="gong-wpf-dragdrop" version="0.1.4.1" targetFramework="net45" />
   <package id="Humanizer" version="1.34.0" targetFramework="net45" />
   <package id="Mindscape.Raygun4Net" version="5.0.0" targetFramework="net45" />

src/Setup/Setup.csproj

@@ -63,17 +63,17 @@
     <Copy SourceFiles="res\ServiceInsights.ico" DestinationFolder="$(IntermediateOutputPath)res\" />
     <Exec Command="$(AdvancedInstallerExe) /edit $(IntermediateOutputPath)ServiceInsight.aip /NewPathVariable -name PROJECT_PATH -value $(SolutionDir)Setup -valuetype Folder" />
     <Exec Command="$(AdvancedInstallerExe) /edit $(IntermediateOutputPath)ServiceInsight.aip /NewPathVariable -name SI_PATH -value $(SolutionDir)ServiceInsight\bin\$(Configuration) -valuetype Folder" />
-    <Exec Command="$(AdvancedInstallerExe) /edit $(IntermediateOutputPath)ServiceInsight.aip /SetVersion $(GitVersion_MajorMinorPatch)" />
-    <Exec Command="$(AdvancedInstallerExe) /edit $(IntermediateOutputPath)ServiceInsight.aip /SetPackageName ServiceInsight-$(GitVersion_MajorMinorPatch).exe -buildname DefaultBuild" />
+    <Exec Command="$(AdvancedInstallerExe) /edit $(IntermediateOutputPath)ServiceInsight.aip /SetVersion $(GfvMajorMinorPatch)" />
+    <Exec Command="$(AdvancedInstallerExe) /edit $(IntermediateOutputPath)ServiceInsight.aip /SetPackageName ServiceInsight-$(GfvMajorMinorPatch).exe -buildname DefaultBuild" />
     <Exec Command="$(AdvancedInstallerExe) /rebuild $(IntermediateOutputPath)ServiceInsight.aip" />
-    <Copy SourceFiles="$(IntermediateOutputPath)bin\ServiceInsight-$(GitVersion_MajorMinorPatch).exe" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="$(IntermediateOutputPath)bin\ServiceInsight-$(GfvMajorMinorPatch).exe" DestinationFolder="$(OutputPath)" />
   </Target>
-  <Import Project="..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets')" />
+  <Import Project="..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\build\GitVersionTask.targets'))" />
   </Target>
   <!-- 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.

src/Setup/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.5.4" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
 </packages>