Merge remote-tracking branch 'origin/master' into BuildNumberFromVersionJson

Author: AArnott

appveyor.yml

@@ -1,4 +1,4 @@
-version: 99.0.{build}
+version: '{build}'
 skip_tags: true
 os: Visual Studio 2017
 configuration: Release
@@ -22,6 +22,10 @@ before_build:
 build_script:
 - ps: >-
     .\build.ps1
+test:
+  assemblies:
+    only:
+    - NerdBank.GitVersioning.Tests.dll
 artifacts:
 - path: bin\**\*.nupkg
 - path: bin\js\*.tgz

doc/nuget-acquisition.md

@@ -7,12 +7,16 @@ NuGet Package Manager GUI, or the NuGet Package Manager Console:
 Install-Package Nerdbank-GitVersioning
 ```
 
+If in a project that uses PackageReference for this package reference, you should manually add
+`PrivateAssets="all"` to the PackageReference xml element to workaround
+[this issue](https://github.com/AArnott/Nerdbank.GitVersioning/issues/122).
+
 After installing this NuGet package, you may need to configure the version generation logic
 in order for it to work properly.
 
-With NuGet 2.x, the configuration is handled automatically via the tools\Install.ps1 script.
-For NuGet 3.x, you can run the script tools\Create-VersionFile.ps1 to help you create the
-version.json file and remove the old assembly attributes.
+When using packagse.config, the configuration is handled automatically via the tools\Install.ps1 script.
+When using project.json or PackageReference, you can run the script tools\Create-VersionFile.ps1 to help
+you create the version.json file and remove the old assembly attributes.
 
 The scripts will look for the presence of a version.json or version.txt file.
 If one already exists, nothing happens. If the version file does not exist,
@@ -35,14 +39,19 @@ source code, as commonly found in your `Properties\AssemblyInfo.cs` file:
 [assembly: AssemblyInformationalVersion("1.0.0-dev")]
 ```
 
