Merge pull request #37 from sharwell/versioning

sharwell · web-flow · commit c67c66cf81c1 · 2018-09-18T08:55:36.000-05:00
Update to Nerdbank.GitVersioning
diff --git a/DocumentationAnalyzers/Directory.Build.props b/DocumentationAnalyzers/Directory.Build.props
@@ -7,10 +7,6 @@
     <Company>Tunnel Vision Laboratories, LLC</Company>
     <Copyright>Copyright © Tunnel Vision Laboratories, LLC 2018</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-
-    <Version>1.0.0.0</Version>
-    <FileVersion>1.0.0.0</FileVersion>
-    <InformationalVersion>1.0.0-dev</InformationalVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -41,6 +37,10 @@
     <NoWarn>$(NoWarn),1573,1591,1712</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta009" PrivateAssets="all" />
diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj
@@ -8,7 +8,11 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IncludeSymbols>true</IncludeSymbols>
     <NuspecFile>DocumentationAnalyzers.nuspec</NuspecFile>
-    <NuspecProperties>configuration=$(Configuration);version=$(InformationalVersion)</NuspecProperties>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- This package intentionally uses SemVer 2. -->
+    <NoWarn>$(NoWarn),NU5105</NoWarn>
   </PropertyGroup>
 
   <Choose>
@@ -43,4 +47,9 @@
     <ProjectReference Include="..\DocumentationAnalyzers\DocumentationAnalyzers.csproj" />
   </ItemGroup>
 
+  <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
+    <PropertyGroup>
+      <NuspecProperties>configuration=$(Configuration);version=$(PackageVersion)</NuspecProperties>
+    </PropertyGroup>
+  </Target>
 </Project>
diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec
@@ -1,9 +1,9 @@
 ﻿<?xml version="1.0"?>
 <package>
   <metadata minClientVersion="2.7">
-    <id>DocumentationAnalyzers</id>
+    <id>DotNetAnalyzers.DocumentationAnalyzers</id>
     <version>0.0.0</version>
-    <title>DocumentationAnalyzers</title>
+    <title>DotNetAnalyzers.DocumentationAnalyzers</title>
     <authors>Sam Harwell et. al.</authors>
     <owners>Sam Harwell</owners>
     <licenseUrl>https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE</licenseUrl>
diff --git a/DocumentationAnalyzers/version.json b/DocumentationAnalyzers/version.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "1.0-beta.{height}",
+  "assemblyVersion": {
+    "precision": "revision"
+  },
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$"
+  ],
+  "nugetPackageVersion": {
+    "semVer": 2
+  },
+  "cloudBuild": {
+    "buildNumber": {
+      "enabled": true
+    }
+  }
+}
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.{build}
+version: '{build}'
 image: Visual Studio 2017
 init:
 - git config --global core.autocrlf true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: 1.0.{build}`
	`1`	`+version: '{build}'`
`2`	`2`	`image: Visual Studio 2017`
`3`	`3`	`init:`
`4`	`4`	`- git config --global core.autocrlf true`