Merge pull request #11 from Sundow/master

entlib · web-flow · commit d3cf62329c39 · 2023-02-24T10:49:13.000-05:00
net472, net6.0, net7.0 are added as build targets.
diff --git a/source/Src/DatabaseTraceListener/Logging.Database.csproj b/source/Src/DatabaseTraceListener/Logging.Database.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net47;net472;netstandard2.0;netcoreapp2.0;net6.0;net7.0</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>
@@ -37,11 +37,7 @@
     <ProjectReference Include="..\Logging\Logging.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
-
-  </ItemGroup>
-
-  <ItemGroup Condition="!$(TargetFramework.StartsWith('netstandard')) AND !$(TargetFramework.StartsWith('netcoreapp'))">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Management" />
@@ -89,14 +85,6 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
-    
-  </ItemGroup>
-
-  <ItemGroup Condition="!$(TargetFramework.StartsWith('netstandard')) AND !$(TargetFramework.StartsWith('netcoreapp'))">
-    
-  </ItemGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DebugSymbols>true</DebugSymbols>
diff --git a/source/Src/Logging/Configuration/Fluent/ILoggingConfigurationSendToEventLogTraceListener.cs b/source/Src/Logging/Configuration/Fluent/ILoggingConfigurationSendToEventLogTraceListener.cs
@@ -1,16 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Microsoft.Practices.EnterpriseLibrary.Logging.Configuration;
 using System.Diagnostics;
-using System.Messaging;
 using Microsoft.Practices.EnterpriseLibrary.Logging.TraceListeners;
-using System.Collections.Specialized;
 using Microsoft.Practices.EnterpriseLibrary.Logging.Formatters;
