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

Enable ComWrappers for NativeAOT on non-Windows #85000

Merged
merged 7 commits into from
Apr 25, 2023
Merged

Enable ComWrappers for NativeAOT on non-Windows #85000

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a716c9
Enable ComWrappers basic API tests in src/tests for NativeAOT.
jkoritzinsky Apr 18, 2023
ef32cfa
Enable ComWrappers on NativeAOT on non-Windows platforms.
jkoritzinsky Apr 18, 2023
2dbb12b
Add tracking issue
jkoritzinsky Apr 18, 2023
af3d969
Merge branch 'main' of github.com:dotnet/runtime into nativeaot-comwr…
jkoritzinsky Apr 18, 2023
537097b
Enable ComInterfaceGenerator.Tests on non-Windows.
jkoritzinsky Apr 18, 2023
f04d94e
Remove flag in ComWrappersTests*.csproj and remove the test suppressi…
jkoritzinsky Apr 19, 2023
cbcce17
Merge branch 'main' of github.com:dotnet/runtime into nativeaot-comwr…
jkoritzinsky Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/coreclr/nativeaot/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
<DefineConstants Condition="'$(FeatureCominterop)' == 'true'">FEATURE_COMINTEROP;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<FeatureComWrappers>false</FeatureComWrappers>
<FeatureComWrappers Condition="'$(TargetsWindows)' == 'true'">true</FeatureComWrappers>
<FeatureComWrappers>true</FeatureComWrappers>
</PropertyGroup>
<PropertyGroup>
<FeatureObjCMarshal>false</FeatureObjCMarshal>
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,6 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Binder\tests\SourceGenerationTests\Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj" />

<!-- Depends on ComWrappers, which is not enabled on NativeAOT on non-Windows. Tracked by #76005 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\ComInterfaceGenerator.Tests\ComInterfaceGenerator.Tests.csproj"
Condition="'$(TargetOS)' != 'windows'" />

<!-- Many test failures due to trimming and MakeGeneric. XmlSerializer is not currently supported with NativeAOT. Low priority -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.XmlSerializer.Generator\tests\Microsoft.XmlSerializer.Generator.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ServiceModel.Syndication\tests\System.ServiceModel.Syndication.Tests.csproj" />
Expand Down
5 changes: 5 additions & 0 deletions src/tests/Common/CoreCLRTestLibrary/PlatformDetection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

namespace TestLibrary
Expand All @@ -26,5 +27,9 @@ public static class PlatformDetection
public static bool IsMonoLLVMAOT => _variant == "llvmaot";
public static bool IsMonoLLVMFULLAOT => _variant == "llvmfullaot";
public static bool IsMonoInterpreter => _variant == "monointerpreter";

public static bool IsMonoRuntime => Type.GetType("Mono.RuntimeStructs") != null;

public static bool IsNativeAot => !IsMonoRuntime && !RuntimeFeature.IsDynamicCodeSupported;
}
}
1 change: 1 addition & 0 deletions src/tests/Interop/COM/ComWrappers/API/ComWrappersTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NativeAotIncompatible>false</NativeAotIncompatible>
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.cs" />
Expand Down
1 change: 1 addition & 0 deletions src/tests/Interop/COM/ComWrappers/API/ComWrappersTestsBuiltInComDisabled.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NativeAotIncompatible>false</NativeAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.cs" />
Expand Down
10 changes: 8 additions & 2 deletions src/tests/Interop/COM/ComWrappers/API/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace ComWrappersTests
using System.Runtime.InteropServices;

using ComWrappersTests.Common;
using TestLibrary;
using Xunit;

class Program
Expand Down Expand Up @@ -713,8 +714,13 @@ static int Main()
ValidateBadComWrapperImpl();
ValidateRuntimeTrackerScenario();
ValidateQueryInterfaceAfterManagedObjectCollected();
ValidateAggregationWithComObject();
ValidateAggregationWithReferenceTrackerObject();

// Tracked by https://github.com/dotnet/runtime/issues/74620
if (!PlatformDetection.IsNativeAot)
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
{
ValidateAggregationWithComObject();
ValidateAggregationWithReferenceTrackerObject();
}

// Ensure all objects have been cleaned up.
ForceGC();
Expand Down