Skip to content

Moving CsWinRTGenerateManagedDllGetActivationFactory to right target #1991

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
Manodasan Wignarajah (manodasanW) merged 2 commits into from
May 16, 2025
Merged

Moving CsWinRTGenerateManagedDllGetActivationFactory to right target #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a7e087
Move property from authoring targets to main targets to reflect use i…
manodasanW May 16, 2025
ba1e3dc
Fix warning
manodasanW May 16, 2025
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: 0 additions & 3 deletions nuget/Microsoft.Windows.CsWinRT.Authoring.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.

<!-- Set the additional activation factory generation based on WinRTRuntimeClassName attribute to not be opt-in by default -->
<CsWinRTGenerateOverridedClassNameActivationFactory Condition="'$(CsWinRTGenerateOverridedClassNameActivationFactory)' != 'true'">false</CsWinRTGenerateOverridedClassNameActivationFactory>
<!-- Generate a C# version of DllGetActivationFactory which matches the native export. -->
<CsWinRTGenerateManagedDllGetActivationFactory Condition="'$(CsWinRTGenerateManagedDllGetActivationFactory)' != 'true'">false</CsWinRTGenerateManagedDllGetActivationFactory>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -39,7 +37,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<CompilerVisibleProperty Include="CsWinRTGenerateProjection" />
<CompilerVisibleProperty Include="CsWinRTAuthoringInputs" />
<CompilerVisibleProperty Include="CsWinRTGenerateOverridedClassNameActivationFactory" />
<CompilerVisibleProperty Include="CsWinRTGenerateManagedDllGetActivationFactory" />
</ItemGroup>

<!-- Note this runs before the msbuild editor config file is generated because that is what is used to pass properties to the source generator. -->
Expand Down
4 changes: 4 additions & 0 deletions nuget/Microsoft.Windows.CsWinRT.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-->
<CsWinRTUseEnvironmentalTools Condition="'$(CsWinRTUseEnvironmentalTools)' == '' AND '$(VSCMD_VER)' != ''">true</CsWinRTUseEnvironmentalTools>
<CsWinRTUseEnvironmentalTools Condition="'$(CsWinRTUseEnvironmentalTools)' == ''">false</CsWinRTUseEnvironmentalTools>

<!-- Generate a C# version of DllGetActivationFactory which matches the native export. -->
<CsWinRTGenerateManagedDllGetActivationFactory Condition="'$(CsWinRTGenerateManagedDllGetActivationFactory)' != 'true'">false</CsWinRTGenerateManagedDllGetActivationFactory>
</PropertyGroup>

<ItemGroup>
Expand All @@ -62,6 +65,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<CompilerVisibleProperty Include="CsWinRTCcwLookupTableGeneratorEnabled" />
<CompilerVisibleProperty Include="CsWinRTMergeReferencedActivationFactories" />
<CompilerVisibleProperty Include="CsWinRTAotWarningLevel" />
<CompilerVisibleProperty Include="CsWinRTGenerateManagedDllGetActivationFactory" />
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Embedded.targets" Condition="'$(CsWinRTEmbedded)' == 'true'"/>
Expand Down
2 changes: 1 addition & 1 deletion src/cswinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5883,7 +5883,7 @@ return (eventSource.Subscribe, eventSource.Unsubscribe);
}
}

std::string get_vmethod_delegate_type(writer& w, MethodDef const& method, std::string vmethod_name)
std::string get_vmethod_delegate_type(writer& w, MethodDef const& method, std::string)
{
method_signature signature{ method };
if (is_special(method))
Expand Down