Skip to content

Commit 1236845

Browse files
alex-kulakovalex-kulakov
committed
Net8 compilation
1 parent 5bca154 commit 1236845

File tree

35 files changed

+191
-57
lines changed

35 files changed

+191
-57
lines changed

‎Directory.Build.props

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,15 @@
4141
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
4242
</PropertyGroup>
4343

44+
<!-- Debug-NET8, Release-NET8 are mostly for development convenience -->
45+
<PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
46+
<!-- hard binding to net8, no property and env variable allowed-->
47+
<TargetFrameworks>net8.0</TargetFrameworks>
48+
</PropertyGroup>
49+
4450
<!-- Debug-NET7, Release-NET7 are mostly for development convenience -->
4551
<PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
46-
<!-- hard binding to net5, no property and env variable allowed-->
52+
<!-- hard binding to net7, no property and env variable allowed-->
4753
<TargetFrameworks>net7.0</TargetFrameworks>
4854
</PropertyGroup>
4955

@@ -53,18 +59,12 @@
5359
<TargetFrameworks>net6.0</TargetFrameworks>
5460
</PropertyGroup>
5561

56-
<!-- Debug-NET5, Release-NET5 are mostly for development convenience -->
57-
<!-- <PropertyGroup Condition = "$(Configuration.Contains('NET5')) == 'true'"> -->
58-
<!-- hard binding to net5, no property and env variable allowed-->
59-
<!-- <TargetFrameworks>net5.0</TargetFrameworks> -->
60-
<!-- </PropertyGroup> -->
61-
6262
<!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
6363
<PropertyGroup Label="Defaults" Condition="$(Configuration.Contains('NET7')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
6464
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
6565
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
6666
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
67-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
67+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
6868
</PropertyGroup>
6969

7070
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">

‎Extensions/TestCommon/TestCommon.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<PropertyGroup>
77
<SignAssembly>true</SignAssembly>
@@ -11,8 +11,8 @@
1111
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1212
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1313
</ItemGroup>
14-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
15-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
14+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
15+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

‎Extensions/Xtensive.Orm.BulkOperations.Tests/Xtensive.Orm.BulkOperations.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

‎Extensions/Xtensive.Orm.BulkOperations/Xtensive.Orm.BulkOperations.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.BulkOperations</PackageId>

‎Extensions/Xtensive.Orm.Localization.Tests/Xtensive.Orm.Localization.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET7;Release-NET7</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

‎Extensions/Xtensive.Orm.Localization/Xtensive.Orm.Localization.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Localization</PackageId>

‎Extensions/Xtensive.Orm.Logging.NLog.Tests/Xtensive.Orm.Logging.NLog.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<None Include="App.config" />

‎Extensions/Xtensive.Orm.Logging.NLog/Xtensive.Orm.Logging.NLog.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Logging.NLog</PackageId>

‎Extensions/Xtensive.Orm.Logging.log4net.Tests/Xtensive.Orm.Logging.log4net.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

‎Extensions/Xtensive.Orm.Logging.log4net/Xtensive.Orm.Logging.log4net.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Logging.log4net</PackageId>

‎Extensions/Xtensive.Orm.Reprocessing.Tests/Xtensive.Orm.Reprocessing.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

‎Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Reprocessing</PackageId>
@@ -15,8 +15,8 @@
1515
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1717
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
18+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<None Include="Readme.txt" />

‎Extensions/Xtensive.Orm.Security.Tests/Xtensive.Orm.Security.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

‎Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Security</PackageId>
@@ -16,8 +16,8 @@
1616
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1717
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1818
</ItemGroup>
19-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
19+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

‎Extensions/Xtensive.Orm.Tracking.Tests/Xtensive.Orm.Tracking.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Optimize>false</Optimize>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
7-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
7+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
88
</PropertyGroup>
99
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1010
<ItemGroup>

‎Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Tracking</PackageId>
@@ -15,8 +15,8 @@
1515
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1717
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
18+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
19+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

‎Extensions/Xtensive.Orm.Web.Tests/Xtensive.Orm.Web.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IsPackable>false</IsPackable>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
7-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
7+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
88
</PropertyGroup>
99
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1010
<ItemGroup>

‎Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Web</PackageId>
@@ -18,8 +18,8 @@
1818
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1919
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2020
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
22-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
21+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
22+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />

‎MSBuild/DataObjects.Net.targets

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<CompileDependsOn>$(CompileDependsOn);XtensiveOrmBuild</CompileDependsOn>
1313
<XtensiveOrmPath Condition="'$(XtensiveOrmPath)'==''">$(MSBuildThisFileDirectory)</XtensiveOrmPath>
1414
<XtensiveOrmPath Condition="!HasTrailingSlash('$(XtensiveOrmPath)')">$(XtensiveOrmPath)\</XtensiveOrmPath>
15-
<XtensiveWeaverFramework>net7.0</XtensiveWeaverFramework> <!-- works for net7.0 as well -->
16-
<XtensiveWeaverFramework Condition="'$(TargetFramework)'=='net6.0'">net6.0</XtensiveWeaverFramework> <!-- works for net7.0 as well, just in case -->
15+
<XtensiveWeaverFramework>net8.0</XtensiveWeaverFramework>
16+
<XtensiveWeaverFramework Condition="'$(TargetFramework)'=='net7.0'">net7.0</XtensiveWeaverFramework>
17+
<XtensiveWeaverFramework Condition="'$(TargetFramework)'=='net6.0'">net6.0</XtensiveWeaverFramework>
1718
<XtensiveOrmWeaver Condition="'$(XtensiveOrmWeaver)'==''">$(XtensiveOrmPath)tools\weaver\$(XtensiveWeaverFramework)\Xtensive.Orm.Weaver.dll</XtensiveOrmWeaver>
1819
<XtensiveOrmBuildDependsOn>$(XtensiveOrmBuildDependsOn)</XtensiveOrmBuildDependsOn>
1920
</PropertyGroup>

0 commit comments

Comments
 (0)