using c#8 switch expressions

src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs

@@ -45,15 +45,12 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
 
         private static string GetGVCommand(ProjectVisibility visibility)
         {
-            switch (visibility)
+            return visibility switch
             {
-                case ProjectVisibility.Public:
-                    return "  - ps: gitversion /l console /output buildserver /updateAssemblyInfo";
-                case ProjectVisibility.Private:
-                    return "  - ps: gitversion $env:APPVEYOR_BUILD_FOLDER /l console /output buildserver /updateAssemblyInfo /nofetch /b $env:APPVEYOR_REPO_BRANCH";
-                default:
-                    return "";
-            }
+                ProjectVisibility.Public => "  - ps: gitversion /l console /output buildserver /updateAssemblyInfo",
+                ProjectVisibility.Private => "  - ps: gitversion $env:APPVEYOR_BUILD_FOLDER /l console /output buildserver /updateAssemblyInfo /nofetch /b $env:APPVEYOR_REPO_BRANCH",
+                _ => ""
+            };
         }
 
         private void GenerateBasicConfig(string workingDirectory)

src/GitVersionCore/Extensions/AssemblyVersionsGenerator.cs

@@ -9,42 +9,30 @@ public static string GetAssemblyVersion(
             this SemanticVersion sv,
             AssemblyVersioningScheme scheme)
         {
-            switch (scheme)
+            return scheme switch
             {
-                case AssemblyVersioningScheme.Major:
-                    return $"{sv.Major}.0.0.0";
-                case AssemblyVersioningScheme.MajorMinor:
-                    return $"{sv.Major}.{sv.Minor}.0.0";
-                case AssemblyVersioningScheme.MajorMinorPatch:
-                    return $"{sv.Major}.{sv.Minor}.{sv.Patch}.0";
-                case AssemblyVersioningScheme.MajorMinorPatchTag:
-                    return $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag.Number ?? 0}";
-                case AssemblyVersioningScheme.None:
-                    return null;
-                default:
-                    throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme));
-            }
+                AssemblyVersioningScheme.Major => $"{sv.Major}.0.0.0",
+                AssemblyVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
+                AssemblyVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
+                AssemblyVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag.Number ?? 0}",
+                AssemblyVersioningScheme.None => null,
+                _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
+            };
         }
 
         public static string GetAssemblyFileVersion(
         this SemanticVersion sv,
         AssemblyFileVersioningScheme scheme)
         {
-            switch (scheme)
+            return scheme switch
             {
-                case AssemblyFileVersioningScheme.Major:
-                    return $"{sv.Major}.0.0.0";
-                case AssemblyFileVersioningScheme.MajorMinor:
-                    return $"{sv.Major}.{sv.Minor}.0.0";
-                case AssemblyFileVersioningScheme.MajorMinorPatch:
-                    return $"{sv.Major}.{sv.Minor}.{sv.Patch}.0";
-                case AssemblyFileVersioningScheme.MajorMinorPatchTag:
-                    return $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag.Number ?? 0}";
-                case AssemblyFileVersioningScheme.None:
-                    return null;
-                default:
-                    throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme));
-            }
+                AssemblyFileVersioningScheme.Major => $"{sv.Major}.0.0.0",
+                AssemblyFileVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
+                AssemblyFileVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
+                AssemblyFileVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag.Number ?? 0}",
+                AssemblyFileVersioningScheme.None => null,
+                _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
+            };
         }
     }
 }

src/GitVersionCore/IncrementStrategy.cs

@@ -21,19 +21,14 @@ public static class IncrementStrategyExtensions
     {
         public static VersionField ToVersionField(this IncrementStrategy strategy)
         {
-            switch (strategy)
+            return strategy switch
             {
-                case IncrementStrategy.None:
-                    return VersionField.None;
-                case IncrementStrategy.Major:
-                    return VersionField.Major;
-                case IncrementStrategy.Minor:
-                    return VersionField.Minor;
-                case IncrementStrategy.Patch:
-                    return VersionField.Patch;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(strategy), strategy, null);
-            }
+                IncrementStrategy.None => VersionField.None,
+                IncrementStrategy.Major => VersionField.Major,
+                IncrementStrategy.Minor => VersionField.Minor,
+                IncrementStrategy.Patch => VersionField.Patch,
+                _ => throw new ArgumentOutOfRangeException(nameof(strategy), strategy, null)
+            };
         }
     }
 }

src/GitVersionCore/SemanticVersioning/SemanticVersionBuildMetaData.cs

@@ -104,19 +104,14 @@ public string ToString(string format, IFormatProvider formatProvider = null)
 
                 return CommitsSinceTag != null ? CommitsSinceTag.Value.ToString("D" + padding) : string.Empty; 
             }
