Skip to content

Commit e2c4557

Browse files
kai-melchiorkai-melchior
committed
Merge remote-tracking branch 'remotes/origin/v8' into v9
2 parents 1112320 + 187b3c0 commit e2c4557

24 files changed

Lines changed: 325 additions & 31 deletions

‎CLI/KY.Generator.CLI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Exe</OutputType>
1010
<RootNamespace>KY.Generator</RootNamespace>
1111
<AssemblyName>KY.Generator</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
<IncludeBuildOutput>false</IncludeBuildOutput>
@@ -42,8 +42,8 @@
4242
<HintPath>..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="KY.Core.Common, Version=4.34.1.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\KY.Core.Common.4.34.1\lib\netstandard2.0\KY.Core.Common.dll</HintPath>
45+
<Reference Include="KY.Core.Common, Version=4.36.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\KY.Core.Common.4.36.0\lib\netstandard2.0\KY.Core.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
4949
<HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>

‎CLI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Costura.Fody" version="5.7.0" targetFramework="net461" developmentDependency="true" />
44
<package id="Fody" version="6.5.5" targetFramework="net461" developmentDependency="true" />
5-
<package id="KY.Core.Common" version="4.34.1" targetFramework="net461" />
5+
<package id="KY.Core.Common" version="4.36.0" targetFramework="net462" />
66
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
77
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
88
<package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />

‎Common/Extensions/FrameworkNameExtension.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ public static SwitchableFramework GetSwitchableFramework(this FrameworkName targ
4040
{
4141
return SwitchableFramework.Net9;
4242
}
43+
if (targetFramework.IsCore() && targetFramework.Version.Major == 10)
44+
{
45+
return SwitchableFramework.Net10;
46+
}
4347
return SwitchableFramework.None;
4448
}
4549
}

