Package updates.

Author: StephenMolloy

src/packages/ConfigurationBuilders.Base.nupkg/shared/tools/Net471/KeyValueConfigBuildersCommon.ps1

@@ -32,7 +32,8 @@ $keyValueCommonParameters = @(
 		[ParameterDescription]@{ Name="mode"; IsRequired=$false },
 		[ParameterDescription]@{ Name="prefix"; IsRequired=$false },
 		[ParameterDescription]@{ Name="stripPrefix"; IsRequired=$false },
-		[ParameterDescription]@{ Name="tokenPattern"; IsRequired=$false });
+		[ParameterDescription]@{ Name="tokenPattern"; IsRequired=$false },
+		[ParameterDescription]@{ Name="optional"; IsRequired=$false });
 
 
 function CommonInstall($builderDescription) {

src/packages/ConfigurationBuilders.Json.nupkg/tools/Net471/Install.ps1

@@ -13,8 +13,7 @@ $jsonConfigBuilder = [BuilderDescription]@{
 	DefaultName="SimpleJson";
 	AllowedParameters=@( $keyValueCommonParameters +
 		[ParameterDescription]@{ Name="jsonFile"; IsRequired=$true; DefaultValue="~/App_Data/settings.json" },
-		[ParameterDescription]@{ Name="jsonMode"; IsRequired=$false },
-		[ParameterDescription]@{ Name="optional"; IsRequired=$false });
+		[ParameterDescription]@{ Name="jsonMode"; IsRequired=$false });
 }
 
 CommonInstall $jsonConfigBuilder

src/packages/ConfigurationBuilders.KeyPerFile.nupkg/tools/Net471/Install.ps1

@@ -14,8 +14,7 @@ $keyPerFileConfigBuilder = [BuilderDescription]@{
 	AllowedParameters=@( $keyValueCommonParameters +
 		[ParameterDescription]@{ Name="directoryPath"; IsRequired=$true; DefaultValue="[PathToSourceDirectory]" },
 		[ParameterDescription]@{ Name="keyDelimiter"; IsRequired=$false },
-		[ParameterDescription]@{ Name="ignorePrefix"; IsRequired=$false },
-		[ParameterDescription]@{ Name="optional"; IsRequired=$false });
+		[ParameterDescription]@{ Name="ignorePrefix"; IsRequired=$false });
 }
 
 CommonInstall $keyPerFileConfigBuilder

src/packages/ConfigurationBuilders.UserSecrets.nupkg/tools/Net471/Install.ps1

@@ -14,8 +14,7 @@ $secretsConfigBuilder = [BuilderDescription]@{
 	DefaultName="Secrets";
 	AllowedParameters=@( $keyValueCommonParameters +
 		[ParameterDescription]@{ Name="userSecretsId"; IsRequired=$false; DefaultValue=$userSecretsId },
-		[ParameterDescription]@{ Name="userSecretsFile"; IsRequired=$false },
-		[ParameterDescription]@{ Name="optional"; IsRequired=$false });
+		[ParameterDescription]@{ Name="userSecretsFile"; IsRequired=$false });
 }
 
 CommonInstall $secretsConfigBuilder

tools/MicrosoftConfigurationBuilders.settings.targets

@@ -24,21 +24,23 @@
          Update package and file without touching assembly, except for major releases.
     -->
     <BuildQuality Condition="'$(BuildQuality)' == ''">preview</BuildQuality>
+    <VersionStartYear Condition="'$(VersionStartYear)' == ''">2019</VersionStartYear>
     <VersionMajor>2</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionRevision>0</VersionRevision>
     <VersionRelease>0</VersionRelease>
-    <VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
-    <VersionStartYear Condition="'$(VersionStartYear)' == ''">2019</VersionStartYear>
+    <VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet package dependencies">
     <NuGetPackageVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)</NuGetPackageVersion>
     <NuGetPackageBaseDependencyVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)</NuGetPackageBaseDependencyVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
-    <NuGetPackageVersion Condition="'$(UpdateNightlyPackages)' == 'true'">$(NuGetPackageVersion)-b$(VersionBuild)</NuGetPackageVersion>
+  <PropertyGroup Label="Prerelease version adjustments" Condition="'$(BuildQuality)' != 'rtm'">
+    <VersionRelease>$(VersionRelease)-$(BuildQuality)</VersionRelease>
+    <NuGetPackageVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)$(VersionBuild)</NuGetPackageVersion>
+    <NuGetPackageBaseDependencyVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)$(VersionBuild)</NuGetPackageBaseDependencyVersion>
   </PropertyGroup>
 
   <!-- Default properties -->