Make sure we pass StaticLibrary references as references to mdmerge. (#499)

jlaanstra · web-flow · commit 97a7b4eca8c1 · 2020-01-28T19:58:47.000-08:00
diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -308,11 +308,14 @@ Copyright (C) Microsoft Corporation. All rights reserved.
                 <MdMergeOutputFile>$(CppWinRTProjectWinMD)</MdMergeOutputFile>
             </_MdMergeInputs>
             <!-- Static libraries don't mdmerge other static libraries.
-                 Instead they are passed independent inputs for the compoenent projection. -->
+                 Instead they are passed as independent inputs for the component projection. -->
             <_MdMergeInputs Include="@(CppWinRTStaticProjectWinMDReferences)" Condition="'$(ConfigurationType)' != 'StaticLibrary'">
                 <MdMergeOutputFile>$(CppWinRTProjectWinMD)</MdMergeOutputFile>
             </_MdMergeInputs>
             <_MdMergeReferences Remove="@(_MdMergeReferences)" />
+            <!-- Static libraries don't mdmerge other static libraries.
+                 They are however used as references so idl can reference classes from other libs. -->
+            <_MdMergeReferences Include="@(CppWinRTStaticProjectWinMDReferences)" Condition="'$(ConfigurationType)' == 'StaticLibrary'" />
             <_MdMergeReferences Include="@(CppWinRTDirectWinMDReferences)" />
             <_MdMergeReferences Include="@(CppWinRTDynamicProjectWinMDReferences)" />
             <_MdMergeReferences Include="@(CppWinRTPlatformWinMDReferences)" />
diff --git a/test/nuget/Directory.Build.props b/test/nuget/Directory.Build.props
@@ -6,7 +6,10 @@
 
     <Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props','$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props','$(MSBuildThisFileDirectory)../'))" />
 
-    <PropertyGroup>        
+    <PropertyGroup>
+        <PlatformDirectoryName Condition="'$(Platform)' == 'Win32'">x86</PlatformDirectoryName>
+        <PlatformDirectoryName Condition="'$(Platform)' != 'Win32'">$(Platform)</PlatformDirectoryName>
+        
         <!-- Consistent output directory for AppContainer and non-AppContainer projects -->
         <!-- Build overrides the roots. -->
         <GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
diff --git a/test/nuget/TestApp/MainPage.cpp b/test/nuget/TestApp/MainPage.cpp
@@ -5,6 +5,8 @@
 using namespace winrt;
 using namespace Windows::UI::Xaml;
 
+using namespace winrt::TestApp::Library1;
+using namespace winrt::TestApp::Library4;
 using namespace winrt::TestRuntimeComponent1;
 using namespace winrt::TestRuntimeComponent2;
 using namespace winrt::TestRuntimeComponentCX;
@@ -30,12 +32,12 @@ namespace winrt::TestApp::implementation
         TestRuntimeComponentNamespaceUnderscoreClass cUnderscore{};
         cUnderscore.Test();
 
-        TestStaticLibrary1Class cStatic1{};
-        cStatic1.Test();
-
         TestStaticLibrary4Class cStatic4{};
         cStatic4.Test();
 
+        TestStaticLibrary1Class cStatic1{};
+        cStatic1.Test(cStatic4);
+
         TestStaticLibrary5Class cStatic5{};
         cStatic5.Test();
 
diff --git a/test/nuget/TestApp/pch.h b/test/nuget/TestApp/pch.h
@@ -14,6 +14,8 @@
 #include <winrt/Windows.UI.Xaml.Markup.h>
 #include <winrt/Windows.UI.Xaml.Navigation.h>
 
+#include <winrt/TestApp.Library1.h>
+#include <winrt/TestApp.Library4.h>
 #include <winrt/TestRuntimeComponent1.h>
 #include <winrt/TestRuntimeComponent2.h>
 #include <winrt/TestRuntimeComponentCX.h>
diff --git a/test/nuget/TestRuntimeComponent2/module.cpp b/test/nuget/TestRuntimeComponent2/module.cpp
@@ -40,9 +40,7 @@ int32_t __stdcall WINRT_CanUnloadNow() noexcept
 
 int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept try
 {
-    uint32_t length{};
-    wchar_t const* const buffer = WINRT_WindowsGetStringRawBuffer(classId, &length);
-    std::wstring_view const name{ buffer, length };
+    std::wstring_view const name{ *reinterpret_cast<winrt::hstring*>(&classId) };
     *factory = winrt_get_activation_factory(name);
 
     if (*factory)
diff --git a/test/nuget/TestRuntimeComponent3/module.cpp b/test/nuget/TestRuntimeComponent3/module.cpp
@@ -45,9 +45,7 @@ int32_t __stdcall WINRT_CanUnloadNow() noexcept
 
 int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept try
 {
-    uint32_t length{};
-    wchar_t const* const buffer = WINRT_WindowsGetStringRawBuffer(classId, &length);
-    std::wstring_view const name{ buffer, length };
+    std::wstring_view const name{ *reinterpret_cast<winrt::hstring*>(&classId) };
     *factory = winrt_get_activation_factory(name);
 
     if (*factory)
diff --git a/test/nuget/TestRuntimeComponentCSharp/TestRuntimeComponentCSharp.csproj b/test/nuget/TestRuntimeComponentCSharp/TestRuntimeComponentCSharp.csproj
@@ -18,23 +18,6 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/nuget/TestRuntimeComponentEmpty/module.cpp b/test/nuget/TestRuntimeComponentEmpty/module.cpp
@@ -45,9 +45,7 @@ int32_t __stdcall WINRT_CanUnloadNow() noexcept
 
 int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept try
 {
-    uint32_t length{};
-    wchar_t const* const buffer = WINRT_WindowsGetStringRawBuffer(classId, &length);
-    std::wstring_view const name{ buffer, length };
+    std::wstring_view const name{ *reinterpret_cast<winrt::hstring*>(&classId) };
     *factory = winrt_get_activation_factory(name);
 
     if (*factory)
diff --git a/test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj b/test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{2158F418-CA97-4599-8103-EFC133850BAA}</ProjectGuid>
     <Keyword>StaticLibrary</Keyword>
     <ProjectName>TestStaticLibrary1</ProjectName>
-    <RootNamespace>TestApp</RootNamespace>
+    <RootNamespace>TestApp.Library1</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
diff --git a/test/nuget/TestStaticLibrary1/TestStaticLibrary1Class.cpp b/test/nuget/TestStaticLibrary1/TestStaticLibrary1Class.cpp
@@ -2,11 +2,12 @@
 #include "TestStaticLibrary1Class.h"
 #include "TestStaticLibrary1Class.g.cpp"
 
-namespace winrt::TestApp::implementation
+using namespace winrt::TestApp::Library4;
+
+namespace winrt::TestApp::Library1::implementation
 {
-    void TestStaticLibrary1Class::Test()
+    void TestStaticLibrary1Class::Test(TestStaticLibrary4Class const& c)
     {
-        TestStaticLibrary4Class c{};
         c.Test();
     }
 }
diff --git a/test/nuget/TestStaticLibrary1/TestStaticLibrary1Class.h b/test/nuget/TestStaticLibrary1/TestStaticLibrary1Class.h
@@ -1,16 +1,16 @@
 #pragma once
 #include "TestStaticLibrary1Class.g.h"
 
-namespace winrt::TestApp::implementation
+namespace winrt::TestApp::Library1::implementation
 {
     struct TestStaticLibrary1Class : TestStaticLibrary1ClassT<TestStaticLibrary1Class>
     {
         TestStaticLibrary1Class() = default;
 
-        void Test();
+        void Test(TestApp::Library4::TestStaticLibrary4Class const& c);
     };
 }
-namespace winrt::TestApp::factory_implementation
+namespace winrt::TestApp::Library1::factory_implementation
 {
     struct TestStaticLibrary1Class : TestStaticLibrary1ClassT<TestStaticLibrary1Class, implementation::TestStaticLibrary1Class>
     {
diff --git a/test/nuget/TestStaticLibrary1/TestStaticLibrary1Class.idl b/test/nuget/TestStaticLibrary1/TestStaticLibrary1Class.idl
@@ -1,10 +1,10 @@
-namespace TestApp
+namespace TestApp.Library1
 {
     [default_interface]
     runtimeclass TestStaticLibrary1Class 
     {
         TestStaticLibrary1Class();
 
-        void Test();
+        void Test(TestApp.Library4.TestStaticLibrary4Class c);
     }
 }
diff --git a/test/nuget/TestStaticLibrary1/pch.h b/test/nuget/TestStaticLibrary1/pch.h
@@ -7,4 +7,4 @@
 
 #define WIN32_LEAN_AND_MEAN
 
-#include "winrt/TestApp.h"
+#include "winrt/TestApp.Library4.h"
diff --git a/test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj b/test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj
@@ -33,7 +33,7 @@
     <MinimalCoreWin>true</MinimalCoreWin>
     <ProjectGuid>{432068a4-b206-4468-9254-446cceb15a2c}</ProjectGuid>
     <Keyword>StaticLibrary</Keyword>
-    <RootNamespace>TestApp</RootNamespace>
+    <RootNamespace>TestApp.Library4</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
diff --git a/test/nuget/TestStaticLibrary4/TestStaticLibrary4Class.cpp b/test/nuget/TestStaticLibrary4/TestStaticLibrary4Class.cpp
@@ -7,7 +7,7 @@
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml::Core::Direct;
 
-namespace winrt::TestApp::implementation
+namespace winrt::TestApp::Library4::implementation
 {
     XamlDirect TestStaticLibrary4Class::Test()
     {
diff --git a/test/nuget/TestStaticLibrary4/TestStaticLibrary4Class.h b/test/nuget/TestStaticLibrary4/TestStaticLibrary4Class.h
@@ -2,7 +2,7 @@
 
 #include "TestStaticLibrary4Class.g.h"
 
-namespace winrt::TestApp::implementation
+namespace winrt::TestApp::Library4::implementation
 {
     struct TestStaticLibrary4Class : TestStaticLibrary4ClassT<TestStaticLibrary4Class>
     {
@@ -12,7 +12,7 @@ namespace winrt::TestApp::implementation
     };
 }
 
-namespace winrt::TestApp::factory_implementation
+namespace winrt::TestApp::Library4::factory_implementation
 {
     struct TestStaticLibrary4Class : TestStaticLibrary4ClassT<TestStaticLibrary4Class, implementation::TestStaticLibrary4Class>
     {
diff --git a/test/nuget/TestStaticLibrary4/TestStaticLibrary4Class.idl b/test/nuget/TestStaticLibrary4/TestStaticLibrary4Class.idl
@@ -1,4 +1,4 @@
-namespace TestApp
+namespace TestApp.Library4
 {
     [default_interface]
     runtimeclass TestStaticLibrary4Class 

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ int32_t __stdcall WINRT_CanUnloadNow() noexcept`
`40`	`40`
`41`	`41`	`int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept try`
`42`	`42`	`{`
`43`		`- uint32_t length{};`
`44`		`- wchar_t const* const buffer = WINRT_WindowsGetStringRawBuffer(classId, &length);`
`45`		`- std::wstring_view const name{ buffer, length };`
	`43`	`+ std::wstring_view const name{ reinterpret_cast<winrt::hstring>(&classId) };`
`46`	`44`	`*factory = winrt_get_activation_factory(name);`
`47`	`45`
`48`	`46`	`if (*factory)`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,7 @@ int32_t __stdcall WINRT_CanUnloadNow() noexcept`
`45`	`45`
`46`	`46`	`int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept try`
`47`	`47`	`{`
`48`		`- uint32_t length{};`
`49`		`- wchar_t const* const buffer = WINRT_WindowsGetStringRawBuffer(classId, &length);`
`50`		`- std::wstring_view const name{ buffer, length };`
	`48`	`+ std::wstring_view const name{ reinterpret_cast<winrt::hstring>(&classId) };`
`51`	`49`	`*factory = winrt_get_activation_factory(name);`
`52`	`50`
`53`	`51`	`if (*factory)`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,12 @@`
`2`	`2`	`#include "TestStaticLibrary1Class.h"`
`3`	`3`	`#include "TestStaticLibrary1Class.g.cpp"`
`4`	`4`
`5`		`-namespace winrt::TestApp::implementation`
	`5`	`+using namespace winrt::TestApp::Library4;`
	`6`	`+`
	`7`	`+namespace winrt::TestApp::Library1::implementation`
`6`	`8`	`{`
`7`		`- void TestStaticLibrary1Class::Test()`
	`9`	`+ void TestStaticLibrary1Class::Test(TestStaticLibrary4Class const& c)`
`8`	`10`	`{`
`9`		`- TestStaticLibrary4Class c{};`
`10`	`11`	`c.Test();`
`11`	`12`	`}`
`12`	`13`	`}`