Updated several projects to .NET8 from .NET6

cdmdotnet · cdmdotnet · commit d1f063a00b3c · 2025-10-08T08:52:43.000+13:00
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -3,8 +3,8 @@ name: Build Core Framework
 on: [push]
 
 env:
-  nuGetVersionNumber: 5.2.3
-  nuGetFullVersionNumber: 5.2.3.${{ github.run_number }}
+  nuGetVersionNumber: 5.3.0
+  nuGetFullVersionNumber: 5.3.0.${{ github.run_number }}
 
 jobs:
   build:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,8 +6,8 @@ on:
   workflow_dispatch:
 
 env:
-  nuGetVersionNumber: 5.2.3
-  nuGetFullVersionNumber: 5.2.3.${{ github.run_number }}
+  nuGetVersionNumber: 5.3.0
+  nuGetFullVersionNumber: 5.3.0.${{ github.run_number }}
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
diff --git a/Framework/Azure/Cqrs.Azure.Functions.Isolated/Configuration/IsolatedFunctionHostModule.cs b/Framework/Azure/Cqrs.Azure.Functions.Isolated/Configuration/IsolatedFunctionHostModule.cs
@@ -22,7 +22,7 @@
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 
-#if NET6_0
+#if NET6_0_OR_GREATER
 using Microsoft.Extensions.Configuration;
 #endif
 
@@ -68,7 +68,7 @@ protected virtual void RegisterAzureConfigurations(IServiceCollection services)
 				}
 			}
 
-#if NET6_0
+#if NET6_0_OR_GREATER
 			services.AddSingleton<IConfiguration>(Cqrs.Configuration.ConfigurationManager.BaseConfiguration);
 #endif
 			if (DependencyResolver.ConfigurationManager == null)
diff --git a/Framework/Azure/Cqrs.Azure.Functions.Isolated/Cqrs.Azure.Functions.Isolated.csproj b/Framework/Azure/Cqrs.Azure.Functions.Isolated/Cqrs.Azure.Functions.Isolated.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net48;net6.0</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0</TargetFrameworks>
 		<title>Microsoft Azure Functions for CQRS.NET</title>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
@@ -10,6 +10,10 @@
 		<PackageProjectUrl>https://github.com/Chinchilla-Software-Com/CQRS</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Chinchilla-Software-Com/CQRS</RepositoryUrl>
 		<PackageReleaseNotes>
+			Version 5.3
+
+			* Deprecated .NET 6.0, replaced with .NET 8.0
+
 			Version 5.0
 
 			* Azure function support added
@@ -49,7 +53,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net6.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<AzureFunctionsVersion>v4</AzureFunctionsVersion>
 		<DocumentationFile>Cqrs.Azure.Functions.xml</DocumentationFile>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
diff --git a/Framework/Azure/Cqrs.Azure.Functions.Isolated/CqrsIsolatedFunctionHost.cs b/Framework/Azure/Cqrs.Azure.Functions.Isolated/CqrsIsolatedFunctionHost.cs
@@ -213,12 +213,12 @@ protected override void Start()
 		/// </summary>
 		public static void SetExecutionPath
 		(
-#if NET6_0
+#if NET6_0_OR_GREATER
 			Microsoft.Extensions.Configuration.IConfigurationRoot config
 #endif
 		)
 		{
-#if NET6_0
+#if NET6_0_OR_GREATER
 			SetConfigurationManager(config);
 #endif
 
@@ -259,7 +259,7 @@ protected virtual IEnumerable<Module> GetSupplementaryModules(IServiceCollection
 			var results = new List<Module>
 			{
 				new TIsolatedFunctionHostModule(),
-#if NET6_0
+#if NET6_0_OR_GREATER
 				new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager(Cqrs.Configuration.ConfigurationManager.BaseConfiguration))
 #else
 				new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager())
diff --git a/Framework/Azure/Cqrs.Azure.Functions/Configuration/FunctionHostModule.cs b/Framework/Azure/Cqrs.Azure.Functions/Configuration/FunctionHostModule.cs
@@ -22,8 +22,7 @@
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.ApplicationInsights;
 
-
-#if NET6_0
+#if NET6_0_OR_GREATER
 using Microsoft.Extensions.Configuration;
 #endif
 
@@ -69,17 +68,17 @@ protected virtual void RegisterAzureConfigurations(IServiceCollection services)
 				}
 			}
 
