From f38f5a34ee0eb4df16c86c8ee1dcc4e3b3343104 Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@iowacomputergurus.com>
Date: Mon, 26 Jun 2023 14:06:13 -0500
Subject: [PATCH 1/2] Addressed configuration issue #39

---
 src/ICG NetCore Utilities.sln                                | 2 +-
 .../DependencyResolution/StartupExtensions.cs                | 4 ++--
 src/NetCore.Utilities/NetCore.Utilities.csproj               | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ICG NetCore Utilities.sln b/src/ICG NetCore Utilities.sln
index c8d52c5..fbb8608 100644
--- a/src/ICG NetCore Utilities.sln	
+++ b/src/ICG NetCore Utilities.sln	
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Utilities.Tests", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utility", "Utility", "{0A7D0BD5-800E-4B7D-A351-916BE3DDE518}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncryptionKeyGenerator", "EncryptionKeyGenerator\EncryptionKeyGenerator.csproj", "{F2ADCF9A-3688-47AF-9998-95930BC034AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EncryptionKeyGenerator", "EncryptionKeyGenerator\EncryptionKeyGenerator.csproj", "{F2ADCF9A-3688-47AF-9998-95930BC034AB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/NetCore.Utilities/DependencyResolution/StartupExtensions.cs b/src/NetCore.Utilities/DependencyResolution/StartupExtensions.cs
index f27389f..cc976bc 100644
--- a/src/NetCore.Utilities/DependencyResolution/StartupExtensions.cs
+++ b/src/NetCore.Utilities/DependencyResolution/StartupExtensions.cs
@@ -26,9 +26,9 @@ public static void UseIcgNetCoreUtilities(this IServiceCollection services, ICon
             services.AddTransient<IDirectoryProvider, DirectoryProvider>();
             services.AddTransient<IAesEncryptionService, AesEncryptionService>();
             services.AddTransient<IAesDerivedKeyEncryptionService, AesDerivedKeyEncryptionService>();
-            services.Configure<AesEncryptionServiceOptions>(configuration.GetSection(nameof(AesEncryptionServiceOptions)));
+            services.Configure<AesEncryptionServiceOptions>(
+                configuration.GetSection(nameof(AesEncryptionServiceOptions)));
             services.Configure<AesDerivedKeyEncryptionServiceOptions>(configuration.GetSection(nameof(AesDerivedKeyEncryptionServiceOptions)));
-
         }
     }
 }
\ No newline at end of file
diff --git a/src/NetCore.Utilities/NetCore.Utilities.csproj b/src/NetCore.Utilities/NetCore.Utilities.csproj
index a33c16f..1e09d62 100644
--- a/src/NetCore.Utilities/NetCore.Utilities.csproj
+++ b/src/NetCore.Utilities/NetCore.Utilities.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -37,7 +37,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 6da0712405eb098ac00f0ce251e30a429252888e Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@iowacomputergurus.com>
Date: Mon, 26 Jun 2023 14:07:22 -0500
Subject: [PATCH 2/2] Removed CodeQL

---
 .github/workflows/codeql.yml | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index ce8594e..0000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: "CodeQL"
-# MS Docs - https://learn.microsoft.com/en-us/dotnet/architecture/devops-for-aspnet-developers/actions-codeql
-on:
-  push:
-    branches: [ develop ]
-  pull_request:
-    branches: [ develop ]
-  schedule:
-    - cron: '40 14 * * 6'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'csharp' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1