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

Expose configuring /nomidl. #1290

Merged
merged 2 commits into from
Mar 24, 2023
Merged

Expose configuring /nomidl. #1290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8d5dc0
Expose configuring /nomidl.
jlaanstra Mar 23, 2023
bfd29fb
Add test project and fix comments.
jlaanstra Mar 23, 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
1 change: 1 addition & 0 deletions nuget/Microsoft.Windows.CppWinRT.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<InterfaceIdentifierFileName Condition="'%(Midl.InterfaceIdentifierFileName)'==''">nul</InterfaceIdentifierFileName>
<ProxyFileName Condition="'%(Midl.ProxyFileName)'==''">nul</ProxyFileName>
<TypeLibraryName Condition="'%(Midl.TypeLibraryName)'==''"></TypeLibraryName>
<NoMidl>true</NoMidl>
jlaanstra marked this conversation as resolved.
Show resolved Hide resolved
</Midl>
<ProjectReference Condition="'$(XamlLanguage)' != 'C++' and '$(CppWinRTEnableDefaultCopyLocalFalse)' == 'true'">
<!-- By default, for a C++/WinRT project,
Expand Down
6 changes: 3 additions & 3 deletions nuget/Microsoft.Windows.CppWinRT.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ $(XamlMetaDataProviderPch)

<!--Insert Midl /references to Platform WinMDs, library reference WinMDs, and direct reference WinMDs-->
<Target Name="CppWinRTSetMidlReferences"
Condition="'$(CppWinRTModernIDL)' != 'false'"
jlaanstra marked this conversation as resolved.
Show resolved Hide resolved
DependsOnTargets="GetCppWinRTPlatformWinMDReferences;GetCppWinRTDirectWinMDReferences;GetCppWinRTProjectWinMDReferences;$(CppWinRTSetMidlReferencesDependsOn)"
Inputs="$(MSBuildAllProjects);@(CppWinRTDirectWinMDReferences);@(CppWinRTStaticProjectWinMDReferences);@(CppWinRTDynamicProjectWinMDReferences);@(CppWinRTPlatformWinMDReferences)"
Outputs="$(CppWinRTMidlResponseFile)">
Expand All @@ -475,8 +474,9 @@ $(XamlMetaDataProviderPch)
<_MidlReferences Include="@(CppWinRTPlatformWinMDReferences)"/>
<_MidlReferencesDistinct Remove="@(_MidlReferencesDistinct)" />
<_MidlReferencesDistinct Include="@(_MidlReferences->'%(WinMDPath)'->Distinct())" />
<Midl Condition="'%(Midl.DisableReferences)'==''">
<AdditionalOptions>%(Midl.AdditionalOptions) %40"$(CppWinRTMidlResponseFile)"</AdditionalOptions>
<Midl>
<AdditionalOptions Condition="'%(Midl.NoMidl)'!='false'">%(Midl.AdditionalOptions) /nomidl</AdditionalOptions>
<AdditionalOptions Condition="'%(Midl.DisableReferences)'!='false' or '%(Midl.NoMidl)'!='false'">%(Midl.AdditionalOptions) /nomidl %40"$(CppWinRTMidlResponseFile)"</AdditionalOptions>
jlaanstra marked this conversation as resolved.
Show resolved Hide resolved
</Midl>
</ItemGroup>
<PropertyGroup>
Expand Down