From 2a396f5f529b6dbf60dd712700fa6dc53856eb23 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 11:04:00 -0500 Subject: [PATCH 1/6] Create an Unstable package with a stable version --- .../DocumentationAnalyzers.CodeFixes.csproj | 30 ++++++++++++- .../DocumentationAnalyzers.Metadata.nuspec | 43 +++++++++++++++++++ .../DocumentationAnalyzers.nuspec | 4 +- 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj index 0477142..5f5881c 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj @@ -7,7 +7,8 @@ DocumentationAnalyzers true true - DocumentationAnalyzers.nuspec + DocumentationAnalyzers.nuspec + DocumentationAnalyzers.Metadata.nuspec @@ -49,7 +50,32 @@ - configuration=$(Configuration);version=$(PackageVersion) + DotNetAnalyzers.DocumentationAnalyzers + $(BaseNuspecId) + $(BaseNuspecId) + + $(BaseNuspecId).Unstable + $(BaseNuspecId).Unstable + + $(ImplementationNuspecId) + $(MetadataNuspecId) + + $(AssemblyVersion) + $(PackageVersion) + + $(NuspecUnstableVersion) + $(NuspecStableVersion) + + $(NuspecUnstableVersion) + $(NuspecStableVersion) + + id=$(NuspecId);configuration=$(Configuration);version=$(NuspecVersion);implId=$(ImplementationNuspecId);implVersion=$(ImplementationNuspecVersion) + + + + \ No newline at end of file diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec new file mode 100644 index 0000000..756b428 --- /dev/null +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec @@ -0,0 +1,43 @@ + + + + $id$ + 0.0.0 + $id$ + Sam Harwell et. al. + Sam Harwell + https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE + https://github.com/DotNetAnalyzers/DocumentationAnalyzers + false + An implementation of .NET documentation rules using Roslyn analyzers and code fixes + https://github.com/DotNetAnalyzers/DocumentationAnalyzers/releases/$version$ + Copyright 2018 Tunnel Vision Laboratories, LLC + Documentation DotNetAnalyzers Roslyn Diagnostic Analyzer + true + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec index 273d8ff..b463137 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec @@ -1,9 +1,9 @@  - DotNetAnalyzers.DocumentationAnalyzers + $id$ 0.0.0 - DotNetAnalyzers.DocumentationAnalyzers + $id$ Sam Harwell et. al. Sam Harwell https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE From a5c4a9242df81a34d7fbd156c8defcc23341da3d Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 12:08:51 -0500 Subject: [PATCH 2/6] Remove content from the metadata package --- .../DocumentationAnalyzers.Metadata.nuspec | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec index 756b428..93ba088 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec @@ -20,24 +20,9 @@ - - - - - - - - - - - - - - - - - - + + + From 881a69474e077b4e9a7bbeaae52fb45efd1758ec Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 12:11:19 -0500 Subject: [PATCH 3/6] Link to license URI by commit ID --- .../DocumentationAnalyzers.CodeFixes.csproj | 2 +- .../DocumentationAnalyzers.Metadata.nuspec | 2 +- .../DocumentationAnalyzers.nuspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj index 5f5881c..6485caf 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.CodeFixes.csproj @@ -69,7 +69,7 @@ $(NuspecUnstableVersion) $(NuspecStableVersion) - id=$(NuspecId);configuration=$(Configuration);version=$(NuspecVersion);implId=$(ImplementationNuspecId);implVersion=$(ImplementationNuspecVersion) + id=$(NuspecId);configuration=$(Configuration);GitCommitIdShort=$(GitCommitIdShort);version=$(NuspecVersion);implId=$(ImplementationNuspecId);implVersion=$(ImplementationNuspecVersion) diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec index 93ba088..bdfc455 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.Metadata.nuspec @@ -6,7 +6,7 @@ $id$ Sam Harwell et. al. Sam Harwell - https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE + https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$GitCommitIdShort$/LICENSE https://github.com/DotNetAnalyzers/DocumentationAnalyzers false An implementation of .NET documentation rules using Roslyn analyzers and code fixes diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec index b463137..f291209 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec @@ -6,7 +6,7 @@ $id$ Sam Harwell et. al. Sam Harwell - https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$version$/LICENSE + https://raw.githubusercontent.com/DotNetAnalyzers/DocumentationAnalyzers/$GitCommitIdShort$/LICENSE https://github.com/DotNetAnalyzers/DocumentationAnalyzers false An implementation of .NET documentation rules using Roslyn analyzers and code fixes From 6c143e6e73e915bb6e8bf24ae16567fdba5b6098 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 12:11:44 -0500 Subject: [PATCH 4/6] Add license files to implementation package --- .../DocumentationAnalyzers.nuspec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec index f291209..f9be1e2 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec +++ b/DocumentationAnalyzers/DocumentationAnalyzers.CodeFixes/DocumentationAnalyzers.nuspec @@ -17,6 +17,10 @@ + + + + From 50d2edf9e4dce60b2ab2a7197d81d32311143532 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 12:12:08 -0500 Subject: [PATCH 5/6] Remove unnecessary package ID workaround --- .../DocumentationAnalyzers/DocumentationAnalyzers.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj b/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj index 24f01fc..88187be 100644 --- a/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj +++ b/DocumentationAnalyzers/DocumentationAnalyzers/DocumentationAnalyzers.csproj @@ -3,7 +3,6 @@ netstandard1.1;net452 - DocumentationAnalyzers.NewIdRequiredDueToNuGetBug From 2a06d84908d477f7576e305eb3dccea7f31d1a3a Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 18 Sep 2018 12:13:53 -0500 Subject: [PATCH 6/6] Remove build steps related to pushing NuGet packages --- build/build.ps1 | 9 --------- build/push.ps1 | 8 -------- build/version.ps1 | 1 - 3 files changed, 18 deletions(-) delete mode 100644 build/push.ps1 delete mode 100644 build/version.ps1 diff --git a/build/build.ps1 b/build/build.ps1 index 8e19767..12fb4fe 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -16,8 +16,6 @@ if (!(Test-Path $SolutionPath)) { exit 1 } -. .\version.ps1 - If ($Debug) { $BuildConfig = 'Debug' } Else { @@ -108,10 +106,3 @@ if (-not $SkipKeyCheck) { } } } - -if (-not (Test-Path 'nuget')) { - mkdir "nuget" -} - -Copy-Item "..\DocumentationAnalyzers\DocumentationAnalyzers.CodeFixes\bin\$BuildConfig\DocumentationAnalyzers.$Version.nupkg" 'nuget' -Copy-Item "..\DocumentationAnalyzers\DocumentationAnalyzers.CodeFixes\bin\$BuildConfig\DocumentationAnalyzers.$Version.symbols.nupkg" 'nuget' diff --git a/build/push.ps1 b/build/push.ps1 deleted file mode 100644 index 1f842b9..0000000 --- a/build/push.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -. .\version.ps1 - -If ($Version.EndsWith('-dev')) { - $host.ui.WriteErrorLine("Cannot push development version '$Version' to NuGet.") - Exit 1 -} - -..\.nuget\NuGet.exe 'push' ".\nuget\DocumentationAnalyzers.$Version.nupkg" -Source 'https://www.nuget.org/api/v2/package' diff --git a/build/version.ps1 b/build/version.ps1 deleted file mode 100644 index 18ab0f9..0000000 --- a/build/version.ps1 +++ /dev/null @@ -1 +0,0 @@ -$Version = "1.0.0-dev"