Added All Config Improvement to My Fork

.azpipelines/variables.json

@@ -0,0 +1,4 @@
+{
+  "ServiceName": "tech231ConsulConfigProvider",
+  "ServiceDescription": "Tech231 Consul Configuration Provider"
+}

.github/workflows/dotnet-ci.yml

@@ -0,0 +1,76 @@
+name: .NET CI/CD
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+  workflow_dispatch: # Allows manual triggering
+
+env:
+  BUILD_CONFIGURATION: Release
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_NOLOGO: true
+
+jobs:
+  build-and-validate:
+    name: Build, Validate, and Publish
+    runs-on: ubuntu-latest # Change if 'LCC' was a self-hosted runner pool
+    permissions:
+      contents: write # For git tag and push
+      packages: write # For publishing to GitHub Packages
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Required for GitVersion to determine the version accurately
+          persist-credentials: true # Needed for git push operations
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json # Remove if no global.json or specify path
+
+      - name: Setup GitVersion
+        uses: gittools/actions/gitversion/setup@v1.1.1
+        with:
+          versionSpec: '5.x'
+
+      - name: Determine Version
+        id: gitversion
+        uses: gittools/actions/gitversion/execute@v1.1.1
+
+      - name: Restore NuGet packages
+        run: dotnet restore src/**/*.csproj --configuration ${{ env.BUILD_CONFIGURATION }}
+
+      - name: Build project
+        run: dotnet build src/**/*.csproj --configuration ${{ env.BUILD_CONFIGURATION }} --no-restore /p:Version=${{ steps.gitversion.outputs.nuGetVersion }}
+
+      - name: Create NuGet Package
+        run: dotnet pack src/**/*.csproj --configuration ${{ env.BUILD_CONFIGURATION }} --no-build /p:Version=${{ steps.gitversion.outputs.nuGetVersion }} -o ./packages
+
+      - name: Upload NuGet Package Artifact
+        if: success() && github.event_name != 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: nuget-packages
+          path: ./packages/**/*.nupkg
+
+      - name: Publish to GitHub Packages
+        if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev')
+        run: |
+          dotnet nuget push "./packages/**/*.nupkg" \
+            --api-key "${{ secrets.GITHUB_TOKEN }}" \
+            --source "https://nuget.pkg.github.com/${{ github.repository_owner }}" \
+            --skip-duplicate
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Git Tag
+        if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev')
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "actions@github.com"
+          git tag v${{ steps.gitversion.outputs.nuGetVersion }}
+          git push origin v${{ steps.gitversion.outputs.nuGetVersion }}

.gitignore

@@ -254,3 +254,6 @@ paket-files/
 .vscode
 .build
 .DS_Store
+
+#SonarQube Analysis Files
+.sonarqube

Directory.Build.props

@@ -1,19 +1,19 @@
 <Project>
-  <PropertyGroup>
-    <Authors>Winton</Authors>
-    <Company>Winton</Company>
-    <Copyright>Copyright 2019 Winton</Copyright>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Rules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>8.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Authors>Winton</Authors>
+        <Company>Winton</Company>
+        <Copyright>Copyright 2019 Winton</Copyright>
+        <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Rules.ruleset</CodeAnalysisRuleSet>
+        <LangVersion>8.0</LangVersion>
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
-  </ItemGroup>
+    <ItemGroup>
+        <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All"/>
+    </ItemGroup>
 </Project>

GitVersion.yml

@@ -1,18 +1,26 @@
 assembly-versioning-scheme: MajorMinorPatch
-mode: ContinuousDeployment
+continuous-delivery-fallback-tag: ''
+mode: Mainline
 
-branches:
-
+branches:  
   master:
-    regex: master
-    tag: master
+    regex: ^(master|main)$
+    mode: ContinuousDelivery
+    tag: ''
     increment: Minor
     prevent-increment-of-merged-branch-version: true
-  feature:
-    regex: feature[/-]
-    tag: a{BranchName}
-    increment: Minor
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  develop:
+    regex: ^dev(elop)?(ment)?$
+    mode: ContinuousDeployment
+    tag: ''
+    increment: Patch
     prevent-increment-of-merged-branch-version: false
