Skip to content

Commit 6428d8a

Browse files
michael-hawkermichael-hawker
committed
Merge branch 'master' into dev/split-controls
# Conflicts: # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Typedata.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Typedata.cs # Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj # Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml # Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml # UnitTests/UnitTests.UWP/UnitTests.UWP.csproj # Windows Community Toolkit.sln Tested Sample App
2 parents c7bdaf2 + e407e07 commit 6428d8a

File tree

192 files changed

+10584
-1174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+10584
-1174
lines changed

Microsoft.Toolkit/Attributes/DoesNotReturnAttribute.cs renamed to Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnAttribute.cs

File renamed without changes.

Microsoft.Toolkit/Attributes/DoesNotReturnIfAttribute.cs renamed to Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnIfAttribute.cs

File renamed without changes.

Microsoft.Toolkit/Attributes/NotNullAttribute.cs renamed to Microsoft.Toolkit.Diagnostics/Attributes/NotNullAttribute.cs

File renamed without changes.

Microsoft.Toolkit/Attributes/SkipLocalsInitAttribute.cs renamed to Microsoft.Toolkit.Diagnostics/Attributes/SkipLocalsInitAttribute.cs

File renamed without changes.

Microsoft.Toolkit/Extensions/TypeExtensions.cs renamed to Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs

File renamed without changes.

Microsoft.Toolkit/Extensions/ValueTypeExtensions.cs renamed to Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs

File renamed without changes.

Microsoft.Toolkit/Diagnostics/Generated/Guard.Collection.g.cs renamed to Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.g.cs

File renamed without changes.

Microsoft.Toolkit/Diagnostics/Generated/Guard.Collection.tt renamed to Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt

File renamed without changes.

Microsoft.Toolkit/Diagnostics/Generated/Guard.Comparable.Numeric.g.cs renamed to Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.g.cs

File renamed without changes.

Microsoft.Toolkit/Diagnostics/Generated/Guard.Comparable.Numeric.tt renamed to Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.tt

File renamed without changes.

0 commit comments

Comments
 (0)