Skip to content

Commit 05262a4

Browse files
Update projects to target .NET 5
1 parent a20e3cd commit 05262a4

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": false,
4-
"version": "3.1.100",
4+
"version": "5.0.100",
55
"rollForward": "latestFeature"
66
}
77
}

sample/Ookii.Dialogs.Wpf.Sample/Ookii.Dialogs.Wpf.Sample.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
55
<OutputType>WinExe</OutputType>
6+
<SupportedOSPlatform>windows7</SupportedOSPlatform>
67
<UseWPF>true</UseWPF>
78
<UseWindowsForms>true</UseWindowsForms>
89
<RootNamespace>Ookii.Dialogs.Wpf.Sample</RootNamespace>

src/Ookii.Dialogs.Wpf/Ookii.Dialogs.Wpf.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>
4+
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net45</TargetFrameworks>
5+
<SupportedOSPlatform>windows7</SupportedOSPlatform>
56
<UseWPF>true</UseWPF>
67
<UseWindowsForms>true</UseWindowsForms>
78
<RootNamespace>Ookii.Dialogs.Wpf</RootNamespace>
@@ -40,6 +41,10 @@
4041
<DefineConstants>$(DefineConstants);NETCORE31</DefineConstants>
4142
</PropertyGroup>
4243

44+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0-windows' ">
45+
<DefineConstants>$(DefineConstants);NET5</DefineConstants>
46+
</PropertyGroup>
47+
4348
<PropertyGroup>
4449
<MinClientVersion>3.3</MinClientVersion>
4550
<PackageId>Ookii.Dialogs.Wpf</PackageId>

0 commit comments

Comments
 (0)