Skip to content
This repository was archived by the owner on Feb 25, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bring in Microsoft.Toolkit NuGet
  • Loading branch information
XAML-Knight committed Dec 1, 2021
commit 91b9f16788b82f2f5c4abd2565abff09a99a9188
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<Application.Resources>
<ResourceDictionary>
<!-- code comment -->
<!-- Color Resources -->
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///Styles/Themes.xaml" />
Expand Down
Original file line number Diff line number Diff line change
@@ -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">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -99,13 +99,15 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
</PackageReference>
<PackageReference Include="Microsoft.Services.Store.Engagement">
<Version>10.1901.28001</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit">
<Version>7.1.2</Version>
</PackageReference>
<!-- TODO Reintroduce graph controls
<PackageReference Include="Microsoft.Toolkit.Graph.Controls">
<Version>6.1.0-build.6</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using CommunityToolkit.Common.Collections;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Toolkit.Collections;

namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ObservableGroupPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:collections="using:CommunityToolkit.Common.Collections"
xmlns:collections="using:Microsoft.Toolkit.Collections"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.

using System.Linq;
using CommunityToolkit.Common.Collections;
using Microsoft.Toolkit.Collections;
using Windows.System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using CommunityToolkit.Common;
using Windows.UI.Text;
using Windows.UI.Xaml.Controls;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.

using System;
using CommunityToolkit.Common.Deferred;
using Microsoft.Toolkit.Deferred;
using Windows.UI.Text;

namespace Microsoft.Toolkit.Uwp.UI.Controls
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CommunityToolkit.Common.Deferred;
using Microsoft.Toolkit.Deferred;

namespace Microsoft.Toolkit.Uwp.UI.Controls
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CommunityToolkit.Common.Deferred;
using Microsoft.Toolkit.Deferred;

namespace Microsoft.Toolkit.Uwp.UI.Controls
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CommunityToolkit.Common.Deferred;
using Microsoft.Toolkit.Deferred;

namespace Microsoft.Toolkit.Uwp.UI.Controls
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

