diff --git a/dev/Generated/FontIconSource.properties.cpp b/dev/Generated/FontIconSource.properties.cpp index a5901cca32..f46a0f369b 100644 --- a/dev/Generated/FontIconSource.properties.cpp +++ b/dev/Generated/FontIconSource.properties.cpp @@ -32,7 +32,7 @@ void FontIconSourceProperties::EnsureProperties() winrt::name_of(), winrt::name_of(), false /* isAttached */, - ValueHelper::BoxValueIfNecessary({ c_fontIconSourceDefaultFontFamily }), + ValueHelper::BoxValueIfNecessary(winrt::FontFamily{ c_fontIconSourceDefaultFontFamily }), nullptr); } if (!s_FontSizeProperty) diff --git a/dev/IconSource/IconSource.idl b/dev/IconSource/IconSource.idl index 447d25b52a..3b0e30c076 100644 --- a/dev/IconSource/IconSource.idl +++ b/dev/IconSource/IconSource.idl @@ -1,4 +1,4 @@ -namespace MU_XC_NAMESPACE +namespace MU_XC_NAMESPACE { [WUXC_VERSION_RS3] @@ -40,7 +40,7 @@ unsealed runtimeclass FontIconSource : IconSource String Glyph { get; set; }; [MUX_DEFAULT_VALUE("20.0")] Double FontSize { get; set; }; - [MUX_DEFAULT_VALUE("{ c_fontIconSourceDefaultFontFamily }")] + [MUX_DEFAULT_VALUE("winrt::FontFamily{ c_fontIconSourceDefaultFontFamily }")] Windows.UI.Xaml.Media.FontFamily FontFamily { get; set; }; [MUX_DEFAULT_VALUE("{ 400 }")] Windows.UI.Text.FontWeight FontWeight { get; set; }; @@ -90,4 +90,4 @@ unsealed runtimeclass PathIconSource : IconSource static Windows.UI.Xaml.DependencyProperty DataProperty { get; }; } -} \ No newline at end of file +} diff --git a/dev/PullToRefresh/RefreshContainer/RefreshContainer.cpp b/dev/PullToRefresh/RefreshContainer/RefreshContainer.cpp index 02d8e9356e..b02c999d34 100644 --- a/dev/PullToRefresh/RefreshContainer/RefreshContainer.cpp +++ b/dev/PullToRefresh/RefreshContainer/RefreshContainer.cpp @@ -333,7 +333,7 @@ void RefreshContainer::RaiseRefreshRequested() PTR_TRACE_INFO(nullptr, TRACE_MSG_METH, METH_NAME, this); com_ptr strongThis = get_strong(); - winrt::DeferralCompletedHandler instance{ [strongThis]() + winrt::Deferral instance{ [strongThis]() { strongThis->CheckThread(); strongThis->RefreshCompleted(); diff --git a/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizer.cpp b/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizer.cpp index 2d5038579c..1e5da46dda 100644 --- a/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizer.cpp +++ b/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizer.cpp @@ -503,7 +503,7 @@ void RefreshVisualizer::RaiseRefreshRequested() PTR_TRACE_INFO(nullptr, TRACE_MSG_METH, METH_NAME, this); com_ptr strongThis = get_strong(); - winrt::DeferralCompletedHandler instance{ [strongThis]() + winrt::Deferral instance{ [strongThis]() { strongThis->CheckThread(); strongThis->RefreshCompleted(); diff --git a/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizerEventArgs.cpp b/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizerEventArgs.cpp index 45fae00e91..e7ce8080f6 100644 --- a/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizerEventArgs.cpp +++ b/dev/PullToRefresh/RefreshVisualizer/RefreshVisualizerEventArgs.cpp @@ -44,7 +44,7 @@ winrt::Deferral RefreshRequestedEventArgs::GetDeferral() com_ptr strongThis = get_strong(); - winrt::DeferralCompletedHandler instance{ [strongThis]() + winrt::Deferral instance{ [strongThis]() { strongThis->CheckThread(); strongThis->DecrementDeferralCount(); diff --git a/dev/TeachingTip/TeachingTip.cpp b/dev/TeachingTip/TeachingTip.cpp index dbab2e7aa6..54c32371b1 100644 --- a/dev/TeachingTip/TeachingTip.cpp +++ b/dev/TeachingTip/TeachingTip.cpp @@ -1235,7 +1235,7 @@ void TeachingTip::RaiseClosingEvent(bool attachDeferralCompletedHandler) if (attachDeferralCompletedHandler) { - winrt::DeferralCompletedHandler instance{ [strongThis = get_strong(), args]() + winrt::Deferral instance{ [strongThis = get_strong(), args]() { strongThis->CheckThread(); if (!args->Cancel()) diff --git a/dev/TeachingTip/TeachingTipClosingEventArgs.cpp b/dev/TeachingTip/TeachingTipClosingEventArgs.cpp index e252f609c5..d987de2c07 100644 --- a/dev/TeachingTip/TeachingTipClosingEventArgs.cpp +++ b/dev/TeachingTip/TeachingTipClosingEventArgs.cpp @@ -28,7 +28,7 @@ winrt::Deferral TeachingTipClosingEventArgs::GetDeferral() com_ptr strongThis = get_strong(); - winrt::DeferralCompletedHandler instance{ [strongThis]() + winrt::Deferral instance{ [strongThis]() { strongThis->CheckThread(); strongThis->DecrementDeferralCount(); diff --git a/dev/dll/Microsoft.UI.Xaml.vcxproj b/dev/dll/Microsoft.UI.Xaml.vcxproj index d840bc2bdf..d4a427b8e1 100644 --- a/dev/dll/Microsoft.UI.Xaml.vcxproj +++ b/dev/dll/Microsoft.UI.Xaml.vcxproj @@ -2,7 +2,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -624,8 +624,8 @@ "$(WindowsSdkDir)bin\$(WindowsTargetPlatformVersion)\$(PreferredToolArchitecture)\mdmerge.exe" - <_MdMergeParameters>-v @(_MdMergeRefsDistinct->'-metadata_dir "%(RelativeDir)."', ' ') - <_MdMergeParameters>$(_MdMergeParameters) -o "$(OutDir)\sdk" -i "$(CppWinRTUnmergedDir)" -partial -n:3 -createPublicMetadata -transformExperimental:transform + <_MdMergeParameters>-v @(CppWinRTMdMergeMetadataDirectories->'-metadata_dir "%(RelativeDir)."', ' ') + <_MdMergeParameters>$(_MdMergeParameters) -o "$(OutDir)\sdk" @(CppWinRTMdMergeInputs->'-i "%(Identity)"', ' ') -partial -n:3 -createPublicMetadata -transformExperimental:transform @@ -661,8 +661,8 @@ - - + + diff --git a/dev/dll/packages.config b/dev/dll/packages.config index 07dab78ada..2955dcca87 100644 --- a/dev/dll/packages.config +++ b/dev/dll/packages.config @@ -5,7 +5,7 @@ - + \ No newline at end of file