Merge remote-tracking branch 'origin/v2.3' into v3.0

Author: AArnott

src/nbgv/Program.cs

@@ -288,6 +288,13 @@ private static ExitCodes OnGetVersionCommand(string projectPath, string format,
             }
 
             var oracle = new VersionOracle(searchPath, repository, commit, CloudBuild.Active);
+
+            // Take the PublicRelease environment variable into account, since the build would as well.
+            if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("PublicRelease")) && bool.TryParse(Environment.GetEnvironmentVariable("PublicRelease"), out bool publicRelease))
+            {
+                oracle.PublicRelease = publicRelease;
+            }
+
             if (string.IsNullOrEmpty(singleVariable))
             {
                 switch (format.ToLowerInvariant())
@@ -576,7 +583,7 @@ private static ExitCodes OnPrepareReleaseCommand(string projectPath, string prer
             }
 
             // nextVersion and versionIncrement parameters cannot be combined
-            if(!string.IsNullOrEmpty(nextVersion) && !string.IsNullOrEmpty(versionIncrement))
+            if (!string.IsNullOrEmpty(nextVersion) && !string.IsNullOrEmpty(versionIncrement))
             {
                 Console.Error.WriteLine("Options 'nextVersion' and 'versionIncrement' cannot be used at the same time.");
                 return ExitCodes.InvalidParameters;
@@ -586,7 +593,7 @@ private static ExitCodes OnPrepareReleaseCommand(string projectPath, string prer
             VersionOptions.ReleaseVersionIncrement? versionIncrementParsed = default;
             if (!string.IsNullOrEmpty(versionIncrement))
             {
-                if(!Enum.TryParse< VersionOptions.ReleaseVersionIncrement>(versionIncrement, true, out var parsed))
+                if (!Enum.TryParse<VersionOptions.ReleaseVersionIncrement>(versionIncrement, true, out var parsed))
                 {
                     Console.Error.WriteLine($"\"{versionIncrement}\" is not a valid version increment");
                     return ExitCodes.InvalidVersionIncrement;