mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

upgrade xaml based nuget packages (#4426)

Browse Source 
* Settings packages updated

* removing WinUI references from wox base

* removing unneeded reference

Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas 2020-06-22 15:23:39 -07:00 committed by GitHub
parent 720fad80c3
commit f6d53bc337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
View File

@ -58,9 +58,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Toolkit.UI.XamlHost" Version="6.0.1" /> <PackageReference Include="Microsoft.Toolkit.UI.XamlHost" Version="6.1.0" />
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.0.1" /> <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.1.0" />
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" /> <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118"> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

6
src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View File

@ -167,13 +167,13 @@
<Version>6.2.10</Version> <Version>6.2.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI"> <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>6.0.0</Version> <Version>6.1.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication"> <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
<Version>6.0.1</Version> <Version>6.1.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.UI.Xaml"> <PackageReference Include="Microsoft.UI.Xaml">
<Version>2.4.0-prerelease.191217001</Version> <Version>2.5.0-prerelease.200609001</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed"> <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1</Version> <Version>2.0.1</Version>

1
src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
View File

@ -48,7 +48,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" /> <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" /> <PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
<PackageReference Include="NLog.Schema" Version="4.7.0" /> <PackageReference Include="NLog.Schema" Version="4.7.0" />

3
src/modules/launcher/Wox.Plugin/ContextMenuResult.cs
View File

@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.IO;
using System.Windows.Input; using System.Windows.Input;
using Windows.UI.Xaml.Media;
namespace Wox.Plugin namespace Wox.Plugin
{ {

1
src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
View File

@ -57,7 +57,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" /> <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" /> <PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="PropertyChanged.Fody" Version="3.2.8" /> <PackageReference Include="PropertyChanged.Fody" Version="3.2.8" />