Skip to content

Commit 1c2e184

Browse files
committed
feat: support for .net 10.0.
1 parent 07c6f20 commit 1c2e184

File tree

9 files changed

+10
-7
lines changed

9 files changed

+10
-7
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET Core SDK
1515
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '9.0.x'
17+
dotnet-version: '10.0.x'
1818

1919
- name: Build
2020
working-directory: ./build

.github/workflows/bump-up-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET Core SDK
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: '9.0.x'
25+
dotnet-version: '10.0.x'
2626

2727
- name: Publish
2828
working-directory: ./build

.github/workflows/dotnet-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET Core SDK
2020
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '9.0.x'
22+
dotnet-version: '10.0.x'
2323

2424
# 代码文件编码规范机器人,详细请看 [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)
2525
- name: Install dotnetCampus.EncodingNormalior

.github/workflows/push-to-myget.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET Core SDK
1515
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '9.0.x'
17+
dotnet-version: '10.0.x'
1818

1919
- name: setup nuget.exe
2020
uses: NuGet/[email protected]

build/build.config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<task framework="net7.0-windows" target="net7.0" outputsFolder="net7.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
2121
<task framework="net8.0-windows" target="net8.0" outputsFolder="net8.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
2222
<task framework="net9.0-windows" target="net9.0" outputsFolder="net9.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
23+
<task framework="net10.0-windows" target="net10.0" outputsFolder="net10.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
2324
</tasks>
2425
</config>

src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<OutputType>WinExe</OutputType>
44
<AssemblyName>HandyControlDemo</AssemblyName>
55
<RootNamespace>HandyControlDemo</RootNamespace>
6-
<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>
6+
<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;net10.0-windows</TargetFrameworks>
77
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
88
<NoWarn>0108;MSB3026;MSB3061;SYSLIB0014</NoWarn>
99
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>

src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<AssemblyName>HandyControl</AssemblyName>
44
<RootNamespace>HandyControl</RootNamespace>
5-
<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>
5+
<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;net10.0-windows</TargetFrameworks>
66
<Description>Contains some simple and commonly used WPF controls</Description>
77
<PackageId>HandyControl</PackageId>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<UseWPF>true</UseWPF>
44
<AssemblyName>HandyControlDemoCode</AssemblyName>
55
<RootNamespace>HandyControlDemoCode</RootNamespace>
6-
<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>
6+
<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;net10.0-windows</TargetFrameworks>
77
<NoWarn>MSB3026;MSB3061</NoWarn>
88
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
99
</PropertyGroup>

src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ internal static string GetVersion()
4242
var netVersion = ".NET 8.0";
4343
#elif NET9_0
4444
var netVersion = ".NET 9.0";
45+
#elif NET10_0
46+
var netVersion = ".NET 10.0";
4547
#elif NETCOREAPP3_0
4648
var netVersion = ".NET CORE 3.0";
4749
#elif NETCOREAPP3_1

0 commit comments

Comments
 (0)