Skip to content

Commit 9ac2c8d

Browse files
tibitothtibitoth
authored
Merge pull request #8 from ILoyd/master
+semver:minor AutSoft.Mud.Blazor .Net8 Upgrade
2 parents 0fb7ea5 + 840948a commit 9ac2c8d

File tree

16 files changed

+57
-100
lines changed

16 files changed

+57
-100
lines changed

‎AutSoftCore.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.AspNetCore.Blazor",
3838
EndProject
3939
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.Mud.Blazor", "src\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj", "{91EDCF80-45C8-4728-9240-52DA8DAD8F02}"
4040
EndProject
41-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutSoft.EntityFrameworkCore", "src\AutSoft.EntityFrameworkCore\AutSoft.EntityFrameworkCore.csproj", "{A1B22128-F657-474E-ADD1-2CFB6994F14F}"
41+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.EntityFrameworkCore", "src\AutSoft.EntityFrameworkCore\AutSoft.EntityFrameworkCore.csproj", "{A1B22128-F657-474E-ADD1-2CFB6994F14F}"
4242
EndProject
4343
Global
4444
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/AutSoft.All/AutSoft.All.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<Nullable>enable</Nullable>
76
</PropertyGroup>
8-
97
<ItemGroup>
108
<ProjectReference Include="..\AutSoft.AspNetCore.Auth\AutSoft.AspNetCore.Auth.csproj" />
119
<ProjectReference Include="..\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj" />
@@ -14,5 +12,4 @@
1412
<ProjectReference Include="..\AutSoft.Linq\AutSoft.Linq.csproj" />
1513
<ProjectReference Include="..\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj" />
1614
</ItemGroup>
17-
18-
</Project>
15+
</Project>

‎src/AutSoft.AspNetCore.Auth/AutSoft.AspNetCore.Auth.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<Nullable>enable</Nullable>
76
</PropertyGroup>
8-
97
<ItemGroup>
108
<PackageReference Include="Microsoft.AspNetCore.Authorization" />
119
</ItemGroup>
12-
13-
</Project>
10+
</Project>

‎src/AutSoft.AspNetCore.Blazor/AutSoft.AspNetCore.Blazor.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<Nullable>enable</Nullable>
65
<ImplicitUsings>enable</ImplicitUsings>
76
</PropertyGroup>
8-
97
<ItemGroup>
108
<SupportedPlatform Include="browser" />
119
</ItemGroup>
12-
1310
<ItemGroup>
1411
<PackageReference Include="FluentValidation" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
1612
<PackageReference Include="Microsoft.TypeScript.MSBuild">
1713
<PrivateAssets>all</PrivateAssets>
1814
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1915
</PackageReference>
16+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
2017
</ItemGroup>
21-
2218
<ItemGroup>
2319
<ProjectReference Include="..\AutSoft.Core\AutSoft.Common.csproj" />
2420
<ProjectReference Include="..\AutSoft.Linq\AutSoft.Linq.csproj" />
2521
</ItemGroup>
26-
2722
<Target Name="RemoveTSConfigFileFromPackage" AfterTargets="CompileTypeScriptWithTSConfig">
2823
<ItemGroup>
2924
<Content Remove="tsconfig.json" />
3025
</ItemGroup>
3126
</Target>
32-
</Project>
27+
</Project>

‎src/AutSoft.Core/AutSoft.Common.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<Nullable>enable</Nullable>
76
</PropertyGroup>
8-
97
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore" />
128
<PackageReference Include="Stateless" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1311
</ItemGroup>
14-
15-
</Project>
12+
</Project>

‎src/AutSoft.Core/ServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public static class ServiceCollectionExtensions
1515
/// <returns>Expanded service collection</returns>
1616
public static IServiceCollection AddAutSoftCommon(this IServiceCollection services)
1717
{
18-
return services.AddSingleton<ITimeProvider, TimeProvider>();
18+
return services.AddSingleton<ITimeProvider, Time.TimeProvider>();
1919
}
2020
}

‎src/AutSoft.DbScaffolding.Identity/AutSoft.DbScaffolding.Identity.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
96
<PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" PrivateAssets="All" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" />
7+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
119
</ItemGroup>
12-
1310
<ItemGroup>
1411
<ProjectReference Include="..\AutSoft.DbScaffolding\AutSoft.DbScaffolding.csproj" />
1512
</ItemGroup>
16-
1713
<ItemGroup>
1814
<None Remove="CodeTemplates\**\*.hbs" />
1915
<EmbeddedResource Include="CodeTemplates\**\*.hbs" />
2016
</ItemGroup>
21-
22-
</Project>
17+
</Project>

‎src/AutSoft.DbScaffolding.Identity/Generators/IdentityCSharpDbContextGenerator.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
using EntityFrameworkCore.Scaffolding.Handlebars;
77

8+
using Microsoft.EntityFrameworkCore;
89
using Microsoft.EntityFrameworkCore.Design;
910
using Microsoft.EntityFrameworkCore.Metadata;
1011
using Microsoft.EntityFrameworkCore.Metadata.Internal;

‎src/AutSoft.DbScaffolding/AutSoft.DbScaffolding.csproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
86
<PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" PrivateAssets="All" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" />
7+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
108
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" />
119
</ItemGroup>
12-
1310
<ItemGroup>
1411
<None Remove="CodeTemplates\**\*.hbs" />
1512
<EmbeddedResource Include="CodeTemplates\**\*.hbs" />
1613
</ItemGroup>
17-
18-
</Project>
14+
</Project>

‎src/AutSoft.DbScaffolding/Generators/CSharpModelGenerator.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
using AutSoft.DbScaffolding.Configuration;
2-
3-
using EntityFrameworkCore.Scaffolding.Handlebars;
4-
52
using Microsoft.EntityFrameworkCore.Design;
63
using Microsoft.EntityFrameworkCore.Metadata;
7-
using Microsoft.EntityFrameworkCore.Scaffolding;
8-
using Microsoft.EntityFrameworkCore.Scaffolding.Internal;
94
using Microsoft.Extensions.Options;
10-
5+
using EntityFrameworkCore.Scaffolding.Handlebars;
116
using System.Linq;
7+
using Microsoft.EntityFrameworkCore.Scaffolding;
8+
using EntityFrameworkCore.Scaffolding.Handlebars.Internal;
129

1310
namespace AutSoft.DbScaffolding.Generators;
1411

0 commit comments

Comments
 (0)