Skip to content
This repository was archived by the owner on Feb 25, 2026. It is now read-only.

.NET 5 support for Notifications package #3622

Merged
andrewleader merged 18 commits into from
Jan 26, 2021
Merged

.NET 5 support for Notifications package #3622

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
644005e
Works with .NET 5
andrewleader Dec 11, 2020
6f9566d
Merge branch 'master' into aleader/notifications-net-5
andrewleader Dec 11, 2020
c6f3878
Merge branch 'master' into aleader/notifications-net-5
andrewleader Dec 11, 2020
186d154
Keep UWP min version at 10240
andrewleader Dec 11, 2020
5f17993
Merge branch 'aleader/notifications-net-5' of https://github.com/wind…
andrewleader Dec 11, 2020
a4eff63
Merge branch 'master' into aleader/notifications-net-5
andrewleader Dec 11, 2020
9dd9fd5
Undo accidentally committed change
andrewleader Dec 11, 2020
72205c9
Merge branch 'master' into aleader/notifications-net-5
azchohfi Dec 15, 2020
3920ebc
Aleader/notifications net 5 and native (#3644)
andrewleader Dec 22, 2020
ad7be92
Support for UWP 10240
andrewleader Dec 22, 2020
b454de1
Interop working on all but UWP 15063 and lower
andrewleader Dec 23, 2020
056e0be
Fix warnings
andrewleader Dec 23, 2020
4794810
Merge branch 'master' into aleader/notifications-net-5
andrewleader Dec 24, 2020
bbf295f
Merge branch 'master' into aleader/notifications-net-5
andrewleader Jan 4, 2021
d407488
Support activating when process is elevated
andrewleader Jan 7, 2021
c23b5df
Fix warnings
andrewleader Jan 12, 2021
4277b49
Merge branch 'master' into aleader/notifications-net-5
michael-hawker Jan 22, 2021
d1518bd
Nuspec updates
andrewleader Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<!--<TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>-->
<!-- Removed 'native' target to unblock CI on VS 16.8, tied to changes breaking workaround for https://github.com/NuGet/Home/issues/5154 -->
<TargetFrameworks>netstandard1.4;uap10.0;net461;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0</TargetFrameworks>

@michael-hawker michael-hawker Dec 15, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clairernovotny when we specify uap10.0.19041 here will to be enforced for the "Target" or the "Min" required version of the app?

In our other packages we assume it's the min and have 17763, so I would assume we want to follow that pattern here as well?

@andrewleader was there some guidance or doc you reference in setting this up?

@andrewleader andrewleader Dec 15, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uap10.0.19041 is the target, not the min. Min version is specified in the <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>, I've tested and confirmed it installs on old UWPs. I don't think the MSBuild.Sdk.Extras has documented all of this, but it works 🤷‍♂️

That's how the net5.0-windows TF works too, what's specified is the target... however, there's a weird case where if the app is targeting 17763 and the library is targeting 19041 but ALSO has a plain net5.0 target, it'll pick net5.0 instead... hence why I've kept net5.0-windows at 17763 (I confirmed you do not need the 17763 SDK installed to build it though so ppl only need 19041 SDK).

<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
<Title>Windows Community Toolkit Notifications</Title>
<Description>
Expand All @@ -27,16 +27,17 @@
<!--Reference Windows SDK NuGet of correct target platform version-->
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
</ItemGroup>
<PropertyGroup>
<!--Define the WINDOWS_UWP conditional symbol, since the Windows.Data.Xml and the Windows.UI.Notification namespaces are available-->
<DefineConstants>$(DefineConstants);WINDOWS_UWP;WIN32</DefineConstants>
</PropertyGroup>
</When>

</Choose>

<PropertyGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='net5.0-windows10.0.17763.0'">
<!--Define the WINDOWS_UWP conditional symbol, since the Windows.Data.Xml and the Windows.UI.Notification namespaces are available-->
<DefineConstants>$(DefineConstants);WINDOWS_UWP;WIN32</DefineConstants>
</PropertyGroup>

<!--NET Core desktop apps also need the Registry NuGet package and System.Reflection.Emit for generating COM class dynamically-->
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='net5.0-windows10.0.17763.0'">
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.54"
"MSBuild.Sdk.Extras": "3.0.22"
}
}