From 50bfe9b902c3da8e30d67032cf7e554b78a1260e Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 08:07:04 -0500 Subject: [PATCH 1/6] Update to Nerdbank.GitVersioning --- DocumentationAnalyzers/Directory.Build.props | 8 ++++---- .../DocumentationAnalyzers.CodeFixes.csproj | 11 ++++++++++- DocumentationAnalyzers/version.json | 7 +++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 DocumentationAnalyzers/version.json diff --git a/DocumentationAnalyzers/Directory.Build.props b/DocumentationAnalyzers/Directory.Build.props index a55a400..e1782d0 100644 --- a/DocumentationAnalyzers/Directory.Build.props +++ b/DocumentationAnalyzers/Directory.Build.props @@ -7,10 +7,6 @@ Tunnel Vision Laboratories, LLC Copyright © Tunnel Vision Laboratories, LLC 2018 en-US - - 1.0.0.0 - 1.0.0.0 - 1.0.0-dev @@ -41,6 +37,10 @@ $(NoWarn),1573,1591,1712 + + + + diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj index 1b116af..0477142 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj @@ -8,7 +8,11 @@ true true DocumentationAnalyzers.nuspec - configuration=$(Configuration);version=$(InformationalVersion) + + + + + $(NoWarn),NU5105 @@ -43,4 +47,9 @@ + + + configuration=$(Configuration);version=$(PackageVersion) + + \ No newline at end of file diff --git a/DocumentationAnalyzers/version.json b/DocumentationAnalyzers/version.json new file mode 100644 index 0000000..4768b86 --- /dev/null +++ b/DocumentationAnalyzers/version.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.0-beta.{height}", + "nugetPackageVersion": { + "semVer": 2 + } +} From 51dd2db92b821dbb12c862ba660df719abe5eb7c Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 08:10:17 -0500 Subject: [PATCH 2/6] Use precise assembly versions See Microsoft/vs-threading#279 --- DocumentationAnalyzers/version.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DocumentationAnalyzers/version.json b/DocumentationAnalyzers/version.json index 4768b86..eba97de 100644 --- a/DocumentationAnalyzers/version.json +++ b/DocumentationAnalyzers/version.json @@ -1,6 +1,9 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "1.0-beta.{height}", + "assemblyVersion": { + "precision": "revision" + }, "nugetPackageVersion": { "semVer": 2 } From f41d8b3c27ef3c7e1a7049ef0c4da944e1d43b4c Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 08:16:38 -0500 Subject: [PATCH 3/6] Override the build number provided by the CI --- DocumentationAnalyzers/version.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DocumentationAnalyzers/version.json b/DocumentationAnalyzers/version.json index eba97de..c83242a 100644 --- a/DocumentationAnalyzers/version.json +++ b/DocumentationAnalyzers/version.json @@ -6,5 +6,10 @@ }, "nugetPackageVersion": { "semVer": 2 + }, + "cloudBuild": { + "buildNumber": { + "enabled": true + } } } From 5ce4cff30e5dd8bbd7735c993a4c02bde13cf9a7 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 08:36:17 -0500 Subject: [PATCH 4/6] Avoid major.minor confusion in CI build numbers --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9e6b27d..535e1c2 100644 --- 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 From 098167a57575838483e07df649629ce8f888a354 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 08:36:46 -0500 Subject: [PATCH 5/6] Set publicReleaseRefSpec --- DocumentationAnalyzers/version.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DocumentationAnalyzers/version.json b/DocumentationAnalyzers/version.json index c83242a..e99b25f 100644 --- a/DocumentationAnalyzers/version.json +++ b/DocumentationAnalyzers/version.json @@ -4,6 +4,9 @@ "assemblyVersion": { "precision": "revision" }, + "publicReleaseRefSpec": [ + "^refs/heads/master$" + ], "nugetPackageVersion": { "semVer": 2 }, From 27e3cced9a2ea33c6fad1d9610794f466ee07728 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 08:48:33 -0500 Subject: [PATCH 6/6] Update the NuGet package ID to include a DotNetAnalyzers prefix --- .../DocumentationAnalyzers.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec index b902d6d..273d8ff 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec @@ -1,9 +1,9 @@  - DocumentationAnalyzers + DotNetAnalyzers.DocumentationAnalyzers 0.0.0 - DocumentationAnalyzers + DotNetAnalyzers.DocumentationAnalyzers Sam Harwell et. al. Sam Harwell https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE