unoplatform
/
Uno.WindowsCommunityToolkit
зеркало из https://github.com/unoplatform/Uno.WindowsCommunityToolkit.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updated to WAS 0.8.0.

This commit is contained in:
Alexandre Zollinger Chohfi 2021-06-24 16:48:55 -07:00
Родитель c4d33c2d50
Коммит 1094b0a2f2
67 изменённых файлов: 123 добавлений и 94 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs
Просмотреть файл

@ -8,7 +8,7 @@ using System.Collections.ObjectModel;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.Advertisement;
using Windows.Devices.Enumeration;

2
CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs
Просмотреть файл

@ -11,7 +11,7 @@ using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml.Media.Imaging;
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.GenericAttributeProfile;

2
CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.GenericAttributeProfile;
using Windows.Security.Cryptography;

2
CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation;
using Microsoft.UI.Xaml.Controls;

2
CommunityToolkit.WinUI.Input.GazeInteraction/GazePointer.cs
Просмотреть файл

@ -8,8 +8,8 @@ using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation.Peers;
using Microsoft.UI.Xaml.Controls;

4
CommunityToolkit.WinUI.SampleApp.Package/CommunityToolkit.WinUI.SampleApp.Package.wapproj
Просмотреть файл

@ -125,10 +125,10 @@
<Content Include="Images\Wide310x150Logo.scale-400.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.7]">
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.7]">
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>

8
CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj
Просмотреть файл

@ -9,7 +9,9 @@
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<UseWinUI>true</UseWinUI>
<ApplicationManifest>app.manifest</ApplicationManifest>
<LangVersion>8.0</LangVersion>
@ -33,10 +35,10 @@
<Version>0.10.0-alpha</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed">
<Version>2.0.3</Version>
<Version>2.0.4</Version>
</PackageReference>
<PackageReference Include="NotificationsVisualizerLibrary.WinUI">
<Version>2.0.0</Version>
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.5.0</Version>

4
CommunityToolkit.WinUI.SampleApp/Pages/SampleController.xaml.cs
Просмотреть файл

