Skip to content

Commit fec4082

Browse files
committed
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts: # docs/Nuget-Packages.md # docs/animations/Blur.md # docs/animations/Fade.md # docs/animations/FadeHeader.md # docs/animations/Offset.md # docs/animations/Rotate.md # docs/animations/Scale.md # docs/controls/HamburgerMenu.md # docs/controls/HeaderedTextBlock.md # docs/controls/SlidableListItem.md # docs/index.md
2 parents 210a542 + f59af96 commit fec4082

File tree

624 files changed

+15759
-1759
lines changed

Some content is hidden

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

624 files changed

+15759
-1759
lines changed

Microsoft.Toolkit.Uwp.Notifications.NETStandard/Properties/AssemblyInfo.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
using System.Resources;
1+
// ******************************************************************
2+
// Copyright (c) Microsoft. All rights reserved.
3+
// This code is licensed under the MIT License (MIT).
4+
// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
5+
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
7+
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
8+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
9+
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
10+
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
11+
// ******************************************************************
12+
13+
using System.Resources;
214
using System.Reflection;
315
using System.Runtime.CompilerServices;
416
using System.Runtime.InteropServices;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"supports": {},
33
"dependencies": {
4-
"NETStandard.Library": "1.6.0"
4+
"NETStandard.Library": "1.5.0"
55
},
66
"frameworks": {
77
"netstandard1.0": {}
88
}
9-
}
9+
}

Microsoft.Toolkit.Uwp.Notifications.Portable/Properties/AssemblyInfo.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
using System.Resources;
1+
// ******************************************************************
2+
// Copyright (c) Microsoft. All rights reserved.
3+
// This code is licensed under the MIT License (MIT).
4+
// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
5+
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
7+
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
8+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
9+
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
10+
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
11+
// ******************************************************************
12+
13+
using System.Resources;
214
using System.Reflection;
315
using System.Runtime.CompilerServices;
416
using System.Runtime.InteropServices;

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveGroup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
using System;
1314
using System.Collections.Generic;
1415
using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveHelper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
using System;
1314

1415
namespace Microsoft.Toolkit.Uwp.Notifications.Adaptive

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveImage.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;
1314

1415
namespace Microsoft.Toolkit.Uwp.Notifications

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveImageEnums.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
namespace Microsoft.Toolkit.Uwp.Notifications
1314
{
1415
/// <summary>

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveSubgroup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
using System;
1314
using System.Collections.Generic;
1415
using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveSubgroupEnums.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
namespace Microsoft.Toolkit.Uwp.Notifications
1314
{
1415
/// <summary>

Microsoft.Toolkit.Uwp.Notifications.Shared/Adaptive/AdaptiveText.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
12+
1213
using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;
1314

1415
namespace Microsoft.Toolkit.Uwp.Notifications

0 commit comments

Comments
 (0)