Skip to content

Commit 793d87c

Browse files
hikalkanhikalkan
authored
Merge pull request #9700 from abpframework/net6
Upgrading to .NET 6.0.
2 parents b6c69fa + 6bc0de6 commit 793d87c

File tree

320 files changed

+453
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+453
-540
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v2
2222
- uses: actions/setup-dotnet@master
2323
with:
24-
dotnet-version: 5.0.201
24+
dotnet-version: 6.0.100-rc.1.21458.32
2525

2626
- name: Build All
2727
run: .\build-all.ps1

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33

44
<!-- All Microsoft packages -->
5-
<MicrosoftPackageVersion>5.0.*</MicrosoftPackageVersion>
5+
<MicrosoftPackageVersion>6.0.0-rc.*</MicrosoftPackageVersion>
66

77
<!-- Microsoft.NET.Test.Sdk https://www.nuget.org/packages/Microsoft.NET.Test.Sdk -->
88
<MicrosoftNETTestSdkPackageVersion>16.9.1</MicrosoftNETTestSdkPackageVersion>

‎framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.Authentication.JwtBearer</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.Authentication.JwtBearer</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.Authentication.OAuth</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<RootNamespace />
99
</PropertyGroup>
1010

‎framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<IsPackable>true</IsPackable>
99
<OutputType>Library</OutputType>
1010
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>

‎framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<IsPackable>true</IsPackable>
99
<OutputType>Library</OutputType>
1010
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>

‎framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<RootNamespace />
99
</PropertyGroup>
1010

‎framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.Components.WebAssembly</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.Components.WebAssembly</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.Components</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.Components</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.MultiTenancy</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.MultiTenancy</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Client</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.Mvc.Client</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<RootNamespace />
99
</PropertyGroup>
1010

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Packages</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Packages</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Widgets</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Widgets</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc.UI</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<AssemblyName>Volo.Abp.AspNetCore.Mvc</AssemblyName>
1010
<PackageId>Volo.Abp.AspNetCore.Mvc</PackageId>

‎framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ public void Configure(JsonOptions options)
3030

3131
options.JsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter());
3232
options.JsonSerializerOptions.Converters.Add(new AbpHasExtraPropertiesJsonConverterFactory());
33+
34+
// Remove after this PR.
35+
// https://github.com/dotnet/runtime/pull/57525
36+
options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.Strict;
3337
}
3438
}
3539
}

‎framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.Serilog</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.Serilog</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.SignalR</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.SignalR</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore.TestBase</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore.TestBase</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<AssemblyName>Volo.Abp.AspNetCore</AssemblyName>
99
<PackageId>Volo.Abp.AspNetCore</PackageId>
1010
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

‎framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<RootNamespace />
99
</PropertyGroup>
1010

‎framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\common.props" />
55

66
<PropertyGroup>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="NuGet.Versioning" Version="5.9.0" />
2020
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(MicrosoftPackageVersion)" />
2121
<PackageReference Include="System.Security.Permissions" Version="$(MicrosoftPackageVersion)" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.final" />
2323
<PackageReference Include="Polly" Version="7.2.1" />
2424
<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
2525
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />

0 commit comments

Comments
 (0)