+    track-merge-target: true
+    tracks-release-branches: true
+    is-release-branch: false
   patch:
     regex: patch[/-]
     tag: useBranchName
@@ -24,3 +32,13 @@ branches:
     tag: rc
     increment: None
     prevent-increment-of-merged-branch-version: false
+  pull-request:
+    regex: ^(pull|pull\-requests|pr)[/-]
+    mode: ContinuousDelivery
+    tag: pr
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    tag-number-pattern: '[/-](?<number>\d+)[-/]'
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false

Winton.Extensions.Configuration.Consul.sln.DotSettings

@@ -419,6 +419,8 @@
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseVar</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="_" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 
@@ -465,11 +467,13 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 

azure-pipelines.yml

@@ -0,0 +1,101 @@
+name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+trigger:
+  batch: true
+  branches:
+    include:
+      - master
+      - dev
+
+pool: 'LCC'
+
+variables:
+  buildConfiguration: 'Release'
+
+stages:
+  - stage: DataBuild
+    displayName: Build and Validation
+    jobs: 
+      - job: BuildValidate
+        displayName: Build and Analyze
+        steps:
+          - checkout: self
+            clean: true
+            persistCredentials: true
+          - task: oneLuckiDevJson2Variable@1
+            displayName: Parse JsonConfig
+            inputs:
+              jsonFile: .azpipelines/variables.json
+              shouldPrefixVariables: true
+              variablePrefix: 'deploy'
+          - task: UseDotNet@2
+            displayName: Use .NET From Global for Project Build
+            inputs:
+              packageType: 'sdk'
+              useGlobalJson: true
+              performMultiLevelLookup: true
+          - task: gitversion/setup@0
+            displayName: 'GitVersion Setup'
+            inputs:
+              versionSpec: '5.x'
+          - task: gitversion/execute@0
+            displayName: 'GitVersion Update'
+          - task: SonarQubePrepare@4
+            displayName: Prep Work For SonarQube
+            inputs:
+              SonarQube: 'ACS SonarQube'
+              scannerMode: 'MSBuild'
+              projectKey: $(deploy.ServiceName)
+              projectName: $(deploy.ServiceDescription)
+              projectVersion: $(GitVersion.SemVer)
+              extraProperties: |
+                sonar.dependencyCheck.reportPath=$(Build.SourcesDirectory)/dependency-check-report.xml     
+                sonar.dependencyCheck.htmlReportPath=$(Build.SourcesDirectory)/dependency-check-report.html
+                sonar.cpd.exclusions=**/AssemblyInfo.cs,**/*.g.cs
+                sonar.cs.vscoveragexml.reportsPaths=$(System.DefaultWorkingDirectory)/**/*.coveragexml
+                sonar.cs.vstest.reportsPaths=$(System.DefaultWorkingDirectory)/**/*.trx
+          - task: DotNetCoreCLI@2
+            displayName: 'Nuget Restore App'
+            inputs:
+              command: 'restore'
+              projects: 'src/**/*.csproj'
+              restoreArguments: '/p:Configuration=$(buildConfiguration)'
+              feedsToUse: 'select'
+              vstsFeed: 'acsint'
+              noCache: true
+              verbosityRestore: 'Normal'
+          - task: DotNetCoreCLI@2
+            displayName: 'Build App'
+            inputs:
+              command: 'build'
+              projects: 'src/**/*.csproj'
+              arguments: '-c $(buildConfiguration) --no-restore /p:Version=$(GitVersion.NuGetVersion)'
+          - task: SonarQubeAnalyze@4
+            displayName: 'Run Code Analysis'
+          - task: SonarQubePublish@4
+            displayName: 'Publish Quality Gate Result'
+            inputs:
+              pollingTimeoutSec: '1500'
+          - task: CopyFiles@2
+            condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+            inputs:
+              SourceFolder: ''
+              Contents: '**/*.nupkg'
+              TargetFolder: '$(Build.ArtifactStagingDirectory)'
+              OverWrite: true
+              flattenFolders: true
+          - task: PublishBuildArtifacts@1
+            condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+            inputs:
+              PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+              ArtifactName: 'drop'
+              publishLocation: 'Container'
+          - task: GitTag@6
+            condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+            inputs:
+              workingdir: '$(System.DefaultWorkingDirectory)'
+              tagUser: 'Alfred Neequaye'
+              tagEmail: 'aneequaye@acsghana.com'
+              tag: 'v$(GitVersion.NuGetVersion)'
+              forceTagCreation: true
+            env:
+              SYSTEM_ACCESSTOKEN: $(System.AccessToken)

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.300",
+    "rollForward": "latestPatch"
+  }
+}

