Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add net6.0 as a target framework #616

Merged
merged 15 commits into from May 9, 2022
Merged

Add net6.0 as a target framework #616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
047309f
Add `net6.0` target, and NoWarn for SYSLIB0003
Jevonius Apr 8, 2022
1ab2324
Use `RuntimeInformation` to avoid CA1416 warning for COM interop hand…
Jevonius Apr 8, 2022
f85ae04
Add `EventLog` handling for `net6.0`, add nicer handling for Mono in …
Jevonius Apr 8, 2022
fc1a19d
Update build pipelines for `net6.0` support, add GitHub Actiosn pipel…
Jevonius Apr 8, 2022
1573e45
Update copyright year in touched files
Jevonius Apr 8, 2022
0eb55e5
Add `ref/*-net6.0.cs` files, update test/generator to work only under…
Jevonius Apr 8, 2022
a342079
Update `PublicApiTestCase` to remove compilation warning
Jevonius Apr 8, 2022
d147818
Update `NUnit` and related packages to add support for `net6.0`
Jevonius Apr 8, 2022
e078044
Ensure `PublicApiTestCase` only runs on Windows
Jevonius Apr 8, 2022
14264bc
Update `PublicApiTestCase` platform filtering to use NUnit attribute
Jevonius Apr 8, 2022
8641c5f
Update missed copyright header year for changed test file
Jevonius Apr 8, 2022
3e6e22d
Remove references of DOTNET462 as no longer used
Jevonius Apr 10, 2022
2de4707
Update CHANGELOG and README to reflect `net6.0` change
Jevonius Apr 10, 2022
9da21a7
Switch SYSLIB0003 suppression to pragma rather than project-level
Jevonius Apr 30, 2022
0076083
Switch to preprocessor directives to avoid need for System.Runtime.In…
Jevonius Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Castle.Core/Castle.Core.csproj
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@

<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Include="System.Configuration" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
Expand Down
4 changes: 1 addition & 3 deletions src/Castle.Core/DynamicProxy/ProxyGenerator.cs
View file
Open in desktop
Expand Up @@ -16,14 +16,12 @@ namespace Castle.DynamicProxy
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;

using Castle.Core.Internal;
using Castle.Core.Logging;
using Castle.DynamicProxy.Generators;

/// <summary>
/// Provides proxy objects for classes and interfaces.
Expand Down Expand Up @@ -558,7 +556,7 @@ public object CreateInterfaceProxyWithTarget(Type interfaceToProxy, object targe

if (target != null)
{
if (Marshal.IsComObject(target))
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Marshal.IsComObject(target))
jonorossi marked this conversation as resolved.
Show resolved Hide resolved
{
var interfaceId = interfaceToProxy.GUID;
if (interfaceId != Guid.Empty)
Expand Down