зеркало из https://github.com/microsoft/Win2D.git
Merged PR 16192: Update Win2D to support Reunion 0.8.0
Updates Win2D to depend on Reunion 0.8.0 Includes some breaking changes: - Microsoft.System.DispatcherQueue -> Microsoft.UI.Dispatching.DispatcherQueue - Microsoft.Graphics.IGeometrySource2D -> Windows.Graphcis.IGeometrySource2D
This commit is contained in:
Родитель
9d6415137f
Коммит
0ad9590fe0
|
@ -35,6 +35,10 @@
|
|||
<Platforms>AnyCPU</Platforms>
|
||||
<BinDir>Windows</BinDir>
|
||||
</AnyCPUProject>
|
||||
<AnyCPUProject>
|
||||
<Platforms>AnyCPU</Platforms>
|
||||
<BinDir>Windows</BinDir>
|
||||
</AnyCPUProject>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.5.7
|
||||
0.8.0
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ProjectReunion" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ProjectReunion" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" targetFramework="native" />
|
||||
</packages>
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{8cf21e5d-e0a2-4fe7-8e2b-a025cf52dcfb}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
|
@ -17,7 +17,7 @@
|
|||
<ItemsRootNamespace>Microsoft.Graphics.Canvas</ItemsRootNamespace>
|
||||
<TargetName>$(ItemsRootNamespace)</TargetName>
|
||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SkipAddPriPayloadFilesToCopyToOutputDirectoryItems>true</SkipAddPriPayloadFilesToCopyToOutputDirectoryItems>
|
||||
|
@ -107,13 +107,13 @@
|
|||
<PropertyGroup>
|
||||
<ErrorText>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}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
</Project>
|
|
@ -423,7 +423,7 @@ namespace Microsoft.Graphics.Canvas.Geometry
|
|||
runtimeclass CanvasGeometry
|
||||
{
|
||||
[default] interface ICanvasGeometry;
|
||||
interface Microsoft.Graphics.IGeometrySource2D;
|
||||
interface Windows.Graphics.IGeometrySource2D;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "drawing/CanvasStrokeStyle.h"
|
||||
#include "Microsoft.Graphics.Interop.h"
|
||||
|
||||
namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { namespace Geometry
|
||||
{
|
||||
|
@ -81,8 +80,8 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na
|
|||
ID2D1Geometry,
|
||||
CanvasGeometry,
|
||||
ICanvasGeometry,
|
||||
ABI::Microsoft::Graphics::IGeometrySource2D,
|
||||
ABI::Microsoft::Graphics::IGeometrySource2DInterop,
|
||||
ABI::Windows::Graphics::IGeometrySource2D,
|
||||
ABI::Windows::Graphics::IGeometrySource2DInterop,
|
||||
CloakedIid<ICanvasResourceWrapperWithDevice>)
|
||||
{
|
||||
InspectableClass(RuntimeClass_Microsoft_Graphics_Canvas_Geometry_CanvasGeometry, BaseTrust);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ProjectReunion" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.Windows.AbiWinRT" version="2.0.210330.2" targetFramework="native" />
|
||||
<package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
|
||||
</packages>
|
|
@ -17,8 +17,8 @@ ComPtr<ICanvasDevice> DefaultPrintDocumentAdapter::GetSharedDevice()
|
|||
|
||||
ComPtr<IDispatcherQueue> DefaultPrintDocumentAdapter::GetDispatcherForCurrentThread()
|
||||
{
|
||||
ComPtr<ABI::Microsoft::System::IDispatcherQueueStatics> dispatcherQueueStatic;
|
||||
ThrowIfFailed(GetActivationFactory(HStringReference(RuntimeClass_Microsoft_System_DispatcherQueue).Get(), &dispatcherQueueStatic));
|
||||
ComPtr<ABI::Microsoft::UI::Dispatching::IDispatcherQueueStatics> dispatcherQueueStatic;
|
||||
ThrowIfFailed(GetActivationFactory(HStringReference(RuntimeClass_Microsoft_UI_Dispatching_DispatcherQueue).Get(), &dispatcherQueueStatic));
|
||||
|
||||
ComPtr<IDispatcherQueue> dispatcherQueue;
|
||||
ThrowIfFailed(dispatcherQueueStatic->GetForCurrentThread(&dispatcherQueue));
|
||||
|
|
|
@ -58,7 +58,7 @@ public:
|
|||
CheckMakeResult(handler);
|
||||
|
||||
boolean result;
|
||||
ThrowIfFailed(m_dispatcher->TryEnqueueWithPriority(ABI::Microsoft::System::DispatcherQueuePriority_Normal, handler.Get(), &result));
|
||||
ThrowIfFailed(m_dispatcher->TryEnqueueWithPriority(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_Normal, handler.Get(), &result));
|
||||
}
|
||||
|
||||
void TaskCompleted(DeferrableTask* task)
|
||||
|
@ -101,7 +101,7 @@ private:
|
|||
CheckMakeResult(handler);
|
||||
|
||||
boolean result;
|
||||
ThrowIfFailed(m_dispatcher->TryEnqueueWithPriority(ABI::Microsoft::System::DispatcherQueuePriority_Normal, handler.Get(), &result));
|
||||
ThrowIfFailed(m_dispatcher->TryEnqueueWithPriority(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_Normal, handler.Get(), &result));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<!-- <Import Project="..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.props')" /> -->
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<!-- <Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" /> -->
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<!-- <Import Project="..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.props')" /> -->
|
||||
<Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" />
|
||||
<PropertyGroup Label="Globals">
|
||||
|
@ -21,7 +21,7 @@
|
|||
<ItemsRootNamespace>Microsoft.Graphics.Canvas</ItemsRootNamespace>
|
||||
<MidlRTNamespaceMergeDepth>Microsoft.Graphics.Canvas:3</MidlRTNamespaceMergeDepth>
|
||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||
<!--SkipAddPriPayloadFilesToCopyToOutputDirectoryItems>true</SkipAddPriPayloadFilesToCopyToOutputDirectoryItems-->
|
||||
</PropertyGroup>
|
||||
<Import Project="..\..\build\Win2D.cpp.props" />
|
||||
|
@ -489,18 +489,18 @@
|
|||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
<!-- <Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.targets'))" /> -->
|
||||
<!-- <Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props'))" /> -->
|
||||
<!-- <Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets'))" /> -->
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
<!-- <Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.targets'))" /> -->
|
||||
</Target>
|
||||
<Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
<!-- <Import Project="..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.5.7\build\Microsoft.ProjectReunion.DWrite.targets')" /> -->
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<!-- <Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" /> -->
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
<!-- <Import Project="..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.DWrite.0.8.0\build\Microsoft.ProjectReunion.DWrite.targets')" /> -->
|
||||
</Project>
|
|
@ -13,7 +13,7 @@ namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { na
|
|||
using namespace ABI::Windows::ApplicationModel;
|
||||
using namespace ABI::Windows::Graphics::Display;
|
||||
#ifdef WINUI3
|
||||
using namespace ABI::Microsoft::System;
|
||||
using namespace ABI::Microsoft::UI::Dispatching;
|
||||
#else
|
||||
using namespace ABI::Windows::UI::Core;
|
||||
#endif
|
||||
|
|
|
@ -12,7 +12,7 @@ using namespace ABI::Microsoft::Graphics::Canvas::UI::Xaml;
|
|||
using namespace ABI::Microsoft::Graphics::Canvas;
|
||||
using namespace ABI::Windows::ApplicationModel::Core;
|
||||
using namespace ABI::Windows::ApplicationModel;
|
||||
using namespace ABI::Microsoft::System;
|
||||
using namespace ABI::Microsoft::UI::Dispatching;
|
||||
using namespace ABI::Windows::Graphics::Display;
|
||||
using namespace ABI::Microsoft::UI::Xaml::Media;
|
||||
using namespace ABI::Microsoft::UI::Xaml;
|
||||
|
@ -333,7 +333,7 @@ void CanvasControl::Changed(ChangeReason)
|
|||
});
|
||||
CheckMakeResult(callback);
|
||||
boolean result = true;
|
||||
dispatcher->TryEnqueueWithPriority(ABI::Microsoft::System::DispatcherQueuePriority_Normal, callback.Get(), &result);
|
||||
dispatcher->TryEnqueueWithPriority(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_Normal, callback.Get(), &result);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "CanvasVirtualImageSource.h"
|
||||
|
||||
using namespace ABI::Microsoft::Graphics::Canvas::UI::Xaml;
|
||||
using namespace ABI::Microsoft::System;
|
||||
using namespace ABI::Microsoft::UI::Dispatching;
|
||||
|
||||
class CanvasVirtualControlFactory;
|
||||
|
||||
|
@ -344,7 +344,7 @@ void CanvasVirtualControl::Changed(ChangeReason reason)
|
|||
});
|
||||
});
|
||||
boolean result = true;
|
||||
dispatcher->TryEnqueueWithPriority(ABI::Microsoft::System::DispatcherQueuePriority_Normal, callback.Get(), &result);
|
||||
dispatcher->TryEnqueueWithPriority(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_Normal, callback.Get(), &result);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -16,13 +16,11 @@
|
|||
</CSWinRTIncludes>
|
||||
<CSWinRTWindowsMetadata>local</CSWinRTWindowsMetadata>
|
||||
<CsWinRTGenerateProjection>true</CsWinRTGenerateProjection>
|
||||
<Platforms>AnyCPU</Platforms>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-->PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" /-->
|
||||
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.7" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.7" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.7" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
|
||||
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="1.2.5" />
|
||||
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" />
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ProjectReunion" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" targetFramework="native" />
|
||||
</packages>
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{f33c7cb9-5eca-47b7-9393-81e6e8f0bd34}</ProjectGuid>
|
||||
<RootNamespace>Canvas.Test</RootNamespace>
|
||||
|
@ -15,7 +15,7 @@
|
|||
<ApplicationType>Windows Store</ApplicationType>
|
||||
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
|
||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\..\build\Win2D.cpp.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
|
@ -173,9 +173,9 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
</ImportGroup>
|
||||
<Import Project="..\..\build\Win2D.cpp.targets" />
|
||||
<ItemDefinitionGroup>
|
||||
|
@ -195,10 +195,10 @@
|
|||
<PropertyGroup>
|
||||
<ErrorText>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}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
</Target>
|
||||
</Project>
|
|
@ -76,8 +76,8 @@ public:
|
|||
|
||||
ASSERT_IMPLEMENTS_INTERFACE(canvasGeometry, ICanvasGeometry);
|
||||
ASSERT_IMPLEMENTS_INTERFACE(canvasGeometry, ABI::Windows::Foundation::IClosable);
|
||||
ASSERT_IMPLEMENTS_INTERFACE(canvasGeometry, ABI::Microsoft::Graphics::IGeometrySource2D);
|
||||
ASSERT_IMPLEMENTS_INTERFACE(canvasGeometry, ABI::Microsoft::Graphics::IGeometrySource2DInterop);
|
||||
ASSERT_IMPLEMENTS_INTERFACE(canvasGeometry, ABI::Windows::Graphics::IGeometrySource2D);
|
||||
ASSERT_IMPLEMENTS_INTERFACE(canvasGeometry, ABI::Windows::Graphics::IGeometrySource2DInterop);
|
||||
}
|
||||
|
||||
TEST_METHOD_EX(CanvasGeometry_CreatedWithCorrectD2DRectangleResource)
|
||||
|
|
|
@ -52,7 +52,7 @@ public:
|
|||
return SharedDevice;
|
||||
}
|
||||
|
||||
virtual ComPtr<ABI::Microsoft::System::IDispatcherQueue> GetDispatcherForCurrentThread() override
|
||||
virtual ComPtr<ABI::Microsoft::UI::Dispatching::IDispatcherQueue> GetDispatcherForCurrentThread() override
|
||||
{
|
||||
return Dispatcher;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ public:
|
|||
CALL_COUNTER_WITH_MOCK(ReadLocalValueMethod, HRESULT(IDependencyProperty*, IInspectable**));
|
||||
CALL_COUNTER_WITH_MOCK(GetAnimationBaseValueMethod, HRESULT(IDependencyProperty*, IInspectable**));
|
||||
CALL_COUNTER_WITH_MOCK(get_DispatcherMethod, HRESULT(ICoreDispatcher**));
|
||||
CALL_COUNTER_WITH_MOCK(get_DispatcherQueueMethod, HRESULT(ABI::Microsoft::System::IDispatcherQueue**));
|
||||
CALL_COUNTER_WITH_MOCK(get_DispatcherQueueMethod, HRESULT(ABI::Microsoft::UI::Dispatching::IDispatcherQueue**));
|
||||
|
||||
CALL_COUNTER_WITH_MOCK(RegisterPropertyChangedCallbackMethod, HRESULT(
|
||||
ABI::Microsoft::UI::Xaml::IDependencyProperty* dp,
|
||||
|
@ -146,7 +146,7 @@ public:
|
|||
return get_DispatcherMethod.WasCalled(v);
|
||||
}
|
||||
|
||||
IFACEMETHODIMP get_DispatcherQueue(ABI::Microsoft::System::IDispatcherQueue** v) override
|
||||
IFACEMETHODIMP get_DispatcherQueue(ABI::Microsoft::UI::Dispatching::IDispatcherQueue** v) override
|
||||
{
|
||||
return get_DispatcherQueueMethod.WasCalled(v);
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ class MockWindow : public RuntimeClass<IWindow>
|
|||
public:
|
||||
ComPtr<MockEventSource<WindowVisibilityChangedEventHandler>> VisibilityChangedEventSource;
|
||||
|
||||
CALL_COUNTER_WITH_MOCK(get_DispatcherQueueMethod, HRESULT(ABI::Microsoft::System::IDispatcherQueue**));
|
||||
CALL_COUNTER_WITH_MOCK(get_DispatcherQueueMethod, HRESULT(ABI::Microsoft::UI::Dispatching::IDispatcherQueue**));
|
||||
|
||||
MockWindow()
|
||||
: m_visible(true)
|
||||
|
@ -100,7 +100,7 @@ public:
|
|||
}
|
||||
|
||||
IFACEMETHODIMP STDMETHODCALLTYPE get_DispatcherQueue(
|
||||
ABI::Microsoft::System::IDispatcherQueue** value
|
||||
ABI::Microsoft::UI::Dispatching::IDispatcherQueue** value
|
||||
)
|
||||
{
|
||||
return get_DispatcherQueueMethod.WasCalled(value);
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
<packages>
|
||||
<package id="Microsoft.Windows.AbiWinRT" version="2.0.210330.2" targetFramework="native" />
|
||||
<package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" targetFramework="native" />
|
||||
</packages>
|
|
@ -31,7 +31,7 @@ namespace canvas
|
|||
|
||||
IFACEMETHODIMP get_Dispatcher(ABI::Windows::UI::Core::ICoreDispatcher** value) override { return S_OK; }
|
||||
|
||||
IFACEMETHODIMP get_DispatcherQueue(ABI::Microsoft::System::IDispatcherQueue** value) override { return S_OK; }
|
||||
IFACEMETHODIMP get_DispatcherQueue(ABI::Microsoft::UI::Dispatching::IDispatcherQueue** value) override { return S_OK; }
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1024,12 +1024,12 @@ namespace Microsoft
|
|||
END_ENUM(ABI::Windows::UI::Core::CoreDispatcherPriority);
|
||||
}
|
||||
#else
|
||||
ENUM_TO_STRING(ABI::Microsoft::System::DispatcherQueuePriority)
|
||||
ENUM_TO_STRING(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority)
|
||||
{
|
||||
ENUM_VALUE(ABI::Microsoft::System::DispatcherQueuePriority_Low);
|
||||
ENUM_VALUE(ABI::Microsoft::System::DispatcherQueuePriority_Normal);
|
||||
ENUM_VALUE(ABI::Microsoft::System::DispatcherQueuePriority_High);
|
||||
END_ENUM(ABI::Microsoft::System::DispatcherQueuePriority);
|
||||
ENUM_VALUE(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_Low);
|
||||
ENUM_VALUE(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_Normal);
|
||||
ENUM_VALUE(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority_High);
|
||||
END_ENUM(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority);
|
||||
}
|
||||
#endif
|
||||
ENUM_TO_STRING(D2D1_COMBINE_MODE)
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" />
|
||||
<PropertyGroup Label="Globals">
|
||||
|
@ -13,7 +13,7 @@
|
|||
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
|
||||
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
|
||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\..\build\Win2D.cpp.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
|
@ -286,11 +286,11 @@
|
|||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
|
||||
|
@ -307,7 +307,7 @@
|
|||
<AdditionalIncludeDirectories>..\..\obj\winrt.lib.uap\$(FullPlatform)\$(Configuration)\Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
</Project>
|
|
@ -65,7 +65,7 @@ public:
|
|||
|
||||
#ifdef WINUI3
|
||||
m_mockWindow->get_DispatcherQueueMethod.AllowAnyCall(
|
||||
[=](ABI::Microsoft::System::IDispatcherQueue** out)
|
||||
[=](ABI::Microsoft::UI::Dispatching::IDispatcherQueue** out)
|
||||
{
|
||||
return m_uiThreadDispatcher.CopyTo(out);
|
||||
});
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
#ifdef WINUI3
|
||||
|
||||
class MockDispatcherQueue : public RuntimeClass<ABI::Microsoft::System::IDispatcherQueue, ABI::Microsoft::System::IDispatcherQueue2>
|
||||
class MockDispatcherQueue : public RuntimeClass<ABI::Microsoft::UI::Dispatching::IDispatcherQueue, ABI::Microsoft::UI::Dispatching::IDispatcherQueue2>
|
||||
{
|
||||
public:
|
||||
CALL_COUNTER_WITH_MOCK(TryEnqueueWithPriorityMethod, HRESULT(ABI::Microsoft::System::DispatcherQueuePriority, ABI::Microsoft::System::IDispatcherQueueHandler*, boolean*));
|
||||
CALL_COUNTER_WITH_MOCK(TryEnqueueWithPriorityMethod, HRESULT(ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority, ABI::Microsoft::UI::Dispatching::IDispatcherQueueHandler*, boolean*));
|
||||
CALL_COUNTER_WITH_MOCK(get_HasThreadAccessMethod, HRESULT(boolean*));
|
||||
|
||||
virtual IFACEMETHODIMP get_HasThreadAccess(boolean* value) override
|
||||
|
@ -18,7 +18,7 @@ public:
|
|||
}
|
||||
|
||||
virtual IFACEMETHODIMP TryEnqueue(
|
||||
ABI::Microsoft::System::IDispatcherQueueHandler* agileCallback,
|
||||
ABI::Microsoft::UI::Dispatching::IDispatcherQueueHandler* agileCallback,
|
||||
boolean* result) override
|
||||
{
|
||||
Assert::Fail(L"Unexpected call to IDispatcherQueue::TryEnqueue");
|
||||
|
@ -26,21 +26,21 @@ public:
|
|||
}
|
||||
|
||||
virtual IFACEMETHODIMP TryEnqueueWithPriority(
|
||||
ABI::Microsoft::System::DispatcherQueuePriority priority,
|
||||
ABI::Microsoft::System::IDispatcherQueueHandler* agileCallback,
|
||||
ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority priority,
|
||||
ABI::Microsoft::UI::Dispatching::IDispatcherQueueHandler* agileCallback,
|
||||
boolean* result) override
|
||||
{
|
||||
return TryEnqueueWithPriorityMethod.WasCalled(priority, agileCallback, result);
|
||||
}
|
||||
|
||||
virtual IFACEMETHODIMP CreateTimer(ABI::Microsoft::System::IDispatcherQueueTimer** result) override
|
||||
virtual IFACEMETHODIMP CreateTimer(ABI::Microsoft::UI::Dispatching::IDispatcherQueueTimer** result) override
|
||||
{
|
||||
Assert::Fail(L"Unexpected call to IDispatcherQueue::CreateTimer");
|
||||
return E_UNEXPECTED;
|
||||
}
|
||||
|
||||
virtual IFACEMETHODIMP add_ShutdownStarting(
|
||||
ITypedEventHandler<ABI::Microsoft::System::DispatcherQueue*, ABI::Microsoft::System::DispatcherQueueShutdownStartingEventArgs*>* handler,
|
||||
ITypedEventHandler<ABI::Microsoft::UI::Dispatching::DispatcherQueue*, ABI::Microsoft::UI::Dispatching::DispatcherQueueShutdownStartingEventArgs*>* handler,
|
||||
EventRegistrationToken* token) override
|
||||
{
|
||||
Assert::Fail(L"Unexpected call to IDispatcherQueue::add_ShutdownStarting");
|
||||
|
@ -54,7 +54,7 @@ public:
|
|||
}
|
||||
|
||||
virtual IFACEMETHODIMP add_ShutdownCompleted(
|
||||
ITypedEventHandler<ABI::Microsoft::System::DispatcherQueue*, IInspectable*>* handler,
|
||||
ITypedEventHandler<ABI::Microsoft::UI::Dispatching::DispatcherQueue*, IInspectable*>* handler,
|
||||
EventRegistrationToken* token) override
|
||||
{
|
||||
Assert::Fail(L"Unexpected call to IDispatcherQueue::add_ShutdownCompleted");
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
class StubDispatcher : public MockDispatcherQueue
|
||||
{
|
||||
typedef std::pair<ComPtr<ABI::Microsoft::System::IDispatcherQueueHandler>, ComPtr<MockAsyncAction>> HandlerAndAction;
|
||||
typedef std::pair<ComPtr<ABI::Microsoft::UI::Dispatching::IDispatcherQueueHandler>, ComPtr<MockAsyncAction>> HandlerAndAction;
|
||||
|
||||
std::queue<HandlerAndAction> m_pendingActions;
|
||||
bool m_stopped;
|
||||
|
@ -23,8 +23,8 @@ public:
|
|||
}
|
||||
|
||||
virtual IFACEMETHODIMP TryEnqueueWithPriority(
|
||||
ABI::Microsoft::System::DispatcherQueuePriority priority,
|
||||
ABI::Microsoft::System::IDispatcherQueueHandler* agileCallback,
|
||||
ABI::Microsoft::UI::Dispatching::DispatcherQueuePriority priority,
|
||||
ABI::Microsoft::UI::Dispatching::IDispatcherQueueHandler* agileCallback,
|
||||
boolean* result) override
|
||||
{
|
||||
if (TryEnqueueWithPriorityMethod.HasMock())
|
||||
|
@ -34,7 +34,7 @@ public:
|
|||
[&]
|
||||
{
|
||||
auto action = Make<MockAsyncAction>();
|
||||
m_pendingActions.push(std::make_pair(ComPtr<ABI::Microsoft::System::IDispatcherQueueHandler>(agileCallback), action));
|
||||
m_pendingActions.push(std::make_pair(ComPtr<ABI::Microsoft::UI::Dispatching::IDispatcherQueueHandler>(agileCallback), action));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -156,9 +156,7 @@
|
|||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
|
||||
<Version>6.2.12</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.7" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.7" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.7" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
|
||||
<PackageReference Include="MSTest.TestAdapter">
|
||||
<Version>2.2.3</Version>
|
||||
</PackageReference>
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
<packages>
|
||||
<package id="Microsoft.Windows.AbiWinRT" version="2.0.210330.2" targetFramework="native" />
|
||||
<package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.5.7" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.DWrite" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" targetFramework="native" />
|
||||
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" targetFramework="native" />
|
||||
</packages>
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" />
|
||||
<PropertyGroup Label="Globals">
|
||||
|
@ -19,7 +19,7 @@
|
|||
<ItemsRootNamespace>NativeComponent</ItemsRootNamespace>
|
||||
<TargetName>$(ItemsRootNamespace)</TargetName>
|
||||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\..\build\Win2D.cpp.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
|
@ -81,14 +81,14 @@
|
|||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.5.7\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.props'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets'))" />
|
||||
<Error Condition="!Exists('..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ProjectReunion.0.8.0\build\native\Microsoft.ProjectReunion.props'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.5.7\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.5.7\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.Foundation.0.8.0\build\native\Microsoft.ProjectReunion.Foundation.targets')" />
|
||||
<Import Project="..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.ProjectReunion.WinUI.0.8.0\build\native\Microsoft.ProjectReunion.WinUI.targets')" />
|
||||
</Project>
|
Загрузка…
Ссылка в новой задаче