src/Winton.Extensions.Configuration.Consul/ConfigurationBuilderExtensions.cs

@@ -6,42 +6,42 @@
 
 namespace Winton.Extensions.Configuration.Consul
 {
+  /// <summary>
+  ///     Extensions for the <see cref="IConfigurationBuilder" /> that provide syntactic sugar for
+  ///     using the <see cref="IConsulConfigurationSource" />.
+  /// </summary>
+  public static class ConfigurationBuilderExtensions
+  {
     /// <summary>
-    ///     Extensions for the <see cref="IConfigurationBuilder" /> that provide syntactic sugar for
-    ///     using the <see cref="IConsulConfigurationSource" />.
+    ///     Adds Consul as a configuration source to the <see cref="IConfigurationBuilder" />
+    ///     using the default settings in <see cref="IConsulConfigurationSource" />.
     /// </summary>
-    public static class ConfigurationBuilderExtensions
+    /// <param name="builder">The builder to add consul to.</param>
+    /// <param name="key">The key in consul where the configuration is located.</param>
+    /// <returns>The builder.</returns>
+    public static IConfigurationBuilder AddConsul(
+      this IConfigurationBuilder builder,
+      string key)
     {
-        /// <summary>
-        ///     Adds Consul as a configuration source to the <see cref="IConfigurationBuilder" />
-        ///     using the default settings in <see cref="IConsulConfigurationSource" />.
-        /// </summary>
-        /// <param name="builder">The builder to add consul to.</param>
-        /// <param name="key">The key in consul where the configuration is located.</param>
-        /// <returns>The builder.</returns>
-        public static IConfigurationBuilder AddConsul(
-            this IConfigurationBuilder builder,
-            string key)
-        {
-            return builder.AddConsul(key, options => { });
-        }
+      return builder.AddConsul(key, options => { });
+    }
 
-        /// <summary>
-        ///     Adds Consul as a configuration source to the <see cref="IConfigurationBuilder" />
-        ///     and applies the given overrides to the <see cref="IConsulConfigurationSource" />.
-        /// </summary>
-        /// <param name="builder">The builder to add consul to.</param>
-        /// <param name="key">The key in consul where the configuration is located.</param>
-        /// <param name="options">An action used to configure the options of the <see cref="IConsulConfigurationSource" />.</param>
-        /// <returns>The builder.</returns>
-        public static IConfigurationBuilder AddConsul(
-            this IConfigurationBuilder builder,
-            string key,
-            Action<IConsulConfigurationSource> options)
-        {
-            var consulConfigSource = new ConsulConfigurationSource(key);
-            options(consulConfigSource);
-            return builder.Add(consulConfigSource);
-        }
+    /// <summary>
+    ///     Adds Consul as a configuration source to the <see cref="IConfigurationBuilder" />
+    ///     and applies the given overrides to the <see cref="IConsulConfigurationSource" />.
+    /// </summary>
+    /// <param name="builder">The builder to add consul to.</param>
+    /// <param name="key">The key in consul where the configuration is located.</param>
+    /// <param name="options">An action used to configure the options of the <see cref="IConsulConfigurationSource" />.</param>
+    /// <returns>The builder.</returns>
+    public static IConfigurationBuilder AddConsul(
+      this IConfigurationBuilder builder,
+      string key,
+      Action<IConsulConfigurationSource> options)
+    {
+      var consulConfigSource = new ConsulConfigurationSource(key);
+      options(consulConfigSource);
+      return builder.Add(consulConfigSource);
     }
+  }
 }