@ -424,7 +424,7 @@ namespace CommunityToolkit.WinUI.SampleApp
private void XamlCodeEditor_UpdateRequested(object sender, EventArgs e)
{
DispatcherQueue.TryEnqueue(Microsoft.System.DispatcherQueuePriority.Low, () =>
DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
{
UpdateXamlRender(XamlCodeEditor.Text);
});
@ -575,7 +575,7 @@ namespace CommunityToolkit.WinUI.SampleApp
{
fe.Loaded -= XamlFrameworkElement_Loaded;
DispatcherQueue.TryEnqueue(Microsoft.System.DispatcherQueuePriority.Low, () =>
DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
{
(SamplePage as IXamlRenderListener)?.OnXamlRendered(fe);
});

2
CommunityToolkit.WinUI.SampleApp/SamplePages/BluetoothLEHelper/BluetoothLEHelperPage.xaml.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
using CommunityToolkit.WinUI.Connectivity;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Windows.Devices.Bluetooth.GenericAttributeProfile;

2
CommunityToolkit.WinUI.SampleApp/SamplePages/CanvasPathGeometry/CanvasPathGeometryPage.xaml.cs
Просмотреть файл

@ -10,8 +10,8 @@ using CommunityToolkit.WinUI.UI;
using CommunityToolkit.WinUI.UI.Media.Geometry;
using Microsoft.Graphics.Canvas.Geometry;
using Microsoft.Graphics.Canvas.UI.Xaml;
using Microsoft.System;
using Microsoft.UI;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;

2
CommunityToolkit.WinUI.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperPage.xaml.cs
Просмотреть файл

@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
namespace CommunityToolkit.WinUI.SampleApp.SamplePages

3
CommunityToolkit.WinUI.SampleApp/SamplePages/PipelineBrush/PipelineBrushPage.xaml
Просмотреть файл

@ -24,7 +24,8 @@
<Border>
<Border.Background>
<media:PipelineBrush Source="{media:AcrylicSource}">
<media:BlendEffect Source="{media:BackdropSource BackgroundSource=Backdrop}" />
<!--<media:BlendEffect Source="{media:BackdropSource BackgroundSource=Backdrop}" />-->
<media:BlendEffect Source="{media:BackdropSource}" />
<media:BlurEffect />
<media:ExposureEffect />
<media:GrayscaleEffect />

2
CommunityToolkit.WinUI.SampleApp/Shell.SamplePicker.cs
Просмотреть файл

@ -134,7 +134,7 @@ namespace CommunityToolkit.WinUI.SampleApp
{
// The NavView fires this event twice when the current selected item is clicked
// This makes sure the event get's processed correctly
var nop = DispatcherQueue.TryEnqueue(Microsoft.System.DispatcherQueuePriority.Normal, () => HideSamplePicker());
var nop = DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () => HideSamplePicker());
}
else
{

2
CommunityToolkit.WinUI.SampleApp/Shell.xaml.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System.Threading.Tasks;
using CommunityToolkit.WinUI.Helpers;
using CommunityToolkit.WinUI.SampleApp.Pages;
using CommunityToolkit.WinUI.UI;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;

8
CommunityToolkit.WinUI.SampleApp/Styles/ThemeInjector.cs
Просмотреть файл

@ -28,14 +28,14 @@ namespace CommunityToolkit.WinUI.SampleApp.Styles
{
TintColor = Helpers.ColorHelper.ToColor("#FF333333"),
TintOpacity = 0.8,
BackgroundSource = AcrylicBackgroundSource.Backdrop,
// BackgroundSource = AcrylicBackgroundSource.Backdrop,
FallbackColor = Helpers.ColorHelper.ToColor("#FF333333")
},
LightAcrylic = new AcrylicBrush
{
TintColor = Colors.White,
TintOpacity = 0.8,
BackgroundSource = AcrylicBackgroundSource.Backdrop,
// BackgroundSource = AcrylicBackgroundSource.Backdrop,
FallbackColor = Colors.White
}
});
@ -47,14 +47,14 @@ namespace CommunityToolkit.WinUI.SampleApp.Styles
{
TintColor = Helpers.ColorHelper.ToColor("#FF111111"),
TintOpacity = 0.7,
BackgroundSource = AcrylicBackgroundSource.Backdrop,
// BackgroundSource = AcrylicBackgroundSource.Backdrop,
FallbackColor = Helpers.ColorHelper.ToColor("#FF111111")
},
LightAcrylic = new AcrylicBrush
{
TintColor = Helpers.ColorHelper.ToColor("#FFDDDDDD"),
TintOpacity = 0.6,
BackgroundSource = AcrylicBackgroundSource.Backdrop,
// BackgroundSource = AcrylicBackgroundSource.Backdrop,
FallbackColor = Helpers.ColorHelper.ToColor("#FFDDDDDD")
}
});

2
CommunityToolkit.WinUI.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
Просмотреть файл

@ -160,7 +160,7 @@ namespace CommunityToolkit.WinUI.UI.Animations
{
connectedAnimation.Cancel();
}
}, Microsoft.System.DispatcherQueuePriority.Normal);
}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
animationHandled = true;
}

2
CommunityToolkit.WinUI.UI.Behaviors/CommunityToolkit.WinUI.UI.Behaviors.csproj
Просмотреть файл

@ -19,7 +19,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.4" />
</ItemGroup>
<ItemGroup>

2
CommunityToolkit.WinUI.UI.Behaviors/Focus/FocusBehavior.cs
Просмотреть файл

@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Markup;

2
CommunityToolkit.WinUI.UI.Controls.Core/InAppNotification/InAppNotification.cs
Просмотреть файл

@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation;
using Microsoft.UI.Xaml.Controls;

2
CommunityToolkit.WinUI.UI.Controls.Core/Menu/Menu.xaml
Просмотреть файл

@ -10,10 +10,10 @@
<SolidColorBrush x:Key="SystemControlButtonForegroundPointerOver" Color="{StaticResource SystemBaseHighColor}" />
<SolidColorBrush x:Key="SystemControlBackgroundBrush" Color="Transparent" />
<AcrylicBrush x:Key="SystemControlFlyoutBackgroundBrush"
BackgroundSource="Backdrop"
TintColor="{StaticResource SystemChromeMediumLowColor}"
TintOpacity="0.8"
FallbackColor="{StaticResource SystemChromeMediumLowColor}" />
<!-- BackgroundSource="Backdrop" -->
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">

