Skip to content

Commit 4d7191d

Browse files
alex-kulakovalex-kulakov
committed
Remove net5 from projects + add net7
- changed project build configurations - changed packages for certain cases
1 parent 4ac6895 commit 4d7191d

35 files changed

Lines changed: 197 additions & 197 deletions

File tree

‎Directory.Build.props‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,30 @@
4141
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
4242
</PropertyGroup>
4343

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

5056
<!-- Debug-NET5, Release-NET5 are mostly for development convenience -->
51-
<PropertyGroup Condition = "$(Configuration.Contains('NET5')) == 'true'">
57+
<!-- <PropertyGroup Condition = "$(Configuration.Contains('NET5')) == 'true'"> -->
5258
<!-- hard binding to net5, no property and env variable allowed-->
53-
<TargetFrameworks>net5.0</TargetFrameworks>
54-
</PropertyGroup>
59+
<!-- <TargetFrameworks>net5.0</TargetFrameworks> -->
60+
<!-- </PropertyGroup> -->
5561

5662
<!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
57-
<PropertyGroup Label="Defaults" Condition="$(Configuration.Contains('NET5')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
63+
<PropertyGroup Label="Defaults" Condition="$(Configuration.Contains('NET7')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
5864
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
5965
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
6066
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
61-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net6.0;net5.0</TargetFrameworks> <!-- fallback to default -->
67+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
6268
</PropertyGroup>
6369

6470
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
@@ -74,7 +80,7 @@
7480
<PropertyGroup>
7581
<NoLogo>true</NoLogo>
7682
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
77-
<LangVersion>9.0</LangVersion>
83+
<LangVersion>10.0</LangVersion> <!-- version assigned with net6.0 -->
7884
<SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
7985
$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
8086
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
55
</PropertyGroup>
66
<PropertyGroup>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
99
</PropertyGroup>
1010
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
11-
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
12-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
13-
</ItemGroup>
1411
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1512
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1613
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
15+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
16+
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1919
<PackageReference Include="NUnit" Version="3.13.2" />

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

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.BulkOperations</PackageId>

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

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;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‎

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Localization</PackageId>

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

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<None Include="App.config" />

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

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Logging.NLog</PackageId>

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

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</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‎

Lines changed: 1 addition & 1 deletion
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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Logging.log4net</PackageId>

0 commit comments

Comments
 (0)