-using Microsoft.Practices.EnterpriseLibrary.Common.Configuration.Fluent;
 
 namespace Microsoft.Practices.EnterpriseLibrary.Common.Configuration.Fluent
 {
diff --git a/source/Src/Logging/Configuration/Fluent/SendToEventLogTraceListenerExtension.cs b/source/Src/Logging/Configuration/Fluent/SendToEventLogTraceListenerExtension.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using Microsoft.Practices.EnterpriseLibrary.Logging.Configuration;
 using System.Diagnostics;
-using System.Messaging;
 using Microsoft.Practices.EnterpriseLibrary.Logging.TraceListeners;
 using System.Collections.Specialized;
 using Microsoft.Practices.EnterpriseLibrary.Logging.Formatters;
diff --git a/source/Src/Logging/ExtraInformation/UnmanagedSecurityContextInformationProvider.cs b/source/Src/Logging/ExtraInformation/UnmanagedSecurityContextInformationProvider.cs
@@ -52,7 +52,10 @@ public string CurrentUser
         /// </summary>
         public string ProcessAccountName
         {
+// Warning disabled to allow debug builds for net 6/7.
+#pragma warning disable SYSLIB0003
             [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]
+#pragma warning restore SYSLIB0003
             get
             {
                 // Get Security Info
diff --git a/source/Src/Logging/Formatters/BinaryLogFormatter.cs b/source/Src/Logging/Formatters/BinaryLogFormatter.cs
@@ -8,6 +8,8 @@
 
 namespace Microsoft.Practices.EnterpriseLibrary.Logging.Formatters
 {
+// Keeping obsolete binary formatter in net 6/7 build for a compatibility with old code using EnterpriseLibrary. If not disabled this warning generates warning as error in net 6/7.
+#pragma warning disable SYSLIB0011
     /// <summary>
     /// Log formatter that will format a <see cref="LogEntry"/> in a way suitable for wire transmission.
     /// </summary>
@@ -55,4 +57,5 @@ private static BinaryFormatter GetFormatter()
             return new BinaryFormatter();
         }
     }
+#pragma warning restore SYSLIB0011
 }
diff --git a/source/Src/Logging/LogEntry.cs b/source/Src/Logging/LogEntry.cs
@@ -594,8 +594,11 @@ private bool UnmanagedCodePermissionAvailable
                     {
                         try
                         {
+// Warning disabled to allow debug builds for net 6/7.
+#pragma warning disable SYSLIB0003
                             SecurityPermission unmanagedCodePermission = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
                             unmanagedCodePermission.Demand();
+#pragma warning restore SYSLIB0003
                             internalUnmanagedCodePermissionAvailable = true;
                         }
                         catch (SecurityException)
diff --git a/source/Src/Logging/LogWriter.cs b/source/Src/Logging/LogWriter.cs
@@ -581,7 +581,7 @@ private static bool IsValidTraceSource(LogSource traceSource)
             return traceSource != null && traceSource.Listeners.Any();
         }
 
-#if !NETSTANDARD2_0 && !NETCOREAPP2_0
+#if !NETSTANDARD2_0 && !NETCOREAPP2_0 && !NET6_0 && !NET7_0
         private void ProcessLog(LogEntry log, TraceEventCache traceEventCache)
         {
             // revert any outstanding impersonation
diff --git a/source/Src/Logging/Logging.csproj b/source/Src/Logging/Logging.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net47;net472;netstandard2.0;netcoreapp2.0;net6.0-windows;net7.0-windows</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>
@@ -35,13 +35,17 @@
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
+  <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
     <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="!$(TargetFramework.StartsWith('netstandard')) AND !$(TargetFramework.StartsWith('netcoreapp'))">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7'))">
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.EnterpriseServices" />
@@ -111,8 +115,14 @@
     <Compile Remove="ExtraInformation\Helpers\*ContextUtils.cs" />
     <Compile Remove="ExtraInformation\ComPlusInformationProvider.cs" />
   </ItemGroup>
+	
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7'))">
+    <Compile Remove="**\*Msmq*.cs" />
+    <Compile Remove="ExtraInformation\Helpers\*ContextUtils.cs" />
+    <Compile Remove="ExtraInformation\ComPlusInformationProvider.cs" />
+  </ItemGroup>
 
-  <ItemGroup Condition="!$(TargetFramework.StartsWith('netstandard')) AND !$(TargetFramework.StartsWith('netcoreapp'))">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Compile Remove="System.Runtime.Remoting.Messaging\*.cs" />
   </ItemGroup>
 
diff --git a/source/Src/Logging/Tracer.cs b/source/Src/Logging/Tracer.cs
@@ -187,7 +187,10 @@ private static void CheckPermissionsIfFullyTrusted()
         {
             if (Tracer.isFullyTrusted)
             {
+// Warning disabled to allow debug builds for net 6/7.
+#pragma warning disable SYSLIB0003
                 new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
+#pragma warning restore SYSLIB0003
             }
         }
 
diff --git a/source/Src/MsmqDistributor/Logging.MsmqDistributor.csproj b/source/Src/MsmqDistributor/Logging.MsmqDistributor.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;net47</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net47;net472</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,10 @@ public string CurrentUser`
`52`	`52`	`/// </summary>`
`53`	`53`	`public string ProcessAccountName`
`54`	`54`	`{`
	`55`	`+// Warning disabled to allow debug builds for net 6/7.`
	`56`	`+#pragma warning disable SYSLIB0003`
`55`	`57`	`[SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]`
	`58`	`+#pragma warning restore SYSLIB0003`
`56`	`59`	`get`
`57`	`60`	`{`
`58`	`61`	`// Get Security Info`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`namespace Microsoft.Practices.EnterpriseLibrary.Logging.Formatters`
`10`	`10`	`{`
	`11`	`+// Keeping obsolete binary formatter in net 6/7 build for a compatibility with old code using EnterpriseLibrary. If not disabled this warning generates warning as error in net 6/7.`
	`12`	`+#pragma warning disable SYSLIB0011`
`11`	`13`	`/// <summary>`
`12`	`14`	`/// Log formatter that will format a <see cref="LogEntry"/> in a way suitable for wire transmission.`
`13`	`15`	`/// </summary>`
`@@ -55,4 +57,5 @@ private static BinaryFormatter GetFormatter()`
`55`	`57`	`return new BinaryFormatter();`
`56`	`58`	`}`
`57`	`59`	`}`
	`60`	`+#pragma warning restore SYSLIB0011`
`58`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -594,8 +594,11 @@ private bool UnmanagedCodePermissionAvailable`
`594`	`594`	`{`
`595`	`595`	`try`
`596`	`596`	`{`
	`597`	`+// Warning disabled to allow debug builds for net 6/7.`
	`598`	`+#pragma warning disable SYSLIB0003`
`597`	`599`	`SecurityPermission unmanagedCodePermission = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);`
`598`	`600`	`unmanagedCodePermission.Demand();`
	`601`	`+#pragma warning restore SYSLIB0003`
`599`	`602`	`internalUnmanagedCodePermissionAvailable = true;`
`600`	`603`	`}`
`601`	`604`	`catch (SecurityException)`
Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ private static bool IsValidTraceSource(LogSource traceSource)`
`581`	`581`	`return traceSource != null && traceSource.Listeners.Any();`
`582`	`582`	`}`
`583`	`583`
`584`		`-#if !NETSTANDARD2_0 && !NETCOREAPP2_0`
	`584`	`+#if !NETSTANDARD2_0 && !NETCOREAPP2_0 && !NET6_0 && !NET7_0`
`585`	`585`	`private void ProcessLog(LogEntry log, TraceEventCache traceEventCache)`
`586`	`586`	`{`
`587`	`587`	`// revert any outstanding impersonation`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,10 @@ private static void CheckPermissionsIfFullyTrusted()`
`187`	`187`	`{`
`188`	`188`	`if (Tracer.isFullyTrusted)`
`189`	`189`	`{`
	`190`	`+// Warning disabled to allow debug builds for net 6/7.`
	`191`	`+#pragma warning disable SYSLIB0003`
`190`	`192`	`new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();`
	`193`	`+#pragma warning restore SYSLIB0003`
`191`	`194`	`}`
`192`	`195`	`}`
`193`	`196`