2
CommunityToolkit.WinUI.UI.Controls.Core/RotatorTile/RotatorTile.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System;
using System.Collections;
using System.Collections.Specialized;
using CommunityToolkit.WinUI.Helpers;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;

2
CommunityToolkit.WinUI.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs
Просмотреть файл

@ -54,7 +54,7 @@ namespace CommunityToolkit.WinUI.UI.Controls.TextToolbarSymbols
{
try
{
DispatcherQueue?.TryEnqueue(Microsoft.System.DispatcherQueuePriority.Normal, () =>
DispatcherQueue?.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
{
try
{

2
CommunityToolkit.WinUI.UI.Controls.Core/TileControl/TileControl.cs
Просмотреть файл

@ -8,8 +8,8 @@ using System.Linq;
using System.Numerics;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Composition;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Hosting;

2
CommunityToolkit.WinUI.UI.Controls.DataGrid/DataGrid/DataGrid.cs
Просмотреть файл

@ -33,7 +33,7 @@ using Windows.Foundation.Collections;
using Windows.System;
using DataErrorsChangedEventArgs = System.ComponentModel.DataErrorsChangedEventArgs;
using DiagnosticsDebug = System.Diagnostics.Debug;
using DispatcherQueueTimer = Microsoft.System.DispatcherQueueTimer;
using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
using INotifyDataErrorInfo = System.ComponentModel.INotifyDataErrorInfo;
namespace CommunityToolkit.WinUI.UI.Controls

2
CommunityToolkit.WinUI.UI.Controls.DataGrid/DataGrid/DataGridColumnHeader.cs
Просмотреть файл

@ -314,7 +314,7 @@ namespace CommunityToolkit.WinUI.UI.Controls.Primitives
if (this.OwningGrid.CommitEdit(DataGridEditingUnit.Row, true /*exitEditingMode*/))
{
DispatcherQueue.TryEnqueue(Microsoft.System.DispatcherQueuePriority.Normal, () => { ProcessSort(); });
DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () => { ProcessSort(); });
}
}

6
CommunityToolkit.WinUI.UI.Controls.Input.Design/CommunityToolkit.WinUI.UI.Controls.Input.DesignTools.csproj
Просмотреть файл

@ -15,14 +15,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Input\bin\Debug\uap10.0.17763\Design\</OutputPath>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Input\bin\Debug\net5.0-windows10.0.18362.0\Design\</OutputPath>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Input\bin\Release\uap10.0.17763\Design\</OutputPath>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Input\bin\Release\net5.0-windows10.0.18362.0\Design\</OutputPath>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize>
@ -98,7 +98,7 @@
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\CommunityToolkit.WinUI.UI.Controls.Input\bin\$(Configuration)\uap10.0.17763\CommunityToolkit.WinUI.UI.Controls.Input.xml">
<EmbeddedResource Include="..\CommunityToolkit.WinUI.UI.Controls.Input\bin\$(Configuration)\net5.0-windows10.0.18362.0\CommunityToolkit.WinUI.UI.Controls.Input.xml">
<Link>CommunityToolkit.WinUI.UI.Controls.Input.xml</Link>
<Visible>False</Visible>
</EmbeddedResource>

2
CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPicker.cs
Просмотреть файл

@ -8,8 +8,8 @@ using System.Collections.Specialized;
using System.Globalization;
using CommunityToolkit.WinUI.Helpers;
using CommunityToolkit.WinUI.UI.Controls.ColorPickerConverters;
using Microsoft.System;
using Microsoft.UI;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;

2
CommunityToolkit.WinUI.UI.Controls.Input/RangeSelector/RangeSelector.Input.Key.cs
Просмотреть файл

@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;

2
CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs
Просмотреть файл

@ -160,7 +160,7 @@ namespace CommunityToolkit.WinUI.UI.Controls
}
(ContainerFromIndex(Items.Count - 1) as TokenizingTextBoxItem).Focus(FocusState.Programmatic);
}, Microsoft.System.DispatcherQueuePriority.Normal);
}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
}
internal void DeselectAllTokensAndText(TokenizingTextBoxItem ignoreItem = null)

