Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed Console/Console_TemporaryKey.pfx
Binary file not shown.
Binary file removed TestComponent/TestComponent_TemporaryKey.pfx
Binary file not shown.
27 changes: 23 additions & 4 deletions test_component_derived/Nested.HierarchyC.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<test_component_derived::Nested::implementation::HierarchyE>();
}

winrt::test_component_derived::Nested::HierarchyC HierarchyC::CreateNonProjectedDerivedHierarchyEAsHierarchyC()
{
return make<test_component_derived::Nested::implementation::HierarchyE>();
}

Windows::Foundation::Collections::IVector<winrt::test_component_derived::Nested::HierarchyC> HierarchyC::CreateDerivedHierarchyDList()
{
Windows::Foundation::Collections::IVector<winrt::test_component_derived::Nested::HierarchyC> list =
single_threaded_vector<winrt::test_component_derived::Nested::HierarchyC>({ HierarchyD(), HierarchyD(), HierarchyD() });
single_threaded_vector<winrt::test_component_derived::Nested::HierarchyC>({
winrt::test_component_derived::Nested::HierarchyD(),
winrt::test_component_derived::Nested::HierarchyD(),
winrt::test_component_derived::Nested::HierarchyD()
});
return list;
}

Windows::Foundation::Collections::IVector<Windows::Foundation::IInspectable> HierarchyC::CreateDerivedHierarchyDAsObjectList()
{
Windows::Foundation::Collections::IVector<Windows::Foundation::IInspectable> list =
single_threaded_vector<Windows::Foundation::IInspectable>({ HierarchyD(), HierarchyD(), HierarchyD() });
single_threaded_vector<Windows::Foundation::IInspectable>({
winrt::test_component_derived::Nested::HierarchyD(),
winrt::test_component_derived::Nested::HierarchyD(),
winrt::test_component_derived::Nested::HierarchyD()
});
return list;
}
}
2 changes: 2 additions & 0 deletions test_component_derived/Nested.HierarchyC.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<winrt::test_component_derived::Nested::HierarchyC> CreateDerivedHierarchyDList();
static Windows::Foundation::Collections::IVector <Windows::Foundation::IInspectable> CreateDerivedHierarchyDAsObjectList();
Expand Down
12 changes: 12 additions & 0 deletions test_component_derived/Nested.HierarchyE.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#pragma once
#include "Nested.HierarchyD.h"

namespace winrt::test_component_derived::Nested::implementation
{
struct HierarchyE : implements<HierarchyE, test_component_derived::Nested::implementation::HierarchyD>
{
HierarchyE() = default;

hstring GetRuntimeClassName() const noexcept { return L"test_component_derived.Nested.HierarchyE"; }
};
}
2 changes: 2 additions & 0 deletions test_component_derived/test_component_derived.idl
Original file line number Diff line number Diff line change
Expand Up @@ -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<HierarchyC> CreateDerivedHierarchyDList();
static Windows.Foundation.Collections.IVector<Object> CreateDerivedHierarchyDAsObjectList();
Expand Down
Loading
Loading