-#if NET6_0
+#if NET6_0_OR_GREATER
 			services.AddSingleton<IConfiguration>(Cqrs.Configuration.ConfigurationManager.BaseConfiguration);
 #endif
 			if (DependencyResolver.ConfigurationManager == null)
 			{
-				services.AddSingleton<IConfigurationManager, CloudConfigurationManager>();
-				DependencyResolver.ConfigurationManager = Resolve<IConfigurationManager>(services);
+				services.AddSingleton<Cqrs.Configuration.IConfigurationManager, CloudConfigurationManager>();
+				DependencyResolver.ConfigurationManager = Resolve<Cqrs.Configuration.IConfigurationManager>(services);
 			}
 			else
 			{
-				services.AddSingleton<IConfigurationManager>(DependencyResolver.ConfigurationManager);
+				services.AddSingleton<Cqrs.Configuration.IConfigurationManager>(DependencyResolver.ConfigurationManager);
 			}
 		}
 
diff --git a/Framework/Azure/Cqrs.Azure.Functions/Cqrs.Azure.Functions.csproj b/Framework/Azure/Cqrs.Azure.Functions/Cqrs.Azure.Functions.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net48;net6.0</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0</TargetFrameworks>
 		<title>Microsoft Azure Functions for CQRS.NET</title>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
@@ -10,6 +10,10 @@
 		<PackageProjectUrl>https://github.com/Chinchilla-Software-Com/CQRS</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Chinchilla-Software-Com/CQRS</RepositoryUrl>
 		<PackageReleaseNotes>
+			Version 5.3
+
+			* Deprecated .NET 6.0, replaced with .NET 8.0
+
 			Version 5.0
 
 			* Azure function support added
@@ -48,7 +52,7 @@
 	</ItemGroup>
 
 	<PropertyGroup>
-		<TargetFrameworks>net48;net6.0</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0</TargetFrameworks>
 		<AzureFunctionsVersion>v4</AzureFunctionsVersion>
 		<DocumentationFile>Cqrs.Azure.Functions.xml</DocumentationFile>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -63,7 +67,7 @@
 		<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
