Skip to content

Commit c85c9f6

Browse files
beervoleybeervoley
committed
fix some issues
1 parent ec94031 commit c85c9f6

File tree

58 files changed

+339
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+339
-502
lines changed

‎source/winappsdk/AdaptiveCardsObjectModel/AdaptiveCards.ObjectModel.WinUI3.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10736,7 +10736,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveOpe
1073610736
*
1073710737
* Class implements the following interfaces:
1073810738
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveOpenUrlActionParser ** Default Interface **
10739-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
10739+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
1074010740
*
1074110741
* Class Threading Model: Both Single and Multi Threaded Apartment
1074210742
*
@@ -10808,7 +10808,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveSho
1080810808
*
1080910809
* Class implements the following interfaces:
1081010810
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveShowCardActionParser ** Default Interface **
10811-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
10811+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
1081210812
*
1081310813
* Class Threading Model: Both Single and Multi Threaded Apartment
1081410814
*
@@ -10880,7 +10880,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveSub
1088010880
*
1088110881
* Class implements the following interfaces:
1088210882
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveSubmitActionParser ** Default Interface **
10883-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
10883+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
1088410884
*
1088510885
* Class Threading Model: Both Single and Multi Threaded Apartment
1088610886
*
@@ -10952,7 +10952,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveExe
1095210952
*
1095310953
* Class implements the following interfaces:
1095410954
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveExecuteActionParser ** Default Interface **
10955-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
10955+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
1095610956
*
1095710957
* Class Threading Model: Both Single and Multi Threaded Apartment
1095810958
*
@@ -11024,7 +11024,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveTog
1102411024
*
1102511025
* Class implements the following interfaces:
1102611026
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveToggleVisibilityActionParser ** Default Interface **
11027-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
11027+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
1102811028
*
1102911029
* Class Threading Model: Both Single and Multi Threaded Apartment
1103011030
*
@@ -30733,7 +30733,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveOpe
3073330733
*
3073430734
* Class implements the following interfaces:
3073530735
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveOpenUrlActionParser ** Default Interface **
30736-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
30736+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
3073730737
*
3073830738
* Class Threading Model: Both Single and Multi Threaded Apartment
3073930739
*
@@ -30842,7 +30842,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveSho
3084230842
*
3084330843
* Class implements the following interfaces:
3084430844
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveShowCardActionParser ** Default Interface **
30845-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
30845+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
3084630846
*
3084730847
* Class Threading Model: Both Single and Multi Threaded Apartment
3084830848
*
@@ -30951,7 +30951,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveSub
3095130951
*
3095230952
* Class implements the following interfaces:
3095330953
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveSubmitActionParser ** Default Interface **
30954-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
30954+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
3095530955
*
3095630956
* Class Threading Model: Both Single and Multi Threaded Apartment
3095730957
*
@@ -31060,7 +31060,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveExe
3106031060
*
3106131061
* Class implements the following interfaces:
3106231062
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveExecuteActionParser ** Default Interface **
31063-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
31063+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
3106431064
*
3106531065
* Class Threading Model: Both Single and Multi Threaded Apartment
3106631066
*
@@ -31169,7 +31169,7 @@ EXTERN_C const IID IID___x_ABI_CAdaptiveCards_CObjectModel_CWinUI3_CIAdaptiveTog
3116931169
*
3117031170
* Class implements the following interfaces:
3117131171
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveToggleVisibilityActionParser ** Default Interface **
31172-
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveElementParser
31172+
* AdaptiveCards.ObjectModel.WinUI3.IAdaptiveActionParser
3117331173
*
3117431174
* Class Threading Model: Both Single and Multi Threaded Apartment
3117531175
*

‎source/winappsdk/AdaptiveCardsObjectModel/idl/AdaptiveCards.ObjectModel.WinUI3.idl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -828,27 +828,27 @@ namespace AdaptiveCards.ObjectModel.WinUI3
828828
AdaptiveActionSetParser();
829829
};
830830

831-
[default_interface] runtimeclass AdaptiveOpenUrlActionParser : IAdaptiveElementParser
831+
[default_interface] runtimeclass AdaptiveOpenUrlActionParser : IAdaptiveActionParser
832832
{
833833
AdaptiveOpenUrlActionParser();
834834
};
835835

836-
[default_interface] runtimeclass AdaptiveShowCardActionParser : IAdaptiveElementParser
836+
[default_interface] runtimeclass AdaptiveShowCardActionParser : IAdaptiveActionParser
837837
{
838838
AdaptiveShowCardActionParser();
839839
};
840840

841-
[default_interface] runtimeclass AdaptiveSubmitActionParser : IAdaptiveElementParser
841+
[default_interface] runtimeclass AdaptiveSubmitActionParser : IAdaptiveActionParser
842842
{
843843
AdaptiveSubmitActionParser();
844844
};
845845

846-
[default_interface] runtimeclass AdaptiveExecuteActionParser : IAdaptiveElementParser
846+
[default_interface] runtimeclass AdaptiveExecuteActionParser : IAdaptiveActionParser
847847
{
848848
AdaptiveExecuteActionParser();
849849
};
850850

