Merge branch 'master' into feature/add_support_for_emitting_vars_in_w…

…ix_format

src/GitVersionCore/GitVersionCore.csproj

@@ -25,12 +25,6 @@
     <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Net.Requests" Version="4.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="AssemblyFileVersioningScheme.cs" />
     <Compile Include="AssemblyVersioningScheme.cs" />
@@ -151,6 +145,18 @@
     <Compile Include="BuildServers\TravisCI.cs" />
     <Compile Include="WixVersionFileUpdater.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Net.Requests" Version="4.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="GitVersionInformationResources\AddFormats\**\*.*" />
+    <Compile Remove="GitVersionInformationResources\Templates\**\*.*" />
+    <Compile Remove="VersionAssemblyInfoResources\AddFormats\**\*.*" />
+    <Compile Remove="VersionAssemblyInfoResources\Templates\**\*.*" />
+  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="GitVersionInformationResources\AddFormats\**\*.*" />

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -39,8 +39,6 @@
     <Compile Include="PullRequestInTeamCityTest.cs" />
     <Compile Include="UpdateWixVersionFileTests.cs" />
     <Compile Include="VersionWriterTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>

src/GitVersionExe/HelpWriter.cs

@@ -54,7 +54,9 @@ Specify name of AssemblyInfo file. Can also /updateAssemblyInfo GlobalAssemblyIn
                    All the GitVersion variables are written to 'GitVersion_WixVersion.wxi'.
                    The variables can then be referenced in other WiX project files for versioning.
 
-    # Remote repository args
+
+
+# Remote repository args
     /url            Url to remote git repository.
     /b              Name of the branch to use on the remote repository, must be used in combination with /url.
     /u              Username in case authentication is required.