Skip to content

Commit 7481085

Browse files
committed
Point UWP projects at shared IDLs
1 parent c616590 commit 7481085

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

source/uwp/AdaptiveCardsObjectModel/AdaptiveCardsObjectModel.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
</ProjectReference>
131131
</ItemGroup>
132132
<ItemGroup>
133-
<Midl Include="idl\AdaptiveCards.ObjectModel.Uwp.idl">
134-
<HeaderFileName>%(Filename).h</HeaderFileName>
133+
<Midl Include="..\SharedObjectModel\idl\AdaptiveCards.ObjectModel.Shared.idl">
134+
<HeaderFileName>AdaptiveCards.ObjectModel.Uwp.h</HeaderFileName>
135135
<!-- Enable Windows Runtime ABI header files. when /reference is passed to midl.exe, the ABI head includes headers
136136
like Windows.AI.MachineLearning.MachineLearningContract.h which doesn't exist actually in SDK. To workaround
137137
the problem, DisableReferences is enabled to disable /reference. -->

source/uwp/AdaptiveCardsObjectModel/AdaptiveCardsObjectModel.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Midl Include="idl\AdaptiveCards.ObjectModel.Uwp.idl" />
4+
<Midl Include="..\SharedObjectModel\idl\AdaptiveCards.ObjectModel.Shared.idl" />
55
</ItemGroup>
66
<ItemGroup>
77
<None Include="packages.config" />

source/uwp/Renderer/AdaptiveCardRenderer.vcxproj

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,21 +166,13 @@
166166
</ProjectReference>
167167
</ItemGroup>
168168
<ItemGroup>
169-
<Midl Include="idl\AdaptiveCards.Rendering.Uwp.idl">
170-
<HeaderFileName>%(Filename).h</HeaderFileName>
169+
<Midl Include="..\SharedRenderer\idl\AdaptiveCards.Rendering.Shared.idl">
170+
<HeaderFileName>AdaptiveCards.Rendering.Uwp.h</HeaderFileName>
171171
<!-- Enable Windows Runtime ABI header files. when /reference is passed to midl.exe, the ABI head includes headers
172172
like Windows.AI.MachineLearning.MachineLearningContract.h which doesn't exist actually in SDK. To workaround
173173
the problem, DisableReferences is enabled to disable /reference. -->
174174
<DisableReferences>true</DisableReferences>
175-
<AdditionalIncludeDirectories>$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
176-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl;..\AdaptiveCardsObjectModel</AdditionalIncludeDirectories>
177-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
178-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
179-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
180-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
181-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
182-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
183-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(WindowsSDK_IncludePath);..\AdaptiveCardsObjectModel\idl</AdditionalIncludeDirectories>
175+
<AdditionalIncludeDirectories>$(WindowsSDK_IncludePath);..\SharedObjectModel\idl</AdditionalIncludeDirectories>
184176
</Midl>
185177
</ItemGroup>
186178
<ItemGroup>

source/uwp/Renderer/AdaptiveCardRenderer.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Midl Include="idl\AdaptiveCards.Rendering.Uwp.idl" />
4+
<Midl Include="..\SharedRenderer\idl\AdaptiveCards.Rendering.Shared.idl" />
55
</ItemGroup>
66
<ItemGroup>
77
<None Include="packages.config" />

0 commit comments

Comments
 (0)