4
CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
Просмотреть файл

@ -272,9 +272,9 @@ namespace CommunityToolkit.WinUI.UI.Controls
}
newContainer.AutoSuggestTextBoxLoaded += WaitForLoad;
}, Microsoft.System.DispatcherQueuePriority.Normal);
}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
}
}, Microsoft.System.DispatcherQueuePriority.Normal);
}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
}
else
{

6
CommunityToolkit.WinUI.UI.Controls.Layout.Design/CommunityToolkit.WinUI.UI.Controls.Layout.DesignTools.csproj
Просмотреть файл

@ -15,14 +15,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Layout\bin\Debug\uap10.0.17763\Design\</OutputPath>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Layout\bin\Debug\net5.0-windows10.0.18362.0\Design\</OutputPath>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Layout\bin\Release\uap10.0.17763\Design\</OutputPath>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Layout\bin\Release\net5.0-windows10.0.18362.0\Design\</OutputPath>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize>
@ -110,7 +110,7 @@
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\CommunityToolkit.WinUI.UI.Controls.Layout\bin\$(Configuration)\uap10.0.17763\CommunityToolkit.WinUI.UI.Controls.Layout.xml">
<EmbeddedResource Include="..\CommunityToolkit.WinUI.UI.Controls.Layout\bin\$(Configuration)\net5.0-windows10.0.18362.0\CommunityToolkit.WinUI.UI.Controls.Layout.xml">
<Link>CommunityToolkit.WinUI.UI.Controls.Layout.xml</Link>
<Visible>False</Visible>
</EmbeddedResource>

2
CommunityToolkit.WinUI.UI.Controls.Layout/BladeView/BladeView.cs
Просмотреть файл

@ -155,7 +155,7 @@ namespace CommunityToolkit.WinUI.UI.Controls
() =>
{
GetScrollViewer()?.ChangeView(_scrollViewer.ScrollableWidth, null, null);
}, Microsoft.System.DispatcherQueuePriority.Low);
}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
return;
}

2
CommunityToolkit.WinUI.UI.Controls.Markdown/CommunityToolkit.WinUI.UI.Controls.Markdown.csproj
Просмотреть файл

@ -32,7 +32,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ColorCode.WinUI" Version="2.0.8" />
<PackageReference Include="ColorCode.WinUI" Version="2.0.9" />
<ProjectReference Include="..\CommunityToolkit.WinUI.UI.Controls.Core\CommunityToolkit.WinUI.UI.Controls.Core.csproj" />
<ProjectReference Include="..\CommunityToolkit.WinUI.UI\CommunityToolkit.WinUI.UI.csproj" />
</ItemGroup>

2
CommunityToolkit.WinUI.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
Просмотреть файл

@ -346,7 +346,7 @@ namespace CommunityToolkit.WinUI.UI.Controls
}
multiClickDetectionTriggered = true;
await DispatcherQueue.EnqueueAsync(() => multiClickDetectionTriggered = false, Microsoft.System.DispatcherQueuePriority.High);
await DispatcherQueue.EnqueueAsync(() => multiClickDetectionTriggered = false, Microsoft.UI.Dispatching.DispatcherQueuePriority.High);
// Get the hyperlink URL.
if (url == null)

4
CommunityToolkit.WinUI.UI.Controls.Media/CommunityToolkit.WinUI.UI.Controls.Media.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="0.5.0.14" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="0.8.0.21" />
</ItemGroup>
<ItemGroup>

6
CommunityToolkit.WinUI.UI.Controls.Primitives.Design/CommunityToolkit.WinUI.UI.Controls.Primitives.DesignTools.csproj
Просмотреть файл