‎Common/Licensing/LicenseService.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ public void Check()
3131
{
3232
Guid licenseId = this.globalSettingsService.Read().License ;
3333
SignedLicense license = this.globalLicenseService.Read();
34-
if (license.License != null && license.License.Id == licenseId && (license.License.ValidUntil.Date - DateTime.Today).TotalDays >= 7 && license.Validate())
35-
{
36-
this.globalLicenseService.Set(license);
37-
}
38-
else
34+
if (license.License == null || license.License.Id != licenseId || (license.License.ValidUntil.Date - DateTime.Today).TotalDays < 7 || !license.Validate())
3935
{
4036
license = await this.SendCommand<SignedLicense>($"{licenseId}/check");
4137
this.globalLicenseService.Set(license);

‎Common/Models/SwitchableFramework.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public enum SwitchableFramework
44
{
55
None,
66

7-
[FrameworkName("net461")]
7+
[FrameworkName("net462")]
88
Net4,
99

1010
[FrameworkName("netcoreapp2.0")]
@@ -26,6 +26,9 @@ public enum SwitchableFramework
2626
Net8,
2727

2828
[FrameworkName("net9.0")]
29-
Net9
29+
Net9,
30+
31+
[FrameworkName("net10.0")]
32+
Net10
3033
}
3134
}

‎Fluent/nuget.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<copyright>2025 - KY-Programming</copyright>
1818
<tags>KY-Generator KY.Generator Fluent Language</tags>
1919
<dependencies>
20-
<dependency id="KY.Generator" version="9.0.0"></dependency>
21-
<dependency id="KY.Generator.Common" version="9.0.0"></dependency>
20+
<dependency id="KY.Generator" version="9.0.0"/>
21+
<dependency id="KY.Generator.Common" version="9.0.0"/>
2222
</dependencies>
2323
</metadata>
2424
<files>

‎Main.Legacy/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
55
</startup>
66
</configuration>

‎Main.Legacy/KY.Generator.Main.Legacy.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>KY.Generator</RootNamespace>
1010
<AssemblyName>KY.Generator</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
@@ -19,7 +19,7 @@
1919
<DebugSymbols>true</DebugSymbols>
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
22-
<OutputPath>..\bin\Debug\net461\</OutputPath>
22+
<OutputPath>..\bin\Debug\net462\</OutputPath>
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
2828
<PlatformTarget>AnyCPU</PlatformTarget>
2929
<DebugType>pdbonly</DebugType>
3030
<Optimize>true</Optimize>
31-
<OutputPath>..\bin\Release\net461\</OutputPath>
31+
<OutputPath>..\bin\Release\net462\</OutputPath>
3232
<DefineConstants>TRACE</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>

‎Main/KY.Generator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
6-
<TargetFrameworks>netcoreapp2.0;netcoreapp3.0;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.0;netcoreapp3.0;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
77
<Version>9.0.0</Version>
88
<Authors>KY-Programming</Authors>
99
<Product>KY.Generator</Product>

‎Main/nuget.nuspec‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Support for Angular, ASP.NET, ASP.NET Core, C# POCOs, TypeScript POCOs, Entity F
2020
</metadata>
2121
<files>
2222
<file src="..\bin\Release\netstandard2.0\publish\**\*.dll" target="tools\netstandard2.0" />
23-
<file src="..\bin\Release\net461\win-x64\publish\**\*.exe" target="tools\net461" />
24-
<file src="..\bin\Release\net461\win-x64\publish\**\*.dll" target="tools\net461" />
25-
<file src="..\bin\Release\net461\win-x64\publish\**\*.config" target="tools\net461" />
26-
<file src="..\bin\Release\net461\win-x86\publish\**\*.exe" target="tools\net461-x86" />
27-
<file src="..\bin\Release\net461\win-x86\publish\**\*.dll" target="tools\net461-x86" />
28-
<file src="..\bin\Release\net461\win-x86\publish\**\*.config" target="tools\net461-x86" />
23+
<file src="..\bin\Release\net462\win-x64\publish\**\*.exe" target="tools\net462" />
24+
<file src="..\bin\Release\net462\win-x64\publish\**\*.dll" target="tools\net462" />
25+
<file src="..\bin\Release\net462\win-x64\publish\**\*.config" target="tools\net462" />
26+
<file src="..\bin\Release\net462\win-x86\publish\**\*.exe" target="tools\net462-x86" />
27+
<file src="..\bin\Release\net462\win-x86\publish\**\*.dll" target="tools\net462-x86" />
28+
<file src="..\bin\Release\net462\win-x86\publish\**\*.config" target="tools\net462-x86" />
2929
<file src="..\bin\Release\netcoreapp2.0\win-x64\publish\**\*.dll" target="tools\netcoreapp2.0" />
3030
<file src="..\bin\Release\netcoreapp2.0\win-x64\publish\**\*.json" target="tools\netcoreapp2.0" />
3131
<file src="..\bin\Release\netcoreapp2.0\win-x64\publish\**\*.exe" target="tools\netcoreapp2.0" />
@@ -67,6 +67,12 @@ Support for Angular, ASP.NET, ASP.NET Core, C# POCOs, TypeScript POCOs, Entity F
6767
<file src="..\bin\Release\net9.0\win-x86\publish\**\*.dll" target="tools\net9.0-x86" />
6868
<file src="..\bin\Release\net9.0\win-x86\publish\**\*.exe" target="tools\net9.0-x86" />
6969
<file src="..\bin\Release\net9.0\win-x86\publish\**\*.json" target="tools\net9.0-x86" />
70+
<file src="..\bin\Release\net10.0\win-x64\publish\**\*.dll" target="tools\net10.0" />
71+
<file src="..\bin\Release\net10.0\win-x64\publish\**\*.json" target="tools\net10.0" />
72+
<file src="..\bin\Release\net10.0\win-x64\publish\**\*.exe" target="tools\net10.0" />
73+
<file src="..\bin\Release\net10.0\win-x86\publish\**\*.dll" target="tools\net10.0-x86" />
74+
<file src="..\bin\Release\net10.0\win-x86\publish\**\*.exe" target="tools\net10.0-x86" />
75+
<file src="..\bin\Release\net10.0\win-x86\publish\**\*.json" target="tools\net10.0-x86" />
7076
<file src="nuget.targets" target="build\KY.Generator.targets" />
7177
<file src="..\README.md" target="" />
7278
<file src="..\icon.png" target="assets" />

0 commit comments

Comments
 (0)