diff --git a/Console/Console_TemporaryKey.pfx b/Console/Console_TemporaryKey.pfx deleted file mode 100644 index 35bcc63..0000000 Binary files a/Console/Console_TemporaryKey.pfx and /dev/null differ diff --git a/TestComponent/TestComponent_TemporaryKey.pfx b/TestComponent/TestComponent_TemporaryKey.pfx deleted file mode 100644 index bbb01d3..0000000 Binary files a/TestComponent/TestComponent_TemporaryKey.pfx and /dev/null differ diff --git a/test_component_derived/Nested.HierarchyC.cpp b/test_component_derived/Nested.HierarchyC.cpp index 1b39342..4b36755 100644 --- a/test_component_derived/Nested.HierarchyC.cpp +++ b/test_component_derived/Nested.HierarchyC.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "Nested.HierarchyC.h" +#include "Nested.HierarchyE.h" #include "Nested.HierarchyC.g.cpp" namespace winrt::test_component_derived::Nested::implementation @@ -21,25 +22,43 @@ namespace winrt::test_component_derived::Nested::implementation winrt::test_component_derived::Nested::HierarchyC HierarchyC::CreateDerivedHierarchyD() { - return HierarchyD(); + return winrt::test_component_derived::Nested::HierarchyD(); } Windows::Foundation::IInspectable HierarchyC::CreateDerivedHierarchyDAsObject() { - return HierarchyD(); + return winrt::test_component_derived::Nested::HierarchyD(); + } + + winrt::test_component_base::HierarchyB HierarchyC::CreateNonProjectedDerivedHierarchyEAsHierarchyB() + { + return make(); + } + + winrt::test_component_derived::Nested::HierarchyC HierarchyC::CreateNonProjectedDerivedHierarchyEAsHierarchyC() + { + return make(); } Windows::Foundation::Collections::IVector HierarchyC::CreateDerivedHierarchyDList() { Windows::Foundation::Collections::IVector list = - single_threaded_vector({ HierarchyD(), HierarchyD(), HierarchyD() }); + single_threaded_vector({ + winrt::test_component_derived::Nested::HierarchyD(), + winrt::test_component_derived::Nested::HierarchyD(), + winrt::test_component_derived::Nested::HierarchyD() + }); return list; } Windows::Foundation::Collections::IVector HierarchyC::CreateDerivedHierarchyDAsObjectList() { Windows::Foundation::Collections::IVector list = - single_threaded_vector({ HierarchyD(), HierarchyD(), HierarchyD() }); + single_threaded_vector({ + winrt::test_component_derived::Nested::HierarchyD(), + winrt::test_component_derived::Nested::HierarchyD(), + winrt::test_component_derived::Nested::HierarchyD() + }); return list; } } diff --git a/test_component_derived/Nested.HierarchyC.h b/test_component_derived/Nested.HierarchyC.h index 773558e..5ef8b53 100644 --- a/test_component_derived/Nested.HierarchyC.h +++ b/test_component_derived/Nested.HierarchyC.h @@ -12,6 +12,8 @@ namespace winrt::test_component_derived::Nested::implementation virtual winrt::hstring HierarchyC_Method(); static winrt::test_component_derived::Nested::HierarchyC CreateDerivedHierarchyD(); + static winrt::test_component_base::HierarchyB CreateNonProjectedDerivedHierarchyEAsHierarchyB(); + static winrt::test_component_derived::Nested::HierarchyC CreateNonProjectedDerivedHierarchyEAsHierarchyC(); static Windows::Foundation::IInspectable CreateDerivedHierarchyDAsObject(); static Windows::Foundation::Collections::IVector CreateDerivedHierarchyDList(); static Windows::Foundation::Collections::IVector CreateDerivedHierarchyDAsObjectList(); diff --git a/test_component_derived/Nested.HierarchyE.h b/test_component_derived/Nested.HierarchyE.h new file mode 100644 index 0000000..b444926 --- /dev/null +++ b/test_component_derived/Nested.HierarchyE.h @@ -0,0 +1,12 @@ +#pragma once +#include "Nested.HierarchyD.h" + +namespace winrt::test_component_derived::Nested::implementation +{ + struct HierarchyE : implements + { + HierarchyE() = default; + + hstring GetRuntimeClassName() const noexcept { return L"test_component_derived.Nested.HierarchyE"; } + }; +} diff --git a/test_component_derived/test_component_derived.idl b/test_component_derived/test_component_derived.idl index 442764c..e6996d6 100644 --- a/test_component_derived/test_component_derived.idl +++ b/test_component_derived/test_component_derived.idl @@ -10,6 +10,8 @@ namespace test_component_derived HierarchyC(String name); static HierarchyC CreateDerivedHierarchyD(); + static test_component_base.HierarchyB CreateNonProjectedDerivedHierarchyEAsHierarchyB(); + static HierarchyC CreateNonProjectedDerivedHierarchyEAsHierarchyC(); static Object CreateDerivedHierarchyDAsObject(); static Windows.Foundation.Collections.IVector CreateDerivedHierarchyDList(); static Windows.Foundation.Collections.IVector CreateDerivedHierarchyDAsObjectList(); diff --git a/test_component_derived/test_component_derived.vcxproj b/test_component_derived/test_component_derived.vcxproj index 643fcde..e2da0f6 100644 --- a/test_component_derived/test_component_derived.vcxproj +++ b/test_component_derived/test_component_derived.vcxproj @@ -1,164 +1,164 @@ - - - - - true - true - true - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E} - test_component_derived - test_component_derived - en-US - 14.0 - 10.0.18362.0 - 10.0.17134.0 - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - DynamicLibrary - v143 - v142 - Unicode - false - - - true - true - - - false - true - false - - - - - - - - - - - - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - - - - Use - pch.h - $(IntDir)pch.pch - Level4 - %(AdditionalOptions) /bigobj - - /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) - 28204 - _WINRT_DLL;%(PreprocessorDefinitions) - $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - - - Console - true - exports.def - - - - - _DEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - - - NDEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - - - - - - - - - - Create - - - - - - ..\test_component_base - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + + true + true + true + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E} + test_component_derived + test_component_derived + en-US + 14.0 + 10.0.18362.0 + 10.0.17134.0 + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + + + DynamicLibrary + v143 + v142 + Unicode + false + + + true + true + + + false + true + false + + + + + + + + + + + + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + + + + Use + pch.h + $(IntDir)pch.pch + Level4 + %(AdditionalOptions) /bigobj + + /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) + 28204 + _WINRT_DLL;%(PreprocessorDefinitions) + $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) + + + Console + true + exports.def + + + + + _DEBUG;%(PreprocessorDefinitions) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + + + NDEBUG;%(PreprocessorDefinitions) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + + + + + + + + + + + Create + + + + + + ..\test_component_base + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file