851-
[default_interface] runtimeclass AdaptiveToggleVisibilityActionParser : IAdaptiveElementParser
851+
[default_interface] runtimeclass AdaptiveToggleVisibilityActionParser : IAdaptiveActionParser
852852
{
853853
AdaptiveToggleVisibilityActionParser();
854854
};

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveExecuteActionParser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1111
{
12-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement AdaptiveExecuteActionParser::FromJson(
12+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement AdaptiveExecuteActionParser::FromJson(
1313
winrt::Windows::Data::Json::JsonObject const& inputJson,
1414
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,
1616
winrt::Windows::Foundation::Collections::IVector<winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveWarning> const& warnings)
1717
{
1818
return ::AdaptiveCards::ObjectModel::WinUI3::FromJson<implementation::AdaptiveExecuteAction, ::AdaptiveCards::ExecuteAction, ::AdaptiveCards::ExecuteActionParser>(
1919
inputJson, elementParsers, actionParsers, warnings)
20-
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement>();
20+
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement>();
2121
}
2222
}

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveExecuteActionParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1010
{
1111
AdaptiveExecuteActionParser() = default;
1212

13-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement FromJson(
13+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement FromJson(
1414
winrt::Windows::Data::Json::JsonObject const& inputJson,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1616
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveOpenUrlActionParser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1111
{
12-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement AdaptiveOpenUrlActionParser::FromJson(
12+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement AdaptiveOpenUrlActionParser::FromJson(
1313
winrt::Windows::Data::Json::JsonObject const& inputJson,
1414
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,
1616
winrt::Windows::Foundation::Collections::IVector<winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveWarning> const& warnings)
1717
{
1818
return ::AdaptiveCards::ObjectModel::WinUI3::FromJson<implementation::AdaptiveOpenUrlAction, ::AdaptiveCards::OpenUrlAction, ::AdaptiveCards::OpenUrlActionParser>(
1919
inputJson, elementParsers, actionParsers, warnings)
20-
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement>();
20+
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement>();
2121
}
2222
}

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveOpenUrlActionParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1010
{
1111
AdaptiveOpenUrlActionParser() = default;
1212

13-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement FromJson(
13+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement FromJson(
1414
winrt::Windows::Data::Json::JsonObject const& inputJson,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1616
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveShowCardActionParser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1111
{
12-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement AdaptiveShowCardActionParser::FromJson(
12+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement AdaptiveShowCardActionParser::FromJson(
1313
winrt::Windows::Data::Json::JsonObject const& inputJson,
1414
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,
1616
winrt::Windows::Foundation::Collections::IVector<winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveWarning> const& warnings)
1717
{
1818
return ::AdaptiveCards::ObjectModel::WinUI3::FromJson<implementation::AdaptiveShowCardAction, ::AdaptiveCards::ShowCardAction, ::AdaptiveCards::ShowCardActionParser>(
1919
inputJson, elementParsers, actionParsers, warnings)
20-
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement>();
20+
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement>();
2121
}
2222
}

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveShowCardActionParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1010
{
1111
AdaptiveShowCardActionParser() = default;
1212

13-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement FromJson(
13+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement FromJson(
1414
winrt::Windows::Data::Json::JsonObject const& inputJson,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1616
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveSubmitActionParser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1111
{
12-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement AdaptiveSubmitActionParser::FromJson(
12+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement AdaptiveSubmitActionParser::FromJson(
1313
winrt::Windows::Data::Json::JsonObject const& inputJson,
1414
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,
1616
winrt::Windows::Foundation::Collections::IVector<winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveWarning> const& warnings)
1717
{
1818
return ::AdaptiveCards::ObjectModel::WinUI3::FromJson<implementation::AdaptiveSubmitAction, ::AdaptiveCards::SubmitAction, ::AdaptiveCards::SubmitActionParser>(
1919
inputJson, elementParsers, actionParsers, warnings)
20-
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement>();
20+
.as<winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement>();
2121
}
2222
}

‎source/winappsdk/AdaptiveCardsObjectModel/lib/AdaptiveSubmitActionParser.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ namespace winrt::AdaptiveCards::ObjectModel::WinUI3::implementation
1010
{
1111
AdaptiveSubmitActionParser() = default;
1212

13-
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveCardElement FromJson(
13+
winrt::AdaptiveCards::ObjectModel::WinUI3::IAdaptiveActionElement FromJson(
1414
winrt::Windows::Data::Json::JsonObject const& inputJson,
1515
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveElementParserRegistration const& elementParsers,
1616
winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveActionParserRegistration const& actionParsers,
1717
winrt::Windows::Foundation::Collections::IVector<winrt::AdaptiveCards::ObjectModel::WinUI3::AdaptiveWarning> const& warnings);
18+
1819
};
1920
}
2021
namespace winrt::AdaptiveCards::ObjectModel::WinUI3::factory_implementation

0 commit comments

Comments
 (0)