Skip to content

Commit 8590ffe

Browse files
hishamcohishamco
committed
.NET 8.0 & 10.0 should works together
1 parent 449cf7d commit 8590ffe

9 files changed

Lines changed: 62 additions & 32 deletions

File tree

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,3 +397,11 @@ FodyWeavers.xsd
397397
# JetBrains Rider
398398
*.sln.iml
399399
src/OrchardCoreContrib.Testing.Web/Localization
400+
src/OrchardCoreContrib.Testing.UI/Localization
401+
src/OrchardCoreContrib.Testing.UI/wwwroot
402+
src/OrchardCoreContrib.Testing/Localization
403+
src/OrchardCoreContrib.Testing/wwwroot
404+
test/OrchardCoreContrib.Testing.Tests/Localization
405+
test/OrchardCoreContrib.Testing.Tests/wwwroot
406+
test/OrchardCoreContrib.Testing.UI.Tests/Localization
407+
test/OrchardCoreContrib.Testing.UI.Tests/wwwroot

‎Directory.Build.props‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
4+
<LangVersion>latest</LangVersion>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>disable</Nullable>
7+
<!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
8+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
9+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
10+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
11+
<NoWarn>NU1507</NoWarn>
12+
13+
<OrchardCoreVersion>2.2.1</OrchardCoreVersion>
14+
</PropertyGroup>
15+
</Project>

‎Directory.Packages.props‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
4+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
5+
<PackageVersion Include="xunit" Version="2.9.3" />
6+
<PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0-pre.4" />
7+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.24" />
8+
<PackageVersion Include="OrchardCore.Abstractions" Version="$(OrchardCoreVersion)" />
9+
<PackageVersion Include="OrchardCore.Infrastructure.Abstractions" Version="$(OrchardCoreVersion)" />
10+
<PackageVersion Include="OrchardCore.Tenants" Version="$(OrchardCoreVersion)" />
11+
<PackageVersion Include="OrchardCore.Logging.NLog" Version="$(OrchardCoreVersion)" />
12+
<PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="$(OrchardCoreVersion)" />
13+
<PackageVersion Include="Microsoft.Playwright" Version="1.59.0" />
14+
<PackageVersion Include="OrchardCoreContrib.Infrastructure.Abstractions" Version="2.6.1" />
15+
<PackageVersion Include="Moq" Version="4.20.72" />
16+
</ItemGroup>
17+
</Project>

‎OrchardCoreContrib.Testing.slnx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path="Directory.Build.props" />
4+
<File Path="Directory.Packages.props" />
5+
</Folder>
26
<Folder Name="/src/">
37
<Project Path="src/OrchardCoreContrib.Testing.UI/OrchardCoreContrib.Testing.UI.csproj" />
48
<Project Path="src/OrchardCoreContrib.Testing.Web/OrchardCoreContrib.Testing.Web.csproj" />

‎src/OrchardCoreContrib.Testing.UI/OrchardCoreContrib.Testing.UI.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<IsPackable>true</IsPackable>
74
<VersionPrefix>1.0.0-beta2</VersionPrefix>
85
<Authors>The Orchard Core Contrib Team</Authors>
96
<Company />
@@ -32,9 +29,9 @@
3229
</ItemGroup>
3330

3431
<ItemGroup>
35-
<PackageReference Include="Microsoft.Playwright" Version="1.59.0" />
36-
<PackageReference Include="OrchardCoreContrib.Infrastructure.Abstractions" Version="2.6.1" />
37-
<PackageReference Include="xunit" Version="2.9.3" />
32+
<PackageReference Include="Microsoft.Playwright" />
33+
<PackageReference Include="OrchardCoreContrib.Infrastructure.Abstractions" />
34+
<PackageReference Include="xunit" />
3835
</ItemGroup>
3936

4037
<ItemGroup>

‎src/OrchardCoreContrib.Testing.Web/OrchardCoreContrib.Testing.Web.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
54
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
65
<Nullable>enable</Nullable>
76
<ImplicitUsings>enable</ImplicitUsings>
@@ -18,11 +17,8 @@
1817
</ItemGroup>
1918

2019
<ItemGroup>
21-
<PackageReference Include="OrchardCore.Logging.NLog" Version="2.2.1" />
22-
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.2.1" />
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.8" Condition="'$(TargetFramework)' == 'net10.0'" />
24-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.6.0" Condition="'$(TargetFramework)' == 'net10.0'" />
25-
<PackageReference Include="Microsoft.Identity.Web" Version="4.9.0" Condition="'$(TargetFramework)' == 'net10.0'" />
20+
<PackageReference Include="OrchardCore.Logging.NLog" />
21+
<PackageReference Include="OrchardCore.Application.Cms.Targets" />
2622
</ItemGroup>
2723

2824
</Project>

‎src/OrchardCoreContrib.Testing/OrchardCoreContrib.Testing.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<VersionPrefix>1.0.0-beta3</VersionPrefix>
75
<Authors>The Orchard Core Contrib Team</Authors>
86
<Company />
@@ -23,11 +21,10 @@
2321
</PropertyGroup>
2422

2523
<ItemGroup>
26-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.8" />
27-
<PackageReference Include="OrchardCore.Abstractions" Version="2.2.1" />
28-
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="2.2.1" />
29-
<PackageReference Include="OrchardCore.Tenants" Version="2.2.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.27" />
24+
<PackageReference Include="OrchardCore.Abstractions" />
25+
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
26+
<PackageReference Include="OrchardCore.Tenants" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
3128
</ItemGroup>
3229

3330
<ItemGroup>

‎test/OrchardCoreContrib.Testing.Tests/OrchardCoreContrib.Testing.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<IsPackable>false</IsPackable>
75
<IsTestProject>true</IsTestProject>
86
</PropertyGroup>
97

108
<ItemGroup>
11-
<PackageReference Include="coverlet.collector" Version="10.0.0">
9+
<PackageReference Include="coverlet.collector">
1210
<PrivateAssets>all</PrivateAssets>
1311
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1412
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
16-
<PackageReference Include="xunit" Version="2.9.3" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0-pre.4">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
14+
<PackageReference Include="xunit" />
15+
<PackageReference Include="xunit.runner.visualstudio">
1816
<PrivateAssets>all</PrivateAssets>
1917
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2018
</PackageReference>

‎test/OrchardCoreContrib.Testing.UI.Tests/OrchardCoreContrib.Testing.UI.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<IsPackable>false</IsPackable>
75
<IsTestProject>true</IsTestProject>
86
</PropertyGroup>
97

108
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
12-
<PackageReference Include="Moq" Version="4.20.72" />
13-
<PackageReference Include="xunit" Version="2.9.3" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0-pre.4">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10+
<PackageReference Include="Moq" />
11+
<PackageReference Include="xunit" />
12+
<PackageReference Include="xunit.runner.visualstudio">
1513
<PrivateAssets>all</PrivateAssets>
1614
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1715
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="10.0.0">
16+
<PackageReference Include="coverlet.collector">
1917
<PrivateAssets>all</PrivateAssets>
2018
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2119
</PackageReference>

0 commit comments

Comments
 (0)