Merge pull request #370 from AArnott/v2.3

Merge v2.3 to master
dotnet · Aug 4, 2019 · 97c6586 · 97c6586
2 parents 4263dc9 + 2c00141
commit 97c6586
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,6 +10,7 @@ variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   BuildConfiguration: Release
   BuildPlatform: Any CPU
+  NuGet.ForceNuGetForPush: true # Workaround for public feed limitation in NuGetCommand task - remove after July 15, 2019.
 
 resources:
   containers:
@@ -120,6 +121,15 @@ jobs:
       ArtifactType: Container
     displayName: Publish build_logs artifacts
     condition: succeededOrFailed()
+  - task: NuGetCommand@2
+    displayName: Pushing package to PublicCI feed
+    inputs:
+      command: push
+      packagesToPush: $(Build.ArtifactStagingDirectory)/deployables/*.*nupkg
+      nuGetFeedType: internal
+      publishVstsFeed: 6ed146e5-8e9c-46d6-a40f-da9367ed50cd/c20edbb7-8403-4456-8f43-f46b47e360b1
+      allowPackageConflicts: true
+    condition: and(succeeded(), ne(variables['System.PullRequest.IsFork'], 'true'))
 
 - job: Ubuntu_Xenial
   dependsOn: Windows

diff --git a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
     <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0007" PrivateAssets="none" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netcoreapp2.0' " />
     <PackageReference Include="Validation" Version="2.4.18" />
     <PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />

diff --git a/src/NerdBank.GitVersioning/VersionOptions.cs b/src/NerdBank.GitVersioning/VersionOptions.cs
@@ -7,7 +7,6 @@
     using System.Reflection;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
-    using Newtonsoft.Json.Serialization;
     using Validation;
 
     /// <summary>
@@ -307,7 +306,7 @@ public static JsonSerializerSettings GetJsonSettings(bool includeDefaults = fals
                     new VersionConverter(),
                     new SemanticVersionJsonConverter(),
                     new AssemblyVersionOptionsConverter(includeDefaults),
-                    new StringEnumConverter() { NamingStrategy = new CamelCaseNamingStrategy() },
+                    new StringEnumConverter() { CamelCaseText = true },
                 },
                 ContractResolver = new VersionOptionsContractResolver
                 {

diff --git a/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs b/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs
@@ -541,8 +541,10 @@ internal override void StartThisAssemblyClass()
             {
                 this.codeBuilder.AppendLine($"#If {CompilerDefinesAroundGeneratedCodeAttribute.Replace("||", " Or ")} Then");
                 this.codeBuilder.AppendLine($"<System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>");
-                this.codeBuilder.AppendLine("#End If");
                 this.codeBuilder.AppendLine("Partial Friend NotInheritable Class ThisAssembly");
+                this.codeBuilder.AppendLine("#Else");
+                this.codeBuilder.AppendLine("Partial Friend NotInheritable Class ThisAssembly");
+                this.codeBuilder.AppendLine("#End If");
             }
 
             internal override void AddThisAssemblyMember(string name, string value)