feat: support for .net 10.0.
This commit is contained in:
1 parent
07c6f202f5
commit
1c2e1848b5
9 files changed
+10
-7
No files matched your search
@@ -14,7 +14,7 @@ jobs:
|
|||||||
- name: Setup .NET Core SDK
|
- name: Setup .NET Core SDK
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: '9.0.x'
|
dotnet-version: '10.0.x'
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: ./build
|
working-directory: ./build
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ jobs:
|
|||||||
- name: Setup .NET Core SDK
|
- name: Setup .NET Core SDK
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: '9.0.x'
|
dotnet-version: '10.0.x'
|
||||||
|
|
||||||
- name: Publish
|
- name: Publish
|
||||||
working-directory: ./build
|
working-directory: ./build
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
- name: Setup .NET Core SDK
|
- name: Setup .NET Core SDK
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: '9.0.x'
|
dotnet-version: '10.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)
|
# 代码文件编码规范机器人,详细请看 [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
|
- name: Install dotnetCampus.EncodingNormalior
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
- name: Setup .NET Core SDK
|
- name: Setup .NET Core SDK
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v4
|
||||||
with:
|
with:
|
||||||
dotnet-version: '9.0.x'
|
dotnet-version: '10.0.x'
|
||||||
|
|
||||||
- name: setup nuget.exe
|
- name: setup nuget.exe
|
||||||
uses: NuGet/setup-nuget@v1.0.5
|
uses: NuGet/setup-nuget@v1.0.5
|
||||||
|
|||||||
@@ -20,5 +20,6 @@
|
|||||||
<task framework="net7.0-windows" target="net7.0" outputsFolder="net7.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"/>
|
<task framework="net9.0-windows" target="net9.0" outputsFolder="net9.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||||
|
<task framework="net10.0-windows" target="net10.0" outputsFolder="net10.0" configuration="Release" domain="Net_GE45" buildLib="true" buildDemo="true"/>
|
||||||
</tasks>
|
</tasks>
|
||||||
</config>
|
</config>
|
||||||
@@ -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;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>
|
<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>
|
||||||
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
|
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
|
||||||
<NoWarn>0108;MSB3026;MSB3061;SYSLIB0014</NoWarn>
|
<NoWarn>0108;MSB3026;MSB3061;SYSLIB0014</NoWarn>
|
||||||
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
|
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyName>HandyControl</AssemblyName>
|
<AssemblyName>HandyControl</AssemblyName>
|
||||||
<RootNamespace>HandyControl</RootNamespace>
|
<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;net9.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;net10.0-windows</TargetFrameworks>
|
||||||
<Description>Contains some simple and commonly used WPF controls</Description>
|
<Description>Contains some simple and commonly used WPF controls</Description>
|
||||||
<PackageId>HandyControl</PackageId>
|
<PackageId>HandyControl</PackageId>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
|||||||
@@ -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;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>
|
<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>
|
||||||
<NoWarn>MSB3026;MSB3061</NoWarn>
|
<NoWarn>MSB3026;MSB3061</NoWarn>
|
||||||
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
|
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ internal class VersionHelper
|
|||||||
var netVersion = ".NET 8.0";
|
var netVersion = ".NET 8.0";
|
||||||
#elif NET9_0
|
#elif NET9_0
|
||||||
var netVersion = ".NET 9.0";
|
var netVersion = ".NET 9.0";
|
||||||
|
#elif NET10_0
|
||||||
|
var netVersion = ".NET 10.0";
|
||||||
#elif NETCOREAPP3_0
|
#elif NETCOREAPP3_0
|
||||||
var netVersion = ".NET CORE 3.0";
|
var netVersion = ".NET CORE 3.0";
|
||||||
#elif NETCOREAPP3_1
|
#elif NETCOREAPP3_1
|
||||||
|
|||||||
Reference in new issue
Block a user