@ -15,14 +15,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\</OutputPath>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Primitives\bin\Debug\net5.0-windows10.0.18362.0\Design\</OutputPath>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\</OutputPath>
<OutputPath>..\CommunityToolkit.WinUI.UI.Controls.Primitives\bin\Release\net5.0-windows10.0.18362.0\Design\</OutputPath>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize>
@ -93,7 +93,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\CommunityToolkit.WinUI.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\CommunityToolkit.WinUI.UI.Controls.Primitives.xml">
<EmbeddedResource Include="..\CommunityToolkit.WinUI.UI.Controls.Primitives\bin\$(Configuration)\net5.0-windows10.0.18362.0\CommunityToolkit.WinUI.UI.Controls.Primitives.xml">
<Link>CommunityToolkit.WinUI.UI.Controls.Primitives.xml</Link>
<Visible>False</Visible>
</EmbeddedResource>

26
CommunityToolkit.WinUI.UI.Media/Brushes/AcrylicBrush.cs
Просмотреть файл

@ -7,7 +7,7 @@ using CommunityToolkit.WinUI.UI.Media.Helpers;
using CommunityToolkit.WinUI.UI.Media.Pipelines;
using Microsoft.UI.Composition;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Controls;
using Windows.UI;
namespace CommunityToolkit.WinUI.UI.Media
@ -20,7 +20,7 @@ namespace CommunityToolkit.WinUI.UI.Media
/// <summary>
/// The <see cref="EffectSetter{T}"/> instance in use to set the blur amount
/// </summary>
/// <remarks>This is only set when <see cref="BackgroundSource"/> is <see cref="AcrylicBackgroundSource.Backdrop"/></remarks>
///// <remarks>This is only set when <see cref="BackgroundSource"/> is <see cref="AcrylicBackgroundSource.Backdrop"/></remarks>
private EffectSetter<float> blurAmountSetter;
/// <summary>
@ -33,6 +33,7 @@ namespace CommunityToolkit.WinUI.UI.Media
/// </summary>
private EffectSetter<float> tintOpacitySetter;
/*
/// <summary>
/// Gets or sets the background source mode for the effect (the default is <see cref="AcrylicBackgroundSource.Backdrop"/>).
/// </summary>
@ -65,11 +66,12 @@ namespace CommunityToolkit.WinUI.UI.Media
brush.OnConnected();
}
}
*/
/// <summary>
/// Gets or sets the blur amount for the effect (must be a positive value)
/// </summary>
/// <remarks>This property is ignored when the active mode is <see cref="AcrylicBackgroundSource.HostBackdrop"/></remarks>
///// <remarks>This property is ignored when the active mode is <see cref="AcrylicBackgroundSource.HostBackdrop"/></remarks>
public double BlurAmount
{
get => (double)GetValue(BlurAmountProperty);
@ -85,17 +87,12 @@ namespace CommunityToolkit.WinUI.UI.Media
typeof(AcrylicBrush),
new PropertyMetadata(0.0, OnBlurAmountPropertyChanged));
/// <summary>
/// Updates the UI when <see cref="BackgroundSource"/> changes
/// </summary>
/// <param name="d">The current <see cref="AcrylicBrush"/> instance</param>
/// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for <see cref="BackgroundSourceProperty"/></param>
private static void OnBlurAmountPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is AcrylicBrush brush &&
brush.BackgroundSource != AcrylicBackgroundSource.HostBackdrop && // Blur is fixed by OS when using HostBackdrop source.
brush.CompositionBrush is CompositionBrush target)
{
// brush.BackgroundSource != AcrylicBackgroundSource.HostBackdrop && // Blur is fixed by OS when using HostBackdrop source.
brush.blurAmountSetter?.Invoke(target, (float)(double)e.NewValue);
}
}
@ -202,6 +199,7 @@ namespace CommunityToolkit.WinUI.UI.Media
{
float dpi = DpiHelpers.GetDpi(this);
/*
switch (BackgroundSource)
{
case AcrylicBackgroundSource.Backdrop:
@ -224,6 +222,16 @@ namespace CommunityToolkit.WinUI.UI.Media
dpi);
default: throw new ArgumentOutOfRangeException(nameof(BackgroundSource), $"Invalid acrylic source: {BackgroundSource}");
}
*/
return PipelineBuilder.FromBackdropAcrylic(
TintColor,
out this.tintColorSetter,
(float)TintOpacity,
out this.tintOpacitySetter,
(float)BlurAmount,
out blurAmountSetter,
TextureUri,
dpi);
}
}
}

