cleanup: build scripts and targets

Author: natemcmaster

CommandLineUtils.sln.DotSettings

@@ -1,15 +1,10 @@
 <Project>
 
-  <Import Project="version.props" />
-
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-
     <Authors>Nate McMaster</Authors>
     <Product>CommandLineUtils</Product>
     <Copyright>Copyright © Nate McMaster</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/natemcmaster/CommandLineUtils</PackageProjectUrl>
     <RepositoryUrl>https://github.com/natemcmaster/CommandLineUtils.git</RepositoryUrl>
@@ -24,9 +19,7 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>
     <LangVersion>8.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <!-- Some previews of .NET Core 3 don't have the rename yet -->
-    <NullableContextOptions>enable</NullableContextOptions>
+    <Nullable>annotations</Nullable>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)src\StrongName.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <AzureKeyVaultUrl>https://nmcmaster.vault.azure.net</AzureKeyVaultUrl>
@@ -40,6 +33,19 @@
     <BaseOutputPath>$(MSBuildThisFileDirectory).build\bin\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 
+   <PropertyGroup>
+    <VersionPrefix>2.4.0</VersionPrefix>
+    <VersionSuffix>rc</VersionSuffix>
+    <IncludePreReleaseLabelInPackageVersion Condition="'$(IsStableBuild)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
+    <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(BUILD_NUMBER)</BuildNumber>
+    <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
+    <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
+    <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">$(BUILD_SOURCEVERSION)</RepositoryCommit>
+    <PackageVersion>$(VersionPrefix)</PackageVersion>
+    <PackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">$(PackageVersion)-$(VersionSuffix)</PackageVersion>
+    <InformationalVersion Condition="'$(RepositoryCommit)' != ''">$(PackageVersion)+$(RepositoryCommit)</InformationalVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- For x-plat development. Workaround for https://github.com/dotnet/sdk/issues/335 -->
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="all" />

Directory.Build.props

@@ -1,9 +1,5 @@
-<Project>
+<Project InitialTargets="UpdateCiSettings">
   <Target Name="UpdateCiSettings" Condition="'$(CI)' == 'true' AND '$(OS)' == 'Windows_NT' AND '$(IsPackable)' == 'true'">
     <Message Importance="High" Text="##vso[build.updatebuildnumber]$(PackageVersion)" />
-    <!-- These tags can be used in Azure release pipelines to filter actions based on the type of build. -->
-    <Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(IsStableBuild)' != 'true' AND '$(BUILD_REASON)' != 'PullRequest' " />
-    <Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(IsStableBuild)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest' " />
-    <Message Importance="high" Text="##vso[build.addbuildtag]code-signed" Condition=" '$(CodeSign)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest' " />
   </Target>
 </Project>

Directory.Build.targets

@@ -3,12 +3,11 @@ CommandLineUtils
 
 [![Build Status](https://dev.azure.com/natemcmaster/github/_apis/build/status/CommandLineUtils?branchName=master)](https://dev.azure.com/natemcmaster/github/_build/latest?definitionId=3&branchName=master)
 
-[![NuGet][main-nuget-badge]][main-nuget] [![MyGet][main-myget-badge]][main-myget]
+[![NuGet][nuget-badge] ![NuGet Downloads][nuget-download-badge]][nuget]
 
-[main-nuget]: https://www.nuget.org/packages/McMaster.Extensions.CommandLineUtils/
-[main-nuget-badge]: https://img.shields.io/nuget/v/McMaster.Extensions.CommandLineUtils.svg?style=flat-square&label=nuget
-[main-myget]: https://www.myget.org/feed/natemcmaster/package/nuget/McMaster.Extensions.CommandLineUtils
-[main-myget-badge]: https://img.shields.io/www.myget/natemcmaster/vpre/McMaster.Extensions.CommandLineUtils.svg?style=flat-square&label=myget
+[nuget]: https://www.nuget.org/packages/McMaster.Extensions.CommandLineUtils/
+[nuget-badge]: https://img.shields.io/nuget/v/McMaster.Extensions.CommandLineUtils.svg?style=flat-square
+[nuget-download-badge]: https://img.shields.io/nuget/dt/McMaster.Extensions.CommandLineUtils?style=flat-square
 
 
 This is a fork of [Microsoft.Extensions.CommandLineUtils](https://github.com/aspnet/Common), which is no longer under [active development](https://github.com/aspnet/Common/issues/257). This fork, on the other hand, will continue to make improvements, release updates and take contributions.
@@ -17,7 +16,7 @@ The roadmap for this project can be found [here](https://github.com/natemcmaster
 
 ## Install
 
-Install the [NuGet package][main-nuget] into your project.
+Install the [NuGet package][nuget] into your project.
 
 ```
 PM> Install-Package McMaster.Extensions.CommandLineUtils
@@ -26,8 +25,6 @@ PM> Install-Package McMaster.Extensions.CommandLineUtils
 $ dotnet add package McMaster.Extensions.CommandLineUtils
 ```
 
-Pre-release builds and symbols: https://www.myget.org/gallery/natemcmaster/
-
 ## Usage
 
 See [documentation](https://natemcmaster.github.io/CommandLineUtils/) for API reference, samples, and tutorials.

NuGet.config

@@ -49,9 +49,7 @@ if ($CodeSign) {
 $artifacts = "$PSScriptRoot/artifacts/"
 
 Remove-Item -Recurse $artifacts -ErrorAction Ignore
-if ($ci) {
-    exec dotnet msbuild /t:UpdateCiSettings @MSBuildArgs
-}
+
 exec dotnet build --configuration $Configuration '-warnaserror:CS1591' @MSBuildArgs
 exec dotnet pack --no-restore --no-build --configuration $Configuration -o $artifacts @MSBuildArgs
 exec dotnet build --configuration $Configuration "$PSScriptRoot/docs/samples/samples.sln"

README.md

@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <CodeSignCacheFile>$(IntermediateOutputPath)$(TargetFileName).codesign.cache</CodeSignCacheFile>
     <PackageSignCacheFile>$(IntermediateOutputPath)$(PackageId)$(PackageVersion).packagesign.cache</PackageSignCacheFile>
   </PropertyGroup>

build.cmd

@@ -25,7 +25,6 @@ McMaster.Extensions.CommandLineUtils.ArgumentEscaper
  A community-maintained fork of Microsoft.Extensions.CommandLineUtils, plus many enhancements.
     </PackageDescription>
     <PackageTags>commandline;parsing</PackageTags>
-    <WarningsNotAsErrors>8602;8603;8604;$(WarningsNotAsErrors)</WarningsNotAsErrors>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">