diff --git a/Framework/Azure/Cqrs.Azure.Functions/CqrsFunctionHost.cs b/Framework/Azure/Cqrs.Azure.Functions/CqrsFunctionHost.cs
@@ -132,13 +132,13 @@ protected override void Start()
 		/// </summary>
 		public static void SetExecutionPath
 		(
-#if NET6_0
+#if NET6_0_OR_GREATER
 			Microsoft.Extensions.Configuration.IConfigurationRoot config, 
 #endif
 			string rootPath
 		)
 		{
-#if NET6_0
+#if NET6_0_OR_GREATER
 			SetConfigurationManager(config);
 #endif
 
@@ -167,7 +167,7 @@ protected virtual IEnumerable<Module> GetSupplementaryModules(IServiceCollection
 			var results = new List<Module>
 			{
 				new TIsolatedFunctionHostModule(),
-#if NET6_0
+#if NET6_0_OR_GREATER
 				new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager(Cqrs.Configuration.ConfigurationManager.BaseConfiguration))
 #else
 				new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager())
diff --git a/Framework/Azure/Cqrs.Azure.Functions/Startup.cs b/Framework/Azure/Cqrs.Azure.Functions/Startup.cs
@@ -7,7 +7,7 @@
 #endregion
 
 using Microsoft.Azure.Functions.Extensions.DependencyInjection;
-#if NET6_0
+#if NET6_0_OR_GREATER
 using Microsoft.Extensions.Configuration;
 using System;
 #endif
diff --git a/Framework/Azure/Cqrs.Azure.WebJobs/Cqrs.Azure.WebJobs.csproj b/Framework/Azure/Cqrs.Azure.WebJobs/Cqrs.Azure.WebJobs.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net472;netstandard2.0;net8.0</TargetFrameworks>
 		<title>Microsoft Azure WebJobs for CQRS.NET</title>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
@@ -10,6 +10,10 @@
 		<PackageProjectUrl>https://github.com/Chinchilla-Software-Com/CQRS</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Chinchilla-Software-Com/CQRS</RepositoryUrl>
 		<PackageReleaseNotes>
+			Version 5.3
+
+			* Deprecated .NET 6.0, replaced with .NET 8.0
+
 			Version 5.0
 
 			* Deprecated .NET 5.0, replaced with .NET 6.0
@@ -64,7 +68,7 @@
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 	</PropertyGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.2" />
 		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.4" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
diff --git a/Framework/Azure/EnterpriseLibrary.Azure.TransientFaultHandling.ServiceBus.NetCore/_EnterpriseLibrary.Azure.TransientFaultHandling.ServiceBus.NetCore.csproj b/Framework/Azure/EnterpriseLibrary.Azure.TransientFaultHandling.ServiceBus.NetCore/_EnterpriseLibrary.Azure.TransientFaultHandling.ServiceBus.NetCore.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0;net6.0</TargetFramework>
+		<TargetFramework>netstandard2.0;net8.0</TargetFramework>
 		<title>Transient Fault Handling Application Block - Service Bus integration .NET Core</title>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
@@ -61,7 +61,7 @@
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
 	</ItemGroup>
 
diff --git a/Framework/Azure/Tests/Cqrs.Azure.ConfigurationManager.Tests.Unit/Cqrs.Azure.ConfigurationManager.Tests.Unit.csproj b/Framework/Azure/Tests/Cqrs.Azure.ConfigurationManager.Tests.Unit/Cqrs.Azure.ConfigurationManager.Tests.Unit.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 
 		<IsPackable>false</IsPackable>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
diff --git a/Framework/Azure/Tests/Cqrs.Azure.KeyVault.Tests.Integration/Cqrs.Azure.KeyVault.Tests.Integration.csproj b/Framework/Azure/Tests/Cqrs.Azure.KeyVault.Tests.Integration/Cqrs.Azure.KeyVault.Tests.Integration.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;net6.0;net48</TargetFrameworks>
+		<TargetFrameworks>net472;net8.0;net48</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
@@ -17,7 +17,7 @@
 		<ProjectReference Include="..\..\Cqrs.Azure.KeyVault\Cqrs.Azure.KeyVault.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
diff --git a/Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Integration/Cqrs.Azure.ServiceBus.Tests.Integration.csproj b/Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Integration/Cqrs.Azure.ServiceBus.Tests.Integration.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net472;net6.0;net48</TargetFrameworks>
+		<TargetFrameworks>net472;net8.0;net48</TargetFrameworks>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
 		<Copyright>Copyright ©  2024</Copyright>
@@ -11,7 +11,7 @@
 
 	<PropertyGroup>
 		<OutputType>library</OutputType>
-		<TargetFrameworks>net6.0;net472;net48</TargetFrameworks>
+		<TargetFrameworks>net8.0;net472;net48</TargetFrameworks>
 		<DocumentationFile>Cqrs.Azure.ServiceBus.Tests.Integration.xml</DocumentationFile>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@@ -41,7 +41,7 @@
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" /> <!-- 6.34.0 -->
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
@@ -51,7 +51,7 @@
 		<PackageReference Include="WindowsAzure.ServiceBus" Version="6.2.2" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net48' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net48' ">
 		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
 	</ItemGroup>
 
diff --git a/Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Integration/RoundTripTests.cs b/Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Integration/RoundTripTests.cs
@@ -417,7 +417,7 @@ async Task
 		protected virtual Manager GetManager(string tenantId, string applicationId, string clientKey, string endpoint, string authority)
 		{
 			Manager manager;
-#if NETSTANDARD2_0 || NET48_OR_GREATER || NET6_0
+#if NETSTANDARD2_0 || NET48_OR_GREATER || NET6_0_OR_GREATER
 			var credentials = new ClientSecretCredential(tenantId, applicationId, clientKey);
 			manager = new Manager(endpoint, credentials);
 #else
diff --git a/Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Unit/Cqrs.Azure.ServiceBus.Tests.Unit.csproj b/Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Unit/Cqrs.Azure.ServiceBus.Tests.Unit.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net472;net6.0</TargetFrameworks>
+		<TargetFrameworks>net472;net8.0</TargetFrameworks>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
 		<Copyright>Copyright ©  2024</Copyright>
@@ -11,13 +11,13 @@
 
 	<PropertyGroup>
 		<OutputType>library</OutputType>
-		<TargetFrameworks>net6.0;net472</TargetFrameworks>
+		<TargetFrameworks>net8.0;net472</TargetFrameworks>
 		<DocumentationFile>Cqrs.Azure.ServiceBus.Tests.Unit.xml</DocumentationFile>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 	</PropertyGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
@@ -42,7 +42,7 @@
 		<PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.1.1" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
diff --git a/Framework/Azure/Tests/Cqrs.Azure.Storage.Test.Integration/Cqrs.Azure.Storage.Test.Integration.csproj b/Framework/Azure/Tests/Cqrs.Azure.Storage.Test.Integration/Cqrs.Azure.Storage.Test.Integration.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;net48;net6.0</TargetFrameworks>
+		<TargetFrameworks>net472;net48;net8.0</TargetFrameworks>
 
 		<IsPackable>false</IsPackable>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
diff --git a/Framework/Cqrs.Sql/Cqrs.Sql.csproj b/Framework/Cqrs.Sql/Cqrs.Sql.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net40;net6.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net40;net8.0</TargetFrameworks>
 		<title>Microsoft SqlServer for CQRS.NET</title>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
diff --git a/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.CommandBus/Configuration/AzureCommandBusPublisherModule.cs b/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.CommandBus/Configuration/AzureCommandBusPublisherModule.cs
@@ -48,7 +48,7 @@ public override void Load()
 		public virtual void RegisterCommandSender()
 		{
 			Bind<
-#if NETSTANDARD || NET6_0
+#if NETSTANDARD || NET6_0_OR_GREATER
 				IAsyncCommandPublisher
 #else
 				ICommandPublisher
@@ -58,7 +58,7 @@ public virtual void RegisterCommandSender()
 				.InSingletonScope();
 
 			Bind<
-#if NETSTANDARD || NET6_0
+#if NETSTANDARD || NET6_0_OR_GREATER
 				IAsyncPublishAndWaitCommandPublisher
 #else
 				IPublishAndWaitCommandPublisher
diff --git a/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.CommandBus/Configuration/AzureCommandBusReceiverModule.cs b/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.CommandBus/Configuration/AzureCommandBusReceiverModule.cs
diff --git a/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.CommandBus/Cqrs.Ninject.Azure.ServiceBus.CommandBus.csproj b/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.CommandBus/Cqrs.Ninject.Azure.ServiceBus.CommandBus.csproj
diff --git a/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.EventBus/Configuration/AzureEventBusPublisherModule.cs b/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.EventBus/Configuration/AzureEventBusPublisherModule.cs
diff --git a/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.EventBus/Configuration/AzureEventBusReceiverModule.cs b/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.EventBus/Configuration/AzureEventBusReceiverModule.cs
diff --git a/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.EventBus/Cqrs.Ninject.Azure.ServiceBus.EventBus.csproj b/Framework/Ninject/Azure/Cqrs.Ninject.Azure.ServiceBus.EventBus/Cqrs.Ninject.Azure.ServiceBus.EventBus.csproj
diff --git a/Framework/Ninject/Azure/Tests/Cqrs.Ninject.Azure.WebJobs.Tests.Integration/Cqrs.Ninject.Azure.WebJobs.Tests.Integration.csproj b/Framework/Ninject/Azure/Tests/Cqrs.Ninject.Azure.WebJobs.Tests.Integration/Cqrs.Ninject.Azure.WebJobs.Tests.Integration.csproj

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`using Microsoft.ApplicationInsights;`
`23`	`23`	`using Microsoft.ApplicationInsights.Extensibility;`
`24`	`24`
`25`		`-#if NET6_0`
	`25`	`+#if NET6_0_OR_GREATER`
`26`	`26`	`using Microsoft.Extensions.Configuration;`
`27`	`27`	`#endif`
`28`	`28`
`@@ -68,7 +68,7 @@ protected virtual void RegisterAzureConfigurations(IServiceCollection services)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-#if NET6_0`
	`71`	`+#if NET6_0_OR_GREATER`
`72`	`72`	`services.AddSingleton<IConfiguration>(Cqrs.Configuration.ConfigurationManager.BaseConfiguration);`
`73`	`73`	`#endif`
`74`	`74`	`if (DependencyResolver.ConfigurationManager == null)`
Original file line number	Diff line number	Diff line change
`@@ -213,12 +213,12 @@ protected override void Start()`
`213`	`213`	`/// </summary>`
`214`	`214`	`public static void SetExecutionPath`
`215`	`215`	`(`
`216`		`-#if NET6_0`
	`216`	`+#if NET6_0_OR_GREATER`
`217`	`217`	`Microsoft.Extensions.Configuration.IConfigurationRoot config`
`218`	`218`	`#endif`
`219`	`219`	`)`
`220`	`220`	`{`
`221`		`-#if NET6_0`
	`221`	`+#if NET6_0_OR_GREATER`
`222`	`222`	`SetConfigurationManager(config);`
`223`	`223`	`#endif`
`224`	`224`
`@@ -259,7 +259,7 @@ protected virtual IEnumerable<Module> GetSupplementaryModules(IServiceCollection`
`259`	`259`	`var results = new List<Module>`
`260`	`260`	`{`
`261`	`261`	`new TIsolatedFunctionHostModule(),`
`262`		`-#if NET6_0`
	`262`	`+#if NET6_0_OR_GREATER`
`263`	`263`	`new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager(Cqrs.Configuration.ConfigurationManager.BaseConfiguration))`
`264`	`264`	`#else`
`265`	`265`	`new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager())`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@`
`22`	`22`	`using Microsoft.ApplicationInsights.Extensibility;`
`23`	`23`	`using Microsoft.ApplicationInsights;`
`24`	`24`
`25`		`-`
`26`		`-#if NET6_0`
	`25`	`+#if NET6_0_OR_GREATER`
`27`	`26`	`using Microsoft.Extensions.Configuration;`
`28`	`27`	`#endif`
`29`	`28`
`@@ -69,17 +68,17 @@ protected virtual void RegisterAzureConfigurations(IServiceCollection services)`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`
`72`		`-#if NET6_0`
	`71`	`+#if NET6_0_OR_GREATER`
`73`	`72`	`services.AddSingleton<IConfiguration>(Cqrs.Configuration.ConfigurationManager.BaseConfiguration);`
`74`	`73`	`#endif`
`75`	`74`	`if (DependencyResolver.ConfigurationManager == null)`
`76`	`75`	`{`
`77`		`- services.AddSingleton<IConfigurationManager, CloudConfigurationManager>();`
`78`		`- DependencyResolver.ConfigurationManager = Resolve<IConfigurationManager>(services);`
	`76`	`+ services.AddSingleton<Cqrs.Configuration.IConfigurationManager, CloudConfigurationManager>();`
	`77`	`+ DependencyResolver.ConfigurationManager = Resolve<Cqrs.Configuration.IConfigurationManager>(services);`
`79`	`78`	`}`
`80`	`79`	`else`
`81`	`80`	`{`
`82`		`- services.AddSingleton<IConfigurationManager>(DependencyResolver.ConfigurationManager);`
	`81`	`+ services.AddSingleton<Cqrs.Configuration.IConfigurationManager>(DependencyResolver.ConfigurationManager);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
Original file line number	Diff line number	Diff line change
`@@ -132,13 +132,13 @@ protected override void Start()`
`132`	`132`	`/// </summary>`
`133`	`133`	`public static void SetExecutionPath`
`134`	`134`	`(`
`135`		`-#if NET6_0`
	`135`	`+#if NET6_0_OR_GREATER`
`136`	`136`	`Microsoft.Extensions.Configuration.IConfigurationRoot config,`
`137`	`137`	`#endif`
`138`	`138`	`string rootPath`
`139`	`139`	`)`
`140`	`140`	`{`
`141`		`-#if NET6_0`
	`141`	`+#if NET6_0_OR_GREATER`
`142`	`142`	`SetConfigurationManager(config);`
`143`	`143`	`#endif`
`144`	`144`
`@@ -167,7 +167,7 @@ protected virtual IEnumerable<Module> GetSupplementaryModules(IServiceCollection`
`167`	`167`	`var results = new List<Module>`
`168`	`168`	`{`
`169`	`169`	`new TIsolatedFunctionHostModule(),`
`170`		`-#if NET6_0`
	`170`	`+#if NET6_0_OR_GREATER`
`171`	`171`	`new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager(Cqrs.Configuration.ConfigurationManager.BaseConfiguration))`
`172`	`172`	`#else`
`173`	`173`	`new CqrsModule<TAuthenticationToken, TAuthenticationTokenHelper>(new CloudConfigurationManager())`