2
CommunityToolkit.WinUI.UI.Media/Brushes/XamlCompositionBrush.cs
Просмотреть файл

@ -79,7 +79,7 @@ namespace CommunityToolkit.WinUI.UI.Media
protected override PipelineBuilder OnPipelineRequested() => this.Pipeline;
/// <summary>
/// Clones the current instance by rebuilding the source <see cref="Microsoft.UI.Xaml.Media.Brush"/>. Use this method to reuse the same effects pipeline on a different <see cref="Microsoft.System.DispatcherQueue"/>
/// Clones the current instance by rebuilding the source <see cref="Microsoft.UI.Xaml.Media.Brush"/>. Use this method to reuse the same effects pipeline on a different <see cref="Microsoft.UI.Dispatching.DispatcherQueue"/>
/// </summary>
/// <remarks>
/// If your code is already on the same thread, you can just assign this brush to an arbitrary number of controls and it will still work correctly.

4
CommunityToolkit.WinUI.UI.Media/CommunityToolkit.WinUI.UI.Media.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
@ -44,7 +44,7 @@
<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="0.5.0.14" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="0.8.0.21" />
</ItemGroup>
<ItemGroup>

7
CommunityToolkit.WinUI.UI.Media/Effects/Extensions/AcrylicSourceExtension.cs
Просмотреть файл

@ -18,17 +18,19 @@ namespace CommunityToolkit.WinUI.UI.Media
[MarkupExtensionReturnType(ReturnType = typeof(PipelineBuilder))]
public sealed class AcrylicSourceExtension : MarkupExtension
{
/*
/// <summary>
/// Gets or sets the background source mode for the effect (the default is <see cref="AcrylicBackgroundSource.Backdrop"/>).
/// </summary>
public AcrylicBackgroundSource BackgroundSource { get; set; } = AcrylicBackgroundSource.Backdrop;
*/
private double blurAmount;
/// <summary>
/// Gets or sets the blur amount for the effect (must be a positive value)
/// </summary>
/// <remarks>This property is ignored when the active mode is <see cref="AcrylicBackgroundSource.HostBackdrop"/></remarks>
///// <remarks>This property is ignored when the active mode is <see cref="AcrylicBackgroundSource.HostBackdrop"/></remarks>
public double BlurAmount
{
get => this.blurAmount;
@ -80,12 +82,15 @@ namespace CommunityToolkit.WinUI.UI.Media
return dpi;
};
/*
return BackgroundSource switch
{
AcrylicBackgroundSource.Backdrop => PipelineBuilder.FromBackdropAcrylic(this.TintColor, (float)this.TintOpacity, (float)BlurAmount, TextureUri, dpiFactory),
AcrylicBackgroundSource.HostBackdrop => PipelineBuilder.FromHostBackdropAcrylic(this.TintColor, (float)this.TintOpacity, TextureUri, dpiFactory),
_ => throw new ArgumentException($"Invalid source mode for acrylic effect: {BackgroundSource}")
};
*/
return PipelineBuilder.FromBackdropAcrylic(this.TintColor, (float)this.TintOpacity, (float)BlurAmount, TextureUri, dpiFactory);
}
}
}

5
CommunityToolkit.WinUI.UI.Media/Effects/Extensions/BackdropSourceExtension.cs
Просмотреть файл

@ -15,20 +15,25 @@ namespace CommunityToolkit.WinUI.UI.Media
[MarkupExtensionReturnType(ReturnType = typeof(PipelineBuilder))]
public sealed class BackdropSourceExtension : MarkupExtension
{
/*
/// <summary>
/// Gets or sets the background source mode for the effect (the default is <see cref="AcrylicBackgroundSource.Backdrop"/>).
/// </summary>
public AcrylicBackgroundSource BackgroundSource { get; set; } = AcrylicBackgroundSource.Backdrop;
*/
/// <inheritdoc/>
protected override object ProvideValue()
{
/*
return BackgroundSource switch
{
AcrylicBackgroundSource.Backdrop => PipelineBuilder.FromBackdrop(),
AcrylicBackgroundSource.HostBackdrop => PipelineBuilder.FromHostBackdrop(),
_ => throw new ArgumentException($"Invalid source for backdrop effect: {BackgroundSource}")
};
*/
return PipelineBuilder.FromBackdrop();
}
}
}

