Skip to content

Support COM objects with dynamic keyword #33060

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

Merged
merged 29 commits into from
Mar 5, 2020
Merged

Support COM objects with dynamic keyword #33060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
21a9e9a
Copy ComInterop from IronLanguages/dlr. Add to Microsoft.CSharp
elinor-fung Feb 14, 2020
fe65c72
Remove netfx files. Remove netcoreapp suffix from file names.
elinor-fung Feb 11, 2020
45fba98
Update namespaces
elinor-fung Feb 14, 2020
0bfa713
Use SR.Format
elinor-fung Feb 11, 2020
1e7d474
TypeUtils.IsComObject -> Marshal.IsComObject
elinor-fung Feb 14, 2020
4c60f24
AstUtils.Convert -> ComInterop.Helpers.Convert
elinor-fung Feb 11, 2020
ada5d0b
AstUtils.Constant -> Expression.Constant
elinor-fung Feb 11, 2020
92cfcfb
Add System.Reflection.* references and allow unsafe
elinor-fung Feb 14, 2020
63ea5d5
Use built-in type aliases. Suppress warning for generated code.
elinor-fung Feb 11, 2020
3da7008
Use Array.Empty
elinor-fung Feb 14, 2020
b19a5be
Fix style violations
elinor-fung Feb 11, 2020
19a2447
Remove usage of ContractUtils and System.Security.Permissions
elinor-fung Feb 14, 2020
e146fd2
Make classes internal
elinor-fung Feb 14, 2020
48d9e26
License, style, auto-format
elinor-fung Feb 13, 2020
8fe1dad
Set ENABLECOMBINDER. Fix usage of ComBinder in CSharp*Binder
elinor-fung Feb 13, 2020
30a1bd1
Move error strings to resx. Remove unused strings
elinor-fung Feb 18, 2020
2c17d48
Add test project
elinor-fung Feb 21, 2020
ae2f127
Basic tests
elinor-fung Feb 21, 2020
8b3409f
Fix using COM events
elinor-fung Feb 25, 2020
e32e6fc
Event test
elinor-fung Feb 24, 2020
dffd54f
Parameters test
elinor-fung Feb 26, 2020
aa7afa5
Move System.Runtime.InteropServices.Variant to shared directory
elinor-fung Feb 26, 2020
d9b7424
Use nameof
elinor-fung Feb 27, 2020
1bf8c6a
Use Unsafe.AsPointer instead of creating dynamic assembly for method
elinor-fung Feb 27, 2020
c504b73
Move ComEventsMethod and ComEventsSink to shared directory
elinor-fung Feb 28, 2020
31c4519
Remove warning suppressions
elinor-fung Feb 28, 2020
02ae79f
Remove unused code
elinor-fung Feb 28, 2020
74613c1
PR feedback
elinor-fung Mar 4, 2020
f520012
PR feedback
elinor-fung Mar 5, 2020
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
22 changes: 16 additions & 6 deletions src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,16 +332,25 @@
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(FeatureCominterop)' == 'true'">
<Compile Include="$(CommonPath)System\Runtime\InteropServices\IDispatch.cs">
<Link>Common\System\Runtime\InteropServices\IDispatch.cs</Link>
</Compile>
<Compile Include="$(CommonPath)System\Runtime\InteropServices\ComEventsMethod.cs" Condition="'$(FeatureClassicCominterop)' == 'true'">
<Link>Common\System\Runtime\InteropServices\ComEventsMethod.cs</Link>
</Compile>
<Compile Include="$(CommonPath)System\Runtime\InteropServices\ComEventsSink.cs" Condition="'$(FeatureClassicCominterop)' == 'true'">
<Link>Common\System\Runtime\InteropServices\ComEventsSink.cs</Link>
</Compile>
<Compile Include="$(CommonPath)System\Runtime\InteropServices\Variant.cs" Condition="'$(FeatureClassicCominterop)' == 'true'">
<Link>Common\System\Runtime\InteropServices\Variant.cs</Link>
</Compile>
<Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\WindowsRuntime\ExceptionSupport.cs" />
<Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\WindowsRuntime\ActivationFactoryLoader.cs" Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\ComActivator.cs" Condition="'$(FeatureCominteropUnmanagedActivation)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\Microsoft\Win32\OAVariantLib.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\System\__ComObject.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComEventsHelper.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComEventsInfo.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComEventsMethod.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComEventsSink.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\Variant.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CustomMarshalers\ComDataHelpers.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CustomMarshalers\EnumVariantViewOfEnumerator.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
Expand All @@ -350,7 +359,6 @@
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CustomMarshalers\EnumeratorViewOfEnumVariant.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\IDispatch.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\WindowsRuntime\BindableVectorToCollectionAdapter.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\WindowsRuntime\BindableVectorToListAdapter.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\WindowsRuntime\CLRIKeyValuePairImpl.cs" />
Expand Down Expand Up @@ -411,7 +419,9 @@
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\InMemoryAssemblyLoader.cs" />
<Compile Include="$(BclSourcesRoot)\System\DateTime.Windows.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\Interop\Windows\OleAut32\Interop.VariantClear.cs" />
<Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
<Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
</Compile>
<Compile Include="$(BclSourcesRoot)\System\ApplicationModel.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
Expand Down Expand Up @@ -444,7 +454,7 @@
<PropertyGroup>
<FeatureAsyncCausalityTracer Condition="'$(FeatureCominterop)' == 'true'">true</FeatureAsyncCausalityTracer>
</PropertyGroup>

<ItemGroup>
<!-- This is the T4 template service and is added by VS anytime you modify a T4 template. Required for .tt files. -->
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/tests/src/Interop/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ if(CLR_CMAKE_TARGET_WIN32)
add_subdirectory(PInvoke/IEnumerator)
add_subdirectory(PInvoke/CustomMarshalers)
add_subdirectory(ArrayMarshalling/SafeArray)
add_subdirectory(COM/Dynamic/Server)
add_subdirectory(COM/NativeServer)
add_subdirectory(COM/NativeClients/Primitives)
add_subdirectory(COM/NativeClients/Licensing)
Expand Down
18 changes: 18 additions & 0 deletions src/coreclr/tests/src/Interop/COM/Dynamic/App.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity
type="win32"
name="COMDynamicTest"
version="1.0.0.0" />

<dependency>
<dependentAssembly>
<!-- RegFree COM -->
<assemblyIdentity
type="win32"
name="DynamicTestServer.X"
version="1.0.0.0"/>
</dependentAssembly>
</dependency>

</assembly>
Loading