chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: support for .net 9.0.

Browse Source
This commit is contained in:
NaBian committed 2025-05-19 23:15:47 +08:00
1 parent 3a4d9370de
commit 9f29b888c7
14 files changed
+33 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/.run/HandyControlDemo_Net_GE45.run.xml
+8 -3
View File
@@ -1,18 +1,23 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="HandyControlDemo_Net_GE45" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/Net_GE45/HandyControlDemo_Net_GE45/bin/Debug/net8.0-windows/HandyControlDemo.exe" />
<option name="EXE_PATH" value="$PROJECT_DIR$/Net_GE45/HandyControlDemo_Net_GE45/bin/Debug/net9.0-windows/HandyControlDemo.exe" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Net_GE45/HandyControlDemo_Net_GE45/bin/Debug/net8.0-windows" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Net_GE45/HandyControlDemo_Net_GE45/bin/Debug/net9.0-windows" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="ENV_FILE_PATHS" value="" />
<option name="REDIRECT_INPUT_PATH" value="" />
<option name="PTY_MODE" value="Auto" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<option name="MIXED_MODE_DEBUG" value="0" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
<option name="PROJECT_KIND" value="DotNetCore" />
<option name="PROJECT_TFM" value="net8.0-windows" />
<option name="PROJECT_TFM" value="net9.0-windows" />
<method v="2">
<option name="Build" />
</method>
src/Directory.Build.Props
+1 -1
View File
@@ -5,7 +5,7 @@
<FileVersion>3.5.2.0</FileVersion>
<AssemblyVersion>3.5.2.0</AssemblyVersion>
<LangVersion>latest</LangVersion>
<Copyright>Copyright © HandyOrg 2018-2024</Copyright>
<Copyright>Copyright © HandyOrg 2018-2025</Copyright>
<Authors>HandyOrg</Authors>
<RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
<PackageProjectUrl>https://handyorg.github.io/</PackageProjectUrl>
src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+3 -3
View File
@@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<AssemblyName>HandyControlDemo</AssemblyName>
<RootNamespace>HandyControlDemo</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
<NoWarn>0108;MSB3026;MSB3061;SYSLIB0014</NoWarn>
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
@@ -170,7 +170,7 @@
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\cn.png">
<Link>Resources\Img\Flag\cn.png</Link>
</Resource>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\ca-Es.png">
<Link>Resources\Img\Flag\ca-Es.png</Link>
</Resource>
@@ -256,7 +256,7 @@
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.ca-ES.resx">
<Link>Properties\Langs\Lang.ca-ES.resx</Link>
</EmbeddedResource>
src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+2 -2
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>HandyControl</AssemblyName>
<RootNamespace>HandyControl</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<Description>Contains some simple and commonly used WPF controls</Description>
<PackageId>HandyControl</PackageId>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -35,7 +35,7 @@
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.ca-ES.resx">
<Link>Properties\Langs\Lang.ca-ES.resx</Link>
</EmbeddedResource>
src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<UseWPF>true</UseWPF>
<AssemblyName>HandyControlDemoCode</AssemblyName>
<RootNamespace>HandyControlDemoCode</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<NoWarn>MSB3026;MSB3061</NoWarn>
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
</PropertyGroup>
src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+2
View File
@@ -40,6 +40,8 @@ internal class VersionHelper
var netVersion = ".NET 7.0";
#elif NET8_0
var netVersion = ".NET 8.0";
#elif NET9_0
var netVersion = ".NET 9.0";
#elif NETCOREAPP3_0
var netVersion = ".NET CORE 3.0";
#elif NETCOREAPP3_1