2
CommunityToolkit.WinUI.UI/Cache/ImageCache.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml.Media.Imaging;
using Windows.Storage;

4
CommunityToolkit.WinUI.UI/Converters/ColorToDisplayNameConverter.cs
Просмотреть файл

@ -39,7 +39,9 @@ namespace CommunityToolkit.WinUI.UI.Converters
return DependencyProperty.UnsetValue;
}
return ColorHelper.ToDisplayName(color);
// return global::Microsoft.UI.Xaml.ColorDisplayNameHelper.ToDisplayName(color);
// Removed on Reunion 0.8-RC. Not sure what to replace with.
return DependencyProperty.UnsetValue;
}
/// <inheritdoc/>

2
CommunityToolkit.WinUI.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
using System.Threading;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;

2
CommunityToolkit.WinUI.UI/Helpers/ThemeListener.cs
Просмотреть файл

@ -5,7 +5,7 @@
using System;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Windows.Foundation.Metadata;
using Windows.UI.ViewManagement;

2
CommunityToolkit.WinUI.UI/Triggers/NetworkConnectionStateTrigger.cs
Просмотреть файл

@ -30,7 +30,7 @@ namespace CommunityToolkit.WinUI.UI.Triggers
private void NetworkInformation_NetworkStatusChanged(object sender)
{
_ = DispatcherQueue.EnqueueAsync(UpdateState, Microsoft.System.DispatcherQueuePriority.Normal);
_ = DispatcherQueue.EnqueueAsync(UpdateState, Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
}
private void UpdateState()

2
CommunityToolkit.WinUI/Extensions/DispatcherQueueExtensions.cs
Просмотреть файл

@ -5,7 +5,7 @@
using System;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
#nullable enable

2
CommunityToolkit.WinUI/Extensions/DispatcherQueueTimerExtensions.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
using System.Collections.Concurrent;
using Microsoft.System;
using Microsoft.UI.Dispatching;
namespace CommunityToolkit.WinUI.UI
{

2
CommunityToolkit.WinUI/Helpers/PrintHelper/PrintHelper.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Printing;

2
CommunityToolkit.WinUI/Helpers/PrintHelper/PrintHelperStateBag.cs
Просмотреть файл

@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
namespace CommunityToolkit.WinUI.Helpers

2
CommunityToolkit.WinUI/Helpers/RemoteDeviceHelper/RemoteDeviceHelper.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Windows.System.RemoteSystems;
namespace CommunityToolkit.WinUI.Helpers

2
Directory.Build.props
Просмотреть файл

@ -21,7 +21,7 @@
<TargetPlatformRevision>18362</TargetPlatformRevision>
<TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
<SupportedOSPlatformVersion>10.0.$(TargetPlatformMinRevision).0</SupportedOSPlatformVersion>
<MicrosoftProjectReunionVersion>0.5.7</MicrosoftProjectReunionVersion>
<MicrosoftProjectReunionVersion>0.8.0</MicrosoftProjectReunionVersion>
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
<!-- Remove after https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3285 is merged, as this is already in our .editorconfig -->
<NoWarn>SA1101;SA1633;SA1202;SA1600;SA1413;SA1611;SA1629;SA1201;SA1309;SA1310;SA1602</NoWarn>

6
GazeInputTest (Package)/GazeInputTest (Package).wapproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
@ -63,10 +63,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.7]">
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.7]">
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>

4
UITests/UITests.App.Package/UITests.App.Package.wapproj
Просмотреть файл

@ -83,10 +83,10 @@
<AppxPlatform Condition="'$(AppxPlatform)' == ''">$(Platform)</AppxPlatform>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.7]">
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.7]">
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>

2
UITests/UITests.App/App.xaml.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
using System.Linq;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;

2
UITests/UITests.App/UITests.App.csproj
Просмотреть файл

@ -34,7 +34,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Internal.MUXAppTestHelpers.WinUI">
<Version>3.0.0-zmain.210407.3-CI</Version>
<Version>3.0.0-zmain.210615.2-CI</Version>
<ExcludeAssets>runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.0" />

