Skip to content

Commit 2806909

Browse files
authored
Merge pull request #212 from unoplatform/dev/jela/dotnet-align
chore: Bump to later .NET to align with Uno 5.1
2 parents a924eae + f3c8281 commit 2806909

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

CommunityToolkit.WinUI.Notifications/CommunityToolkit.WinUI.Notifications.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.18362.0;native</TargetFrameworks>
4+
<TargetFrameworks>netstandard1.4;uap10.0.19041;net461;net5.0;net5.0-windows10.0.18362.0;native</TargetFrameworks>
55
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
66
<NuspecFile>CommunityToolkit.WinUI.Notifications.nuspec</NuspecFile>
77
</PropertyGroup>
@@ -11,7 +11,7 @@
1111
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1212
</PropertyGroup>
1313

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

CommunityToolkit.WinUI.Notifications/CommunityToolkit.WinUI.Notifications.nuspec

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@
2626
<group targetFramework="UAP10.0.16299">
2727
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
2828
</group>
29-
<group targetFramework=".NETCoreApp3.1">
30-
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Build,Analyzers" />
31-
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
32-
<dependency id="System.Drawing.Common" version="4.7.0" exclude="Build,Analyzers" />
33-
<dependency id="System.Reflection.Emit" version="4.7.0" exclude="Build,Analyzers" />
34-
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
35-
</group>
3629
<group targetFramework="net5.0">
3730
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
3831
</group>
@@ -64,9 +57,6 @@
6457
<file src="$buildOutput$\net5.0-windows10.0.18362.0\CommunityToolkit.WinUI.Notifications.dll" target="lib\net5.0-windows10.0.18362\CommunityToolkit.WinUI.Notifications.dll" />
6558
<file src="$buildOutput$\net5.0-windows10.0.18362.0\CommunityToolkit.WinUI.Notifications.pdb" target="lib\net5.0-windows10.0.18362\CommunityToolkit.WinUI.Notifications.pdb" />
6659
<file src="$buildOutput$\net5.0-windows10.0.18362.0\CommunityToolkit.WinUI.Notifications.xml" target="lib\net5.0-windows10.0.18362\CommunityToolkit.WinUI.Notifications.xml" />
67-
<file src="$buildOutput$\netcoreapp3.1\CommunityToolkit.WinUI.Notifications.dll" target="lib\netcoreapp3.1\CommunityToolkit.WinUI.Notifications.dll" />
68-
<file src="$buildOutput$\netcoreapp3.1\CommunityToolkit.WinUI.Notifications.pdb" target="lib\netcoreapp3.1\CommunityToolkit.WinUI.Notifications.pdb" />
69-
<file src="$buildOutput$\netcoreapp3.1\CommunityToolkit.WinUI.Notifications.xml" target="lib\netcoreapp3.1\CommunityToolkit.WinUI.Notifications.xml" />
7060
<file src="$buildOutput$\netstandard1.4\CommunityToolkit.WinUI.Notifications.dll" target="lib\netstandard1.4\CommunityToolkit.WinUI.Notifications.dll" />
7161
<file src="$buildOutput$\netstandard1.4\CommunityToolkit.WinUI.Notifications.pdb" target="lib\netstandard1.4\CommunityToolkit.WinUI.Notifications.pdb" />
7262
<file src="$buildOutput$\netstandard1.4\CommunityToolkit.WinUI.Notifications.xml" target="lib\netstandard1.4\CommunityToolkit.WinUI.Notifications.xml" />

build/ci/dotnet-install-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
DotNetVersion: '7.0.302'
3-
UnoCheck_Version: '1.11.0-dev.2'
4-
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
3+
UnoCheck_Version: '1.18.1'
4+
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8a14128754833984a0c83398e7dda6d995199e1b/manifests/uno.ui.manifest.json'
55

66
steps:
77

0 commit comments

Comments
 (0)