using System;
using System.Collections.Generic;
using CommunityToolkit.Common;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Microsoft.Toolkit.Uwp.UI.Converters
{
/// <summary>
/// Converts a file size in bytes to a more human-readable friendly format using <see cref="CommunityToolkit.Common.Converters.ToFileSizeString(long)"/>
/// Converts a file size in bytes to a more human-readable friendly format using <see cref="Toolkit.Converters.ToFileSizeString(long)"/>
/// </summary>
public class FileSizeToFriendlyStringConverter : IValueConverter
{
Expand All @@ -17,7 +17,7 @@ public object Convert(object value, Type targetType, object parameter, string la
{
if (value is long size)
{
return CommunityToolkit.Common.Converters.ToFileSizeString(size);
return Toolkit.Converters.ToFileSizeString(size);
}

return string.Empty;
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

using System;
using System.Threading.Tasks;
using CommunityToolkit.Common;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

using System.Diagnostics;
using System.Text.RegularExpressions;
using CommunityToolkit.Common;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

Expand Down
5 changes: 4 additions & 1 deletion Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@
<PackageTags>UI;XAML;ApplicationView;FrameworkElement;ListView;SurfaceDial;Matrix;Mouse;TextBoxMask;TitleBar;VisualTree;Converters;Extensions;Helpers</PackageTags>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CommunityToolkit.Common.Deferred;
using Microsoft.Toolkit.Deferred;
using Windows.Foundation;

namespace Microsoft.Toolkit.Uwp.Deferred
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using System.Collections.Generic;
using System.Threading.Tasks;
using CommunityToolkit.Common.Helpers;
using Microsoft.Toolkit.Helpers;
using Windows.Storage;

namespace Microsoft.Toolkit.Uwp.Helpers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using CommunityToolkit.Common.Helpers;
using Microsoft.Toolkit.Helpers;
using Windows.Storage;
using Windows.System;

Expand All @@ -24,11 +24,11 @@ public partial class ApplicationDataStorageHelper : IFileStorageHelper, ISetting
/// Initializes a new instance of the <see cref="ApplicationDataStorageHelper"/> class.
/// </summary>
/// <param name="appData">The data store to interact with.</param>
/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="CommunityToolkit.Common.Helpers.SystemSerializer"/>.</param>
public ApplicationDataStorageHelper(ApplicationData appData, CommunityToolkit.Common.Helpers.IObjectSerializer? objectSerializer = null)
/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="Toolkit.Helpers.SystemSerializer"/>.</param>
public ApplicationDataStorageHelper(ApplicationData appData, Toolkit.Helpers.IObjectSerializer? objectSerializer = null)
{
AppData = appData ?? throw new ArgumentNullException(nameof(appData));
Serializer = objectSerializer ?? new CommunityToolkit.Common.Helpers.SystemSerializer();
Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();
}

/// <summary>
Expand All @@ -49,14 +49,14 @@ public ApplicationDataStorageHelper(ApplicationData appData, CommunityToolkit.Co
/// <summary>
/// Gets the serializer for converting stored values.
/// </summary>
protected CommunityToolkit.Common.Helpers.IObjectSerializer Serializer { get; }
protected Toolkit.Helpers.IObjectSerializer Serializer { get; }

/// <summary>
/// Get a new instance using ApplicationData.Current and the provided serializer.
/// </summary>
/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="CommunityToolkit.Common.Helpers.SystemSerializer"/>.</param>
/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="Toolkit.Helpers.SystemSerializer"/>.</param>
/// <returns>A new instance of ApplicationDataStorageHelper.</returns>
public static ApplicationDataStorageHelper GetCurrent(CommunityToolkit.Common.Helpers.IObjectSerializer? objectSerializer = null)
public static ApplicationDataStorageHelper GetCurrent(Toolkit.Helpers.IObjectSerializer? objectSerializer = null)
{
var appData = ApplicationData.Current;
return new ApplicationDataStorageHelper(appData, objectSerializer);
Expand All @@ -66,9 +66,9 @@ public static ApplicationDataStorageHelper GetCurrent(CommunityToolkit.Common.He
/// Get a new instance using the ApplicationData for the provided user and serializer.
/// </summary>
/// <param name="user">App data user owner.</param>
/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="CommunityToolkit.Common.Helpers.SystemSerializer"/>.</param>
/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="SystemSerializer"/>.</param>
/// <returns>A new instance of ApplicationDataStorageHelper.</returns>
public static async Task<ApplicationDataStorageHelper> GetForUserAsync(User user, CommunityToolkit.Common.Helpers.IObjectSerializer? objectSerializer = null)
public static async Task<ApplicationDataStorageHelper> GetForUserAsync(User user, Toolkit.Helpers.IObjectSerializer? objectSerializer = null)
{
var appData = await ApplicationData.GetForUserAsync(user);
return new ApplicationDataStorageHelper(appData, objectSerializer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CommunityToolkit.Common.Collections;
using Microsoft.Toolkit.Collections;
using Windows.Foundation;
using Windows.UI.Xaml.Data;

Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion UITests/UITests.App/App.AppService.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Toolkit.Mvvm.Messaging;
using UITests.App.Pages;
using Windows.ApplicationModel.Activation;
using Windows.ApplicationModel.AppService;
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.App/MainTestHost.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.Reflection;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Toolkit.Mvvm.Messaging;
using Microsoft.Toolkit.Uwp;
using UITests.App.Commands;
using UITests.App.Pages;
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.App/RequestPageMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 CommunityToolkit.Mvvm.Messaging.Messages;
using Microsoft.Toolkit.Mvvm.Messaging.Messages;

namespace UITests.App
{
Expand Down
14 changes: 8 additions & 6 deletions UITests/UITests.App/UITests.App.csproj
Original file line number Diff line number Diff line change
@@ -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">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -165,15 +165,17 @@
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.Diagnostics">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="CommunityToolkit.Mvvm">
<PackageReference Include="Microsoft.Toolkit.Diagnostics">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
<PackageReference Include="Microsoft.Toolkit.Mvvm">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="MUXAppTestHelpers">
<Version>0.0.4</Version>
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<!-- MSTest -->
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.UWP/Helpers/JsonObjectSerializer2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

using System;
using System.Reflection;
using Microsoft.Toolkit.Helpers;
using Newtonsoft.Json;
using CommunityToolkit.Common.Helpers;

namespace UnitTests.Helpers
{
Expand Down
4 changes: 2 additions & 2 deletions UnitTests/UnitTests.UWP/Helpers/SystemTextJsonSerializer2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using CommunityToolkit.Common.Helpers;
using System.Text.Json;
using Microsoft.Toolkit.Helpers;

namespace UnitTests.Helpers
{
/// <summary>
/// Example class of writing a new <see cref="IObjectSerializer"/> that uses System.Text.Json.
/// Example class of writing a new <see cref="Microsoft.Toolkit.Helpers.IObjectSerializer"/> that uses System.Text.Json.
/// Based on <see cref="IObjectSerializer"/>.
/// </summary>
internal class SystemTextJsonSerializer2 : IObjectSerializer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 CommunityToolkit.Common.Helpers;
using Microsoft.Toolkit.Helpers;
using Microsoft.Toolkit.Uwp.Helpers;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
Expand Down Expand Up @@ -51,7 +51,7 @@ public void Test_StorageHelper_LegacyIntTest()
}

/// <summary>
/// If we try and deserialize a complex type with the <see cref="CommunityToolkit.Common.Helpers.SystemSerializer"/>, we do a check ourselves and will throw our own exception.
/// If we try and deserialize a complex type with the <see cref="Microsoft.Toolkit.Helpers.SystemSerializer"/>, we do a check ourselves and will throw our own exception.
/// </summary>
[TestCategory("Helpers")]
[TestMethod]
Expand All @@ -69,7 +69,7 @@ public void Test_StorageHelper_LegacyDateTestFailure()
}

/// <summary>
/// The <see cref="CommunityToolkit.Common.Helpers.SystemSerializer"/> doesn't support complex types, since it just passes through directly.
/// The <see cref="Microsoft.Toolkit.Helpers.SystemSerializer"/> doesn't support complex types, since it just passes through directly.
/// We'll get the argument exception from the <see cref="Windows.Storage.ApplicationDataContainer"/> API.
/// </summary>
[TestCategory("Helpers")]
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.UWP/UI/Collection/DataSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using CommunityToolkit.Common.Collections;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Toolkit.Collections;

namespace UnitTests.UI
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CommunityToolkit.Common;
using CommunityToolkit.Common.Collections;
using Microsoft.Toolkit.Uwp;
using Microsoft.VisualStudio.TestTools.UnitTesting;

Expand Down
Loading