2
UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
Просмотреть файл

@ -23,7 +23,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.Internal.MUXTestInfra.MSTest" Version="3.0.0-zmain.210407.3-CI" />
<PackageReference Include="Microsoft.Internal.MUXTestInfra.MSTest" Version="3.0.0-zmain.210615.2-CI" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4-preview-20210331-02" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4-preview-20210331-02" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />

2
UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt
Просмотреть файл

@ -1,3 +1,3 @@
Microsoft.ProjectReunion.0.5.appx
Microsoft.ProjectReunion.0.8.msix
Microsoft.VCLibs.x86.Debug.14.00.appx
Microsoft.VCLibs.x86.Debug.14.00.Desktop.appx

2
UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt
Просмотреть файл

@ -1,3 +1,3 @@
Microsoft.ProjectReunion.0.5.appx
Microsoft.ProjectReunion.0.8.msix
Microsoft.VCLibs.x86.14.00.appx
Microsoft.VCLibs.x86.14.00.Desktop.appx

3
UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
Просмотреть файл

@ -40,7 +40,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Internal.MUXTestInfra.TAEF" Version="3.0.0-zmain.210407.3-CI" />
<PackageReference Include="Microsoft.Internal.MUXTestInfra.TAEF" Version="3.0.0-zmain.210615.2-CI" />
<PackageReference Include="TAEF.Redist.Wlk" Version="10.57.200928001" GeneratePathProperty="true" />
<PackageReference Include="Grpc.Tools" Version="2.36.4" />
<PackageReference Include="Grpc.Net.Client" Version="2.36.0" />
@ -57,6 +57,7 @@
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App.Package\AppPackages\*\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App.Package\AppPackages\*\Dependencies\$(PlatformTarget)\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App.Package\AppPackages\*\Dependencies\$(PlatformTarget)\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App.Package\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(Pkgtaef_redist_wlk)\build\Binaries\x86\WTTlog.dll" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

2
UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs
Просмотреть файл

@ -7,7 +7,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using CommunityToolkit.WinUI;
using Microsoft.UI.Xaml.Controls;
using Windows.ApplicationModel.Core;

4
UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
@ -49,7 +49,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Graphics.Win2D">
<Version>0.5.0.14</Version>
<Version>0.8.0.21</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

2
UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml.cs
Просмотреть файл

@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.System;
using Microsoft.UI.Dispatching;
using CommunityToolkit.Win32.UI.XamlHost;
using Microsoft.UI.Xaml;

2
UnitTests/UnitTests.XamlIslands.UWPApp/TestsPage.xaml.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.System;
using Microsoft.UI.Dispatching;
using CommunityToolkit.WinUI.Helpers;
using Microsoft.UI;
using Microsoft.UI.Xaml;

4
UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>WinExe</OutputType>
@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.2" />
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.7" />
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
</ItemGroup>
<ItemGroup>

2
Windows Community Toolkit.sln
Просмотреть файл

@ -68,7 +68,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.WinUI.UI.C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.WinUI.Input.GazeInteraction", "CommunityToolkit.WinUI.Input.GazeInteraction\CommunityToolkit.WinUI.Input.GazeInteraction.csproj", "{5BF75694-798A-43A0-8150-415DE195359C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.WinUI.UI.Media", "CommunityToolkit.WinUI.UI.Media\CommunityToolkit.WinUI.UI.Media.csproj", "{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}"
EndProject

5
build/Windows.Toolkit.Uwp.Build.targets
Просмотреть файл

@ -11,8 +11,13 @@
</PropertyGroup>
<ItemGroup Condition="'$(IsWinUIProject)' == 'true' or '$(IsDesignProject)' == 'true' or '$(IsSampleProject)' == 'true' or '$(IsTestProject)' == 'true'">
<PackageReference Include="Microsoft.ProjectReunion" Version="$(MicrosoftProjectReunionVersion)" />
<!--
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.$(TargetPlatformRevision).18" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.$(TargetPlatformRevision).18" />
-->
</ItemGroup>
<ItemGroup>
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>
</When>
</Choose>