+If you are using the new VS 2017 .NET Core/Standard projects (or otherwise using the .NET SDK project type)
+you won't see these attributes in your AssemblyInfo.cs file but you may still get compiler errors
+due to duplicate attributes. In that case, a Rebuild of your project should resolve
+[the issue](https://github.com/AArnott/Nerdbank.GitVersioning/issues/121).
+
 This NuGet package creates these attributes at build time based on version information
 found in your `version.json` file and your git repo's HEAD position.
 
 When the package is installed, a version.json file is created in your project directory
-(for NuGet 2.x clients). This ensures backwards compatibility where the installation of
+(for packages.config clients). This ensures backwards compatibility where the installation of
 this package will not cause the assembly version of the project to change. If you would
 like the same version number to be applied to all projects in the repo, then you may move
-the file to the root directory of your git repo.
+the version.json file to the root directory of your git repo.
 
 Note: After first installing the package, you need to commit the version file so that
 it will be picked up during the build's version generation. If you build prior to committing,

src/Directory.Build.props

@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
   </PropertyGroup>

src/NerdBank.GitVersioning.Tests/App.config

@@ -1,11 +1,3 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Validation" publicKeyToken="2fc06f0d701809a7" culture="neutral" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="2.3.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

@@ -1,6 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <DebugType>full</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\Nerdbank.GitVersioning.NuGet\build\*.targets">
@@ -21,11 +24,14 @@
     <PackageReference Include="7z.NET" Version="1.0.3" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="2.0.11" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
-    <PackageReference Include="Microsoft.Build" Version="14.3" Condition=" '$(TargetFramework)' == 'net45' " />
+    <PackageReference Include="Microsoft.Build" Version="14.3" Condition=" '$(TargetFramework)' == 'net452' " />
     <PackageReference Include="Xunit.Combinatorial" Version="1.1.12" />
-    <PackageReference Include="xunit" Version="2.1.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.1.1" />
     <PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.1.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 </Project>

src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DebugType Condition=" '$(Configuration)' == 'debug' ">Full</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp" Version="0.24.7-g9fca61fdda" />

src/Nerdbank.GitVersioning.NuGet/Nerdbank.GitVersioning.NuGet.nuproj

@@ -55,9 +55,14 @@
       <NoneToContentPort Include="@(None)" Condition=" '%(None.CopyToOutputDirectory)' == 'PreserveNewest' " />
       <None Remove="@(NoneToContentPort)" />
       <Content Include="@(NoneToContentPort)">
-        <Link>build\%(NoneToContentPort.Link)</Link>
+        <Link>build\MSBuildFull\%(NoneToContentPort.Link)</Link>
         <CopyToOutputDirectory />
-        <PackageDirectory>build</PackageDirectory>
+        <PackageDirectory>build\MSBuildFull</PackageDirectory>
+      </Content>
+      <Content Include="@(NoneToContentPort)">
+        <Link>build\MSBuildCore\%(NoneToContentPort.Link)</Link>
+        <CopyToOutputDirectory />
+        <PackageDirectory>build\MSBuildCore</PackageDirectory>
       </Content>
     </ItemGroup>
   </Target>
@@ -104,7 +109,8 @@
     <ItemGroup>
       <PackageFile Remove="@(PackageFile)" Condition="
          $([System.String]::new('%(TargetPath)').StartsWith('build\')) and
-        !$([System.String]::new('%(TargetPath)').StartsWith('build\lib\')) and
+        !$([System.String]::new('%(TargetPath)').StartsWith('build\MSBuildFull\lib\')) and
+        !$([System.String]::new('%(TargetPath)').StartsWith('build\MSBuildCore\lib\')) and
         '%(FileName)' != 'NerdBank.GitVersioning' and
         '%(FileName)' != 'NerdBank.GitVersioning.Tasks' and
         '%(FileName)' != 'MSBuildExtensionTask' and

src/Nerdbank.GitVersioning.NuGet/build/Nerdbank.GitVersioning.targets

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <VersionSourceFile>$(IntermediateOutputPath)\$(AssemblyName).Version$(DefaultLanguageSourceExtension)</VersionSourceFile>
 
     <PrepareResourcesDependsOn>
@@ -140,7 +141,7 @@
                   AssemblyConfiguration="$(Configuration)"
                   EmitNonVersionCustomAttributes="$(NBGV_EmitNonVersionCustomAttributes)"
                   />
-    <!-- Avoid applying the newly generated AssemblyVersionInfo.cs file to the build 
+    <!-- Avoid applying the newly generated AssemblyVersionInfo.cs file to the build
          unless it has changed in order to allow for incremental building. -->
     <Nerdbank.GitVersioning.Tasks.CompareFiles OriginalItems="$(VersionSourceFile)" NewItems="$(NewVersionSourceFile)">
       <Output TaskParameter="AreChanged" PropertyName="AssemblyVersionInfoChanged" />

src/Nerdbank.GitVersioning.NuGet/tools/Get-CommitId.ps1

@@ -27,7 +27,7 @@ $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Valid
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\NerdBank.GitVersioning.dll"))
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\LibGit2Sharp.dll"))
 $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Newtonsoft.Json.dll"))
-[Nerdbank.GitVersioning.GitExtensions]::HelpFindLibGit2NativeBinaries("$DependencyBasePath\..")
+[Nerdbank.GitVersioning.GitExtensions]::HelpFindLibGit2NativeBinaries($DependencyBasePath)
 
 $ProjectDirectory = (Resolve-Path $ProjectDirectory).ProviderPath
 $GitPath = $ProjectDirectory

src/Nerdbank.GitVersioning.NuGet/tools/Get-Version.ps1

@@ -19,7 +19,7 @@ $null = [Reflection.Assembly]::LoadFile((Resolve-Path "$DependencyBasePath\Newto
 $ProjectDirectory = (Resolve-Path $ProjectDirectory).ProviderPath
 
 try {
-    [Nerdbank.GitVersioning.GitExtensions]::HelpFindLibGit2NativeBinaries("$DependencyBasePath\..")
+    [Nerdbank.GitVersioning.GitExtensions]::HelpFindLibGit2NativeBinaries($DependencyBasePath)
     $CloudBuild = [Nerdbank.GitVersioning.CloudBuild]::Active
     $VersionOracle = [Nerdbank.GitVersioning.VersionOracle]::Create($ProjectDirectory, $null, $CloudBuild)
     $VersionOracle