add more conditioning

Author: thompson-tomo

Framework/Azure/Cqrs.Azure.DocumentDb/Cqrs.Azure.DocumentDb.csproj

@@ -96,7 +96,7 @@
 		<ProjectReference Include="..\..\Cqrs\Cqrs.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net5.0'))">
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
 

Framework/Azure/Cqrs.Azure.Storage/Cqrs.Azure.Storage.csproj

@@ -79,7 +79,7 @@
 		<ProjectReference Include="..\..\Cqrs\Cqrs.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net5.0'))">
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
 

Framework/Cqrs.MongoDB.Tests.Integration/Cqrs.MongoDB.Tests.Integration.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
 	</PropertyGroup>

Framework/Cqrs.MongoDB/Cqrs.MongoDB.csproj

@@ -80,7 +80,7 @@
 		<ProjectReference Include="..\Cqrs\Cqrs.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net5.0'))">
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
 

Framework/Cqrs.Tests/Cqrs.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net40;netstandard2.0;net6.0</TargetFrameworks>
 		<Authors>Chinchilla Software</Authors>
 		<Company>Chinchilla Software</Company>
 		<Copyright>Copyright © 2022</Copyright>

Framework/Cqrs/Cqrs.csproj

@@ -126,7 +126,7 @@
 
 	<PropertyGroup>
 		<OutputType>library</OutputType>
-		<TargetFrameworks>net40;netstandard2.0;net48</TargetFrameworks>
+		<TargetFrameworks>net40;netstandard2.0;net48;net6.0</TargetFrameworks>
 		<DocumentationFile>Cqrs.xml</DocumentationFile>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>

Framework/Cqrs/Services/ServiceChannelFactory.cs

@@ -23,15 +23,15 @@ public class ServiceChannelFactory<TService> : ChannelFactory<TService>
 		/// Instantiates a new instance of the <see cref="ServiceChannelFactory{TService}"/> class with a specified endpoint configuration name.
 		/// </summary>
 		public ServiceChannelFactory(
-#if NETSTANDARD2_0
+#if !NETFRAMEWORK
 				ServiceEndpoint endpoint
 #else
 				string endpointConfigurationName
 #endif
 			)
 			: base
 			(
-#if NETSTANDARD2_0
+#if !NETFRAMEWORK
 				endpoint
 #else
 				endpointConfigurationName
@@ -61,7 +61,7 @@ protected virtual void AttachDataContractResolver(ServiceEndpoint endpoint)
 					operationDescription.Behaviors.Add(serializerBehavior = new DataContractSerializerOperationBehavior(operationDescription));
 #if NET40_OR_GREATER
 				serializerBehavior.DataContractResolver = (DataContractResolver)Activator.CreateInstance(AppDomain.CurrentDomain, dataContractType.Assembly.FullName, dataContractType.FullName).Unwrap();
-#elif NETSTANDARD2_0
+#elif NETSTANDARD || NET
 				serializerBehavior.DataContractResolver = (DataContractResolver)DotNetStandard2Helper.CreateInstanceFrom(dataContractType.Assembly.FullName, dataContractType.FullName);
 #else
 				serializerBehavior.DataContractResolver = (DataContractResolver)Activator.CreateInstance(dataContractType.Assembly.FullName, dataContractType.FullName).Unwrap();