-            
-            switch (format.ToLower())
+
+            return format.ToLower() switch
             {
-                case "b":
-                    return CommitsSinceTag.ToString();
-                case "s":
-                    return $"{CommitsSinceTag}{(string.IsNullOrEmpty(Sha) ? null : ".Sha." + Sha)}".TrimStart('.');
-                case "f":
-                    return $"{CommitsSinceTag}{(string.IsNullOrEmpty(Branch) ? null : ".Branch." + FormatMetaDataPart(Branch))}{(string.IsNullOrEmpty(Sha) ? null : ".Sha." + Sha)}{(string.IsNullOrEmpty(OtherMetaData) ? null : "." + FormatMetaDataPart(OtherMetaData))}"
-                        .TrimStart('.');
-                default:
-                    throw new ArgumentException("Unrecognised format", nameof(format));
-            }
+                "b" => CommitsSinceTag.ToString(),
+                "s" => $"{CommitsSinceTag}{(string.IsNullOrEmpty(Sha) ? null : ".Sha." + Sha)}".TrimStart('.'),
+                "f" => $"{CommitsSinceTag}{(string.IsNullOrEmpty(Branch) ? null : ".Branch." + FormatMetaDataPart(Branch))}{(string.IsNullOrEmpty(Sha) ? null : ".Sha." + Sha)}{(string.IsNullOrEmpty(OtherMetaData) ? null : "." + FormatMetaDataPart(OtherMetaData))}".TrimStart('.'),
+                _ => throw new ArgumentException("Unrecognised format", nameof(format))
+            };
         }
 
         public static bool operator ==(SemanticVersionBuildMetaData left, SemanticVersionBuildMetaData right)

src/GitVersionCore/SemanticVersioning/SemanticVersionPreReleaseTag.cs

@@ -166,16 +166,12 @@ public string ToString(string format, IFormatProvider formatProvider = null)
                 return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString("D" + padding)) : FormatLegacy(GetLegacyName());
             }
 
-
-            switch (format)
+            return format switch
             {
-                case "t":
-                    return Number.HasValue ? $"{Name}.{Number}" : Name;
-                case "l":
-                    return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName());
-                default:
-                    throw new ArgumentException("Unknown format", nameof(format));
-            }
+                "t" => (Number.HasValue ? $"{Name}.{Number}" : Name),
+                "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
+                _ => throw new ArgumentException("Unknown format", nameof(format))
+            };
         }
 
         private string FormatLegacy(string tag, string number = "")

src/GitVersionCore/VersioningModes/VersioningModeExtension.cs

@@ -1,20 +1,17 @@
-using System;
+using System;
 
 namespace GitVersion.VersioningModes
 {
     public static class VersioningModeExtension
     {
         public static VersioningModeBase GetInstance(this VersioningMode _this)
         {
-            switch (_this)
+            return _this switch
             {
-                case VersioningMode.ContinuousDelivery:
-                    return new ContinuousDeliveryMode();
-                case VersioningMode.ContinuousDeployment:
-                    return new ContinuousDeploymentMode();
-                default:
-                    throw new ArgumentException("No instance exists for this versioning mode.");
-            }
+                VersioningMode.ContinuousDelivery => (VersioningModeBase) new ContinuousDeliveryMode(),
+                VersioningMode.ContinuousDeployment => new ContinuousDeploymentMode(),
+                _ => throw new ArgumentException("No instance exists for this versioning mode.")
+            };
         }
     }
-}
+}

src/GitVersionExe/ArgumentParser.cs

@@ -325,14 +325,11 @@ public Arguments ParseArguments(string[] commandLineArguments)
                         }
 
                         var optionKey = keyAndValue[0].ToLowerInvariant();
-                        switch (optionKey)
+                        arguments.OverrideConfig.TagPrefix = optionKey switch
                         {
-                            case "tag-prefix":
-                                arguments.OverrideConfig.TagPrefix = keyAndValue[1];
-                                break;
-                            default:
-                                throw new WarningException($"Could not parse /overrideconfig option: {optionKey}. Currently supported only 'tag-prefix' option");
-                        }
+                            "tag-prefix" => keyAndValue[1],
+                            _ => throw new WarningException($"Could not parse /overrideconfig option: {optionKey}. Currently supported only 'tag-prefix' option")
+                        };
                     }
 
                     continue;

src/GitVersionTask/FileHelper.cs

@@ -63,17 +63,13 @@ public static void DeleteTempFiles()
 
         public static string GetFileExtension(string language)
         {
-            switch (language)
+            return language switch
             {
-                case "C#":
-                    return "cs";
-                case "F#":
-                    return "fs";
-                case "VB":
-                    return "vb";
-                default:
-                    throw new ArgumentException($"Unknown language detected: '{language}'");
-            }
+                "C#" => "cs",
+                "F#" => "fs",
+                "VB" => "vb",
+                _ => throw new ArgumentException($"Unknown language detected: '{language}'")
+            };
         }
 
         public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)