feat: support for .net 9.0.
This commit is contained in:
NaBian committed
1 parent
3a4d9370de
commit
9f29b888c7
14 files changed
+33
-18
No files matched your search
@@ -30,6 +30,8 @@ body:
|
||||
attributes:
|
||||
label: NuGet package version
|
||||
options:
|
||||
- "HandyControl 3.5.1"
|
||||
- "HandyControl 3.5.0"
|
||||
- "HandyControl 3.4.0"
|
||||
- "HandyControl 3.3.0"
|
||||
- "HandyControl 3.2.0"
|
||||
@@ -58,10 +60,14 @@ body:
|
||||
description: please specify for which framework type you have encountered the issue.
|
||||
multiple: true
|
||||
options:
|
||||
- ".Net 9.0"
|
||||
- ".Net 8.0"
|
||||
- ".Net 7.0"
|
||||
- ".Net 6.0"
|
||||
- ".Net 5.0"
|
||||
- ".Net Core 3.1"
|
||||
- ".Net Core 3.0"
|
||||
- ".Net Framework 4.8.1"
|
||||
- ".Net Framework 4.8"
|
||||
- ".Net Framework 4.7.2"
|
||||
- ".Net Framework 4.7.1"
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
- name: Setup .NET Core SDK
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
dotnet-version: '9.0.x'
|
||||
|
||||
- name: Build
|
||||
working-directory: ./build
|
||||
|
||||
@@ -22,7 +22,7 @@ jobs:
|
||||
- name: Setup .NET Core SDK
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
dotnet-version: '9.0.x'
|
||||
|
||||
- name: Publish
|
||||
working-directory: ./build
|
||||
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
- name: Setup .NET Core SDK
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
dotnet-version: '9.0.x'
|
||||
|
||||
# 代码文件编码规范机器人，详细请看 [dotnet 在 GitHub 的 Action 上部署自动代码编码规范机器人](https://blog.lindexi.com/post/dotnet-%E5%9C%A8-GitHub-%E7%9A%84-Action-%E4%B8%8A%E9%83%A8%E7%BD%B2%E8%87%AA%E5%8A%A8%E4%BB%A3%E7%A0%81%E7%BC%96%E7%A0%81%E8%A7%84%E8%8C%83%E6%9C%BA%E5%99%A8%E4%BA%BA.html)
|
||||
- name: Install dotnetCampus.EncodingNormalior
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
- name: Setup .NET Core SDK
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
dotnet-version: '9.0.x'
|
||||
|
||||
- name: setup nuget.exe
|
||||
uses: NuGet/setup-nuget@v1.0.5
|
||||
@@ -24,7 +24,7 @@ jobs:
|
||||
run: |
|
||||
cd build
|
||||
.\build.ps1
|
||||
nuget pack build-for-myget.nuspec -version 3.5.0-beta.${env:GITHUB_RUN_NUMBER}
|
||||
nuget pack build-for-myget.nuspec -version 3.7.0-beta.${env:GITHUB_RUN_NUMBER}
|
||||
$nupkgName = @(gci *.nupkg)[0].Name
|
||||
$mygetSourcePath = "https://www.myget.org/F/handycontrol"
|
||||
nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright © HandyOrg 2018-2024
|
||||
Copyright © HandyOrg 2018-2025
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<Item Type="HandyControl.Controls.ColorPicker" />
|
||||
<Item Type="HandyControl.Controls.ComboBox" />
|
||||
<Item Type="HandyControl.Controls.CompareSlider" />
|
||||
<Item Type="HandyControl.Controls.ConfettiCannon" />
|
||||
<Item Type="HandyControl.Controls.ContextMenuButton" />
|
||||
<Item Type="HandyControl.Controls.ContextMenuToggleButton" />
|
||||
<Item Type="HandyControl.Controls.CoverFlow" />
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<outputsFolder>outputs</outputsFolder>
|
||||
<tasks>
|
||||
<task framework="net40" target=".NETFramework4.0" outputsFolder="net40" configuration="Release-Net40" domain="Net_40" buildLib="true" buildDemo="true"/>
|
||||
<!-- <task framework="net45" target=".NETFramework4.5" outputsFolder="net45" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net45" target=".NETFramework4.5" outputsFolder="net45" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net451" target=".NETFramework4.5.1" outputsFolder="net451" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net452" target=".NETFramework4.5.2" outputsFolder="net452" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net46" target=".NETFramework4.6" outputsFolder="net46" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
@@ -18,6 +18,7 @@
|
||||
<task framework="net5.0-windows" target="net5.0" outputsFolder="net5.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net6.0-windows" target="net6.0" outputsFolder="net6.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net7.0-windows" target="net7.0" outputsFolder="net7.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net8.0-windows" target="net8.0" outputsFolder="net8.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/> -->
|
||||
<task framework="net8.0-windows" target="net8.0" outputsFolder="net8.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
<task framework="net9.0-windows" target="net9.0" outputsFolder="net9.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||
</tasks>
|
||||
</config>
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user