diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index c7ed58f40..fcf8f53bb 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -1,7 +1,7 @@  - netstandard1.4;uap10.0;native;net461;netcoreapp3.0 + netstandard1.4;uap10.0;native;net461;netcoreapp3.1 $(DefineConstants);NETFX_CORE Windows Community Toolkit Notifications @@ -18,7 +18,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs index 93b4da40e..cd48c16d8 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs @@ -11,7 +11,7 @@ using System.Text; namespace Microsoft.Toolkit.Uwp.Notifications { /// - /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs + /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/tree/master/DesktopBridge.Helpers/Helpers.cs /// internal class DesktopBridgeHelpers { diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs index 3ee255458..38359aa56 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs @@ -227,7 +227,7 @@ namespace Microsoft.Toolkit.Uwp.Notifications } /// - /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs + /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/tree/master/DesktopBridge.Helpers/Helpers.cs /// private class DesktopBridgeHelpers { diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj index 1934c2937..5666136b5 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj +++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 true Office.ico + false diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index a076d8822..05e23a2ca 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -9,6 +9,7 @@ This project incorporates components from the projects listed below. The origina 2. MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0. 3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `Microsoft.Toolkit.Mvvm` package take inspiration from. 4. PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests. +5. qmatteoq/DesktopBridgeHelpers commit e278153 (https://github.com/qmatteoq/DesktopBridgeHelpers), using in DesktopNotificationManagerCompat.cs and DesktopBridgeHelpers.cs to identify if running with identity. %% PedroLamas/DeferredEvents NOTICES AND INFORMATION BEGIN HERE ========================================= @@ -112,3 +113,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========================================= END OF PrivateOject/PrivateType NOTICES AND INFORMATION + +%% qmatteoq/DesktopBridgeHelpers NOTICES AND INFORMATION BEGIN HERE +========================================= +MIT License + +Copyright (c) Microsoft Corporation. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE +========================================= +END OF qmatteoq/DesktopBridgeHelpers NOTICES AND INFORMATION \ No newline at end of file diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index ae64dd73d..dd53a2a85 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -1101,16 +1101,6 @@ Global {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.ActiveCfg = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.ActiveCfg = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.ActiveCfg = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.ActiveCfg = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.ActiveCfg = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.Build.0 = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU @@ -1124,33 +1114,18 @@ Global {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.ActiveCfg = Debug|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Build.0 = Debug|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Deploy.0 = Debug|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Build.0 = Debug|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.ActiveCfg = Debug|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Build.0 = Debug|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Deploy.0 = Debug|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|x86 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|x86 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|x86 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.ActiveCfg = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Build.0 = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Deploy.0 = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.ActiveCfg = Release|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.Build.0 = Release|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.Deploy.0 = Release|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.ActiveCfg = Release|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.Build.0 = Release|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.Deploy.0 = Release|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.ActiveCfg = Release|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.Build.0 = Release|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.Deploy.0 = Release|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.ActiveCfg = Release|x86 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Build.0 = Release|x86 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Deploy.0 = Release|x86 + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.ActiveCfg = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Build.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Deploy.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Build.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.ActiveCfg = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Build.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Deploy.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|Any CPU + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Build.0 = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Deploy.0 = Release|Any CPU