creating WorkflowManager class to get the workflow embedded resources in assembly.

Author: HHobeck

src/GitVersion.Core/Configuration/ConfigurationProvider.cs

@@ -1,7 +1,7 @@
 using GitVersion.Configuration.Init.Wizard;
+using GitVersion.Configuration.SupportedWorkflows;
 using GitVersion.Extensions;
 using GitVersion.Logging;
-using GitVersion.Properties;
 using Microsoft.Extensions.Options;
 using YamlDotNet.Core;
 
@@ -57,21 +57,10 @@ internal GitVersionConfiguration ProvideInternal(
 
         var workflow = GetWorkflow(overrideConfiguration, overrideConfigurationFromFile);
 
-        Dictionary<object, object?>? overrideConfigurationFromWorkflow = null;
-
-        if (!string.IsNullOrEmpty(workflow))
-        {
-            var workflowResource = (byte[]?)Resources.ResourceManager.GetObject(workflow, Resources.Culture);
-            if (workflowResource != null)
-            {
-                overrideConfigurationFromWorkflow = ConfigurationSerializer.Deserialize<Dictionary<object, object?>>(
-                    Encoding.UTF8.GetString(workflowResource)
-                );
-            }
-        }
-
         IConfigurationBuilder configurationBuilder = (workflow is null)
             ? GitFlowConfigurationBuilder.New : ConfigurationBuilder.New;
+
+        var overrideConfigurationFromWorkflow = WorkflowManager.GetOverrideConfiguration(workflow);
         foreach (var item in new[] { overrideConfigurationFromWorkflow, overrideConfigurationFromFile, overrideConfiguration })
         {
             if (item != null) configurationBuilder.AddOverride(item);

src/GitVersion.Core/Configuration/GitFlowV1.yml renamed to src/GitVersion.Core/Configuration/SupportedWorkflows/GitFlow/v1.yml

@@ -0,0 +1,30 @@
+using GitVersion.Extensions;
+
+namespace GitVersion.Configuration.SupportedWorkflows
+{
+    internal static class WorkflowManager
+    {
+        private static readonly string ResourceNameTemplate = DetermineResourceNameTemplate();
+
+        private static string DetermineResourceNameTemplate()
+        {
+            var fullClassName = typeof(WorkflowManager).FullName!;
+            var resourceNamePrefix = fullClassName.Substring(0, fullClassName.Length - nameof(WorkflowManager).Length - 1);
+            return $"{resourceNamePrefix}.{{0}}.yml";
+        }
+
+        public static Dictionary<object, object?>? GetOverrideConfiguration(string? workflow)
+        {
+            if (string.IsNullOrEmpty(workflow)) return null;
+
+            var resourceName = GetResourceName(workflow);
+            var embeddedResource = ReadEmbeddedResourceExtensions.ReadAsStringFromEmbeddedResource(
+                resourceName, typeof(WorkflowManager).Assembly
+            );
+            return ConfigurationSerializer.Deserialize<Dictionary<object, object?>>(embeddedResource);
+        }
+
+        private static string GetResourceName(string workflow)
+            => ResourceNameTemplate.Replace("{0}", workflow.Replace('/', '.'));
+    }
+}

src/GitVersion.Core/Configuration/GitHubFlowV1.yml renamed to src/GitVersion.Core/Configuration/SupportedWorkflows/GitHubFlow/v1.yml

@@ -9,16 +9,20 @@ public static class ReadEmbeddedResourceExtensions
     /// <param name="resourceName">Should include Namespace separated path to resource in assembly referenced by <typeparamref name="T"/></param>
     /// <returns></returns>
     public static string ReadAsStringFromEmbeddedResource<T>(this string resourceName)
+        => ReadAsStringFromEmbeddedResource(resourceName, typeof(T).Assembly);
+
+    public static string ReadAsStringFromEmbeddedResource(this string resourceName, Assembly assembly)
     {
-        using var stream = resourceName.ReadFromEmbeddedResource<T>();
-        using var rdr = new StreamReader(stream);
-        return rdr.ReadToEnd();
+        using var stream = resourceName.ReadFromEmbeddedResource(assembly);
+        using var streamReader = new StreamReader(stream);
+        return streamReader.ReadToEnd();
     }
 
-    private static Stream ReadFromEmbeddedResource<T>(this string resourceName)
+    private static Stream ReadFromEmbeddedResource(this string resourceName, Assembly assembly)
     {
-        var assembly = typeof(T).Assembly;
+        assembly.NotNull();
 
-        return assembly.GetManifestResourceStream(resourceName) ?? throw new InvalidOperationException($"Could not find embedded resource {resourceName}");
+        return assembly.GetManifestResourceStream(resourceName)
+            ?? throw new InvalidOperationException($"Could not find embedded resource {resourceName}");
     }
 }

src/GitVersion.Core/Configuration/SupportedWorkflows/WorkflowManager.cs

@@ -11,6 +11,16 @@
         <Product>$(AssemblyName)</Product>
     </PropertyGroup>
 
+    <ItemGroup>
+      <None Remove="Configuration\SupportedWorkflows\GitFlowV1.yml" />
+      <None Remove="Configuration\SupportedWorkflows\GitHubFlowV1.yml" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Include="Configuration\SupportedWorkflows\GitFlow\v1.yml" />
+      <EmbeddedResource Include="Configuration\SupportedWorkflows\GitHubFlow\v1.yml" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Polly" />
         <PackageReference Include="System.Net.Requests" />
@@ -30,18 +40,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Update="Properties\Resources.Designer.cs">
-        <DesignTime>True</DesignTime>
-        <AutoGen>True</AutoGen>
-        <DependentUpon>Resources.resx</DependentUpon>
-      </Compile>
-    </ItemGroup>
-
-    <ItemGroup>
-      <EmbeddedResource Update="Properties\Resources.resx">
-        <Generator>ResXFileCodeGenerator</Generator>
-        <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      </EmbeddedResource>
+      <Folder Include="Properties\" />
     </ItemGroup>
 
 </Project>

src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs

@@ -1091,6 +1091,7 @@ static GitVersion.Extensions.GitExtensions.CreateGitLogArgs(int? maxCommits) ->
 static GitVersion.Extensions.GitExtensions.DumpGraph(string! workingDirectory, System.Action<string!>? writer = null, int? maxCommits = null) -> void
 static GitVersion.Extensions.ObjectExtensions.Deconstruct<TKey, TValue>(this System.Collections.Generic.KeyValuePair<TKey, TValue> kvp, out TKey key, out TValue value) -> void
 static GitVersion.Extensions.ObjectExtensions.GetProperties(this object! obj) -> System.Collections.Generic.Dictionary<string!, string!>!
+static GitVersion.Extensions.ReadEmbeddedResourceExtensions.ReadAsStringFromEmbeddedResource(this string! resourceName, System.Reflection.Assembly! assembly) -> string!
 static GitVersion.Extensions.ReadEmbeddedResourceExtensions.ReadAsStringFromEmbeddedResource<T>(this string! resourceName) -> string!
 static GitVersion.Extensions.ServiceCollectionExtensions.AddModule(this Microsoft.Extensions.DependencyInjection.IServiceCollection! serviceCollection, GitVersion.IGitVersionModule! gitVersionModule) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static GitVersion.Extensions.ServiceCollectionExtensions.GetServiceForType<TService, TType>(this System.IServiceProvider! serviceProvider) -> TService