Skip to content

Commit 153dd57

Browse files
committed
to net7
1 parent 18bd719 commit 153dd57

11 files changed

Lines changed: 41 additions & 40 deletions

File tree

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
4-
"rollForward": "latestFeature",
3+
"version": "7.0.101",
4+
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
}
77
}

src/Modules/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
55
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
66
</PropertyGroup>

src/Modules/SimplCommerce.Module.Core/SimplCommerce.Module.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
13-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.10" />
14+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

src/SimplCommerce.Infrastructure/SimplCommerce.Infrastructure.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<FrameworkReference Include="Microsoft.AspNetCore.App" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
14-
<PackageReference Include="Humanizer" Version="2.11.10" />
12+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
14+
<PackageReference Include="Humanizer" Version="2.14.1" />
1515
<PackageReference Include="MediatR" Version="7.0.0" />
1616
<PackageReference Include="cloudscribe.Web.Pagination" Version="2.1.11" />
1717
<PackageReference Include="ncrontab" Version="3.3.1" />

src/SimplCommerce.WebHost/SimplCommerce.WebHost.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<UserSecretsId>aspnet-Modular.WebHost-dca604fa-ee10-4a6c-8e7d-8cc79dca8c8f</UserSecretsId>
55
<EnableDefaultContentItems>false</EnableDefaultContentItems>
66
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
@@ -57,19 +57,20 @@
5757
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.0.1" />
5858
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
5959
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
60-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.0" />
61-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.0" />
62-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.0" />
63-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
64-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
60+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="7.0.10" />
61+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.10" />
62+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.10" />
63+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.10" />
64+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
6565
<PrivateAssets>all</PrivateAssets>
6666
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6767
</PackageReference>
68-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
68+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
6969
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
7070
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
7171
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00767" />
72+
<PackageReference Include="Humanizer" Version="2.14.1" />
7273
<PackageReference Include="MediatR" Version="7.0.0" />
73-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
74+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
7475
</ItemGroup>
7576
</Project>

src/SimplCommerce.WebHost/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ConnectionStrings": {
3-
"DefaultConnection": "Server=.;Database=SimplCommerce;Trusted_Connection=True;MultipleActiveResultSets=true"
3+
"DefaultConnection": "Server=.;Database=SimplCommerce;Trusted_Connection=True;TrustServerCertificate=true;MultipleActiveResultSets=true"
44
},
55
"Authentication" : {
66
"Facebook" : {

test/SimplCommerce.Infrastructure.Tests/SimplCommerce.Infrastructure.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
10-
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
11-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
10+
<PackageReference Include="xunit" Version="2.5.0" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>

test/SimplCommerce.Module.Cms.Tests/SimplCommerce.Module.Cms.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
1010
<PackageReference Include="Moq" Version="4.16.1" />
11-
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
11+
<PackageReference Include="xunit" Version="2.5.0" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

test/SimplCommerce.Module.Core.Tests/SimplCommerce.Module.Core.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
1010
<PackageReference Include="Moq" Version="4.16.1" />
11-
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
11+
<PackageReference Include="xunit" Version="2.5.0" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

test/SimplCommerce.Module.Inventory.Tests/SimplCommerce.Module.Inventory.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
1111
<PackageReference Include="Moq" Version="4.16.1" />
12-
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
12+
<PackageReference Include="xunit" Version="2.5.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

0 commit comments

Comments
 (0)