Switch to preprocessor directives to avoid need for System.Runtime.In…

…teropServices.RuntimeInformation package on net462
castleproject · Apr 30, 2022 · 0076083 · 0076083
1 parent 9da21a7
commit 0076083
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Castle.Core.Tests/Core.Tests/Logging/DiagnosticsLoggerTestCase.cs b/src/Castle.Core.Tests/Core.Tests/Logging/DiagnosticsLoggerTestCase.cs
@@ -49,7 +49,12 @@ public void Reset()
 
 		private void AssertAdmin()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+#if NETCOREAPP2_0_OR_GREATER
+			bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+#else
+			bool isWindows = !RunningOnMono();
+#endif
+			if (isWindows)
 			{
 				WindowsPrincipal windowsPrincipal = new WindowsPrincipal(WindowsIdentity.GetCurrent());
 				try

diff --git a/src/Castle.Core/Castle.Core.csproj b/src/Castle.Core/Castle.Core.csproj
@@ -30,7 +30,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
 		<Reference Include="System.Configuration" />
-		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">

diff --git a/src/Castle.Core/DynamicProxy/ProxyGenerator.cs b/src/Castle.Core/DynamicProxy/ProxyGenerator.cs
@@ -556,7 +556,13 @@ public virtual object CreateInterfaceProxyWithTargetInterface(Type interfaceToPr
 
 			if (target != null)
 			{
-				if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Marshal.IsComObject(target))
+#if NET6_0_OR_GREATER
+				bool doComHandling = OperatingSystem.IsWindows();
+#else
+				bool doComHandling = true;
+#endif
+
+				if (doComHandling && Marshal.IsComObject(target))
 				{
 					var interfaceId = interfaceToProxy.GUID;
 					if (interfaceId != Guid.Empty)