support for net 5.0

This commit is contained in:
NaBian committed 2020-06-18 00:53:34 +08:00
1 parent 507a44aa25
commit 37ba3accd8
4 files changed
+5 -3

No files matched your search

@@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AssemblyName>HandyControlDemo</AssemblyName> <AssemblyName>HandyControlDemo</AssemblyName>
<RootNamespace>HandyControlDemo</RootNamespace> <RootNamespace>HandyControlDemo</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48</TargetFrameworks> <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net50</TargetFrameworks>
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon> <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
<NoWarn>0108</NoWarn> <NoWarn>0108</NoWarn>
</PropertyGroup> </PropertyGroup>
@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AssemblyName>HandyControl</AssemblyName> <AssemblyName>HandyControl</AssemblyName>
<RootNamespace>HandyControl</RootNamespace> <RootNamespace>HandyControl</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48</TargetFrameworks> <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net50</TargetFrameworks>
<Description>Contains some commonly used simple WPF controls</Description> <Description>Contains some commonly used simple WPF controls</Description>
<PackageId>HandyControl</PackageId> <PackageId>HandyControl</PackageId>
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
@@ -3,7 +3,7 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyName>HandyControlDemoCode</AssemblyName> <AssemblyName>HandyControlDemoCode</AssemblyName>
<RootNamespace>HandyControlDemoCode</RootNamespace> <RootNamespace>HandyControlDemoCode</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net462;net47;net48</TargetFrameworks> <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net462;net47;net48;net50</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Window\AboutWindow.xaml"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Window\AboutWindow.xaml">
@@ -28,6 +28,8 @@ namespace HandyControlDemo.Window
var netVersion = "CORE 30"; var netVersion = "CORE 30";
#elif NETCOREAPP3_1 #elif NETCOREAPP3_1
var netVersion = "CORE 31"; var netVersion = "CORE 31";
#else
var netVersion = "NET 50";
#endif #endif
Version = $"v {versionInfo.FileVersion} {netVersion}"; Version = $"v {versionInfo.FileVersion} {netVersion}";
} }