Skip to content

Commit 7918982

Browse files
nmetulevnmetulev
authored
Merge branch 'master' into nmetulev/4.0-fixes
2 parents 857f66c + e55294f commit 7918982

File tree

10 files changed

+27
-20
lines changed

10 files changed

+27
-20
lines changed

‎Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard1.4</TargetFramework>
5-
<Description>This .NET standard library contains various Parsers. It is part of the Windows Community Toolkit.</Description>
6-
<PackageTags>UWP Toolkit Windows Parsers Parsing Markdown RSS</PackageTags>
75
<Title>Windows Community Toolkit .NET Standard Parsers</Title>
6+
<Description>This .NET standard library contains various parsers including Markdown and RSS. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows Parsers Parsing Markdown RSS</PackageTags>
88

99
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
1010
<DebugType>Full</DebugType>

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>uap10.0;netstandard1.4;net461</TargetFrameworks>
5-
<Description>This .NET standard library enables access to different data sources such as Bing, Microsoft Graph, and OneDrive. It is part of the Windows Community Toolkit.</Description>
6-
<PackageTags>UWP Toolkit Windows Bing Microsoft Graph OneDrive</PackageTags>
75
<Title>Windows Community Toolkit .NET Standard Services</Title>
6+
<Description>This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
88

99
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
1010
<DebugType>Full</DebugType>

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>uap10.0</TargetFramework>
55
<Title>Windows Community Toolkit Developer Tools</Title>
66
<Description>This library provides XAML user controls and services to help developer building their app. It is part of the Windows Community Toolkit.</Description>
7-
<PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility</PackageTags>
7+
<PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility AlignmentGrid</PackageTags>
88
<UseUwpMetaPackage>true</UseUwpMetaPackage>
99
</PropertyGroup>
1010

‎Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard1.3</TargetFramework><Title>Windows Community Toolkit UI</Title>
5-
<Description>This .NET standard library provides analyzer and code fixer to ensure that version / platform specific code is well guarded. It is part of the Windows Community Toolkit.</Description>
6-
<PackageTags>UWP Toolkit Windows</PackageTags>
75
<Title>Windows Community Toolkit UWP Platform Specific Analyzer</Title>
6+
<Description>This standard library provides analyzer and code fixer to ensure that version / platform specific code is well guarded. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows Platform Specific Analyzer</PackageTags>
88

99
<IncludeBuildOutput>false</IncludeBuildOutput>
1010

‎Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>uap10.0</TargetFramework>
55
<Title>Windows Community Toolkit Services</Title>
6-
<Description>This library enables access to different data sources like Microsoft Translator, Facebook, LinkedIn, and Twitter. It is part of the Windows Community Toolkit.</Description>
7-
<PackageTags>UWP Toolkit Windows Twitter OAuth Facebook LinkedIn Microsoft Translator</PackageTags>
6+
<Description>This library enables access to Facebook. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows OAuth Facebook</PackageTags>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>uap10.0</TargetFramework>
55
<Title>Windows Community Toolkit Animations</Title>
6-
<Description>This library provides helpers and services on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit.</Description>
7-
<PackageTags>UWP Toolkit Windows Animations Composition</PackageTags>
6+
<Description>This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows Animations Composition Connected Implicit XAML</PackageTags>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>uap10.0</TargetFramework>
55
<Title>Windows Community Toolkit Controls</Title>
6-
<Description>This library provides XAML user controls. It is part of the Windows Community Toolkit.</Description>
7-
<PackageTags>UWP Toolkit Windows Controls XAML Hamburger Range WrapPanel Adaptive Markdown</PackageTags>
6+
<Description>This library provides XAML templated controls. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows Controls XAML Range WrapPanel Adaptive Markdown BladeView Blade CameraPreview Camera Carousel DockPanel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Menu Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader StaggeredPanel Staggered Tile UniformGrid Uniform Grid</PackageTags>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,23 @@
44
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
55
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
66
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
7+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
78
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
89
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselPanel" />
9-
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
1010
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
11+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
1112
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Expander" />
1213
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
1314
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HamburgerMenu" />
15+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedContentControl" />
16+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedItemsControl" />
1417
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedTextBlock" />
1518
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
1619
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageExBase" />
20+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
21+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
22+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
23+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
1724
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock" />
1825
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView" />
1926
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
@@ -29,11 +36,11 @@
2936
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RoundImageEx" />
3037
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
3138
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.SlidableListItem" />
32-
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.SurfaceDialTextboxHelper" />
39+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
3340
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
3441
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
42+
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
3543
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
36-
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
3744
</ToolboxItems>
3845
</File>
3946
</FileList>

‎Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>uap10.0</TargetFramework>
55
<Title>Windows Community Toolkit UI</Title>
6-
<Description>This library provides UI services. It is part of the Windows Community Toolkit.</Description>
7-
<PackageTags>UWP Toolkit Windows UI Converters</PackageTags>
6+
<Description>This library provides UI components, such as XAML extensions, helpers, brushes, converters and more. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows UI Converters XAML extensions helpers brushes blur</PackageTags>
88

99
<UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
1010
<UseWindowsMobileSdk>true</UseWindowsMobileSdk>

‎Microsoft.Toolkit/Microsoft.Toolkit.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard1.4</TargetFramework>
55
<Title>Windows Community Toolkit .NET Standard</Title>
6-
<Description>This package includes .NET Standard code only helpers.</Description>
7-
<PackageTags>UWP Toolkit Windows</PackageTags>
6+
<Description>This package includes .NET Standard code only helpers, such as IncrementalLoadingCollection, string extensions and array extensions. It is part of the Windows Community Toolkit.</Description>
7+
<PackageTags>UWP Toolkit Windows IncrementalLoadingCollection String Array extensions</PackageTags>
88

99
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
1010
<DebugType>Full</DebugType>

0 commit comments

Comments
 (0)