Skip to content

Commit 7f13298

Browse files
committed
Merge branch '6.0' into 7.0
# Conflicts: # Extensions/TestCommon/TestCommon.csproj # Extensions/Xtensive.Orm.BulkOperations.Tests/Xtensive.Orm.BulkOperations.Tests.csproj # Extensions/Xtensive.Orm.Localization.Tests/Xtensive.Orm.Localization.Tests.csproj # Extensions/Xtensive.Orm.Logging.NLog.Tests/Xtensive.Orm.Logging.NLog.Tests.csproj # Extensions/Xtensive.Orm.Logging.log4net.Tests/Xtensive.Orm.Logging.log4net.Tests.csproj # Extensions/Xtensive.Orm.Reprocessing.Tests/Xtensive.Orm.Reprocessing.Tests.csproj # Extensions/Xtensive.Orm.Security.Tests/Xtensive.Orm.Security.Tests.csproj # Extensions/Xtensive.Orm.Tracking.Tests/Xtensive.Orm.Tracking.Tests.csproj # Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj # Orm/Xtensive.Orm.Manual/Xtensive.Orm.Manual.csproj # Orm/Xtensive.Orm.Tests.Core/Xtensive.Orm.Tests.Core.csproj # Orm/Xtensive.Orm.Tests.Sql/Xtensive.Orm.Tests.Sql.csproj # Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj # global.json
2 parents 185f4ca + 27a34ac commit 7f13298

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/actions/setup-dotnets/action.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ runs:
1111
using: "composite"
1212

1313
steps:
14+
# Use for build, ususally newer that one that runs the code.
15+
# sometimes it has more coding features
16+
- name: Setup global.json version
17+
uses: actions/setup-dotnet@v4
18+
1419
- name: Setup .NET 9 (if needed)
1520
if: ${{ contains(inputs.target_framework, '9.0') }}
1621
uses: actions/setup-dotnet@v4
@@ -42,7 +47,7 @@ runs:
4247
dotnet-version: '5.0.x'
4348

4449
- name: Setup .NET Core 3.1 (if needed)
45-
if: ${{ contains(inputs.target_framework, '2.0') || contains(inputs.target_framework, '3.1') }}
50+
if: ${{ contains(inputs.target_framework, '3.1') }}
4651
uses: actions/setup-dotnet@v4
4752
with:
4853
dotnet-version: '3.1.x'

Orm/Xtensive.Orm.Tests.Core/Xtensive.Orm.Tests.Core.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<!--<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />-->
2524
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
2625
<PackageReference Include="NUnit" Version="3.14.0" />
2726
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1">

Orm/Xtensive.Orm.Tests.Sql/Xtensive.Orm.Tests.Sql.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<DefineConstants>TRACE</DefineConstants>
1818
</PropertyGroup>
1919
<ItemGroup>
20-
<!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> -->
2120
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
2221
<PackageReference Include="NUnit" Version="3.14.0" />
2322
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1">

Orm/Xtensive.Orm.Tests/Xtensive.Orm.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</PropertyGroup>
1313
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1414
<ItemGroup>
15-
<!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> -->
1615
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1716
<PackageReference Include="Npgsql" Version="4.1.14" />
1817
<PackageReference Include="NUnit" Version="3.14.0" />
@@ -25,7 +24,6 @@
2524
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
2625
<PackageReference Include="System.Spatial" Version="5.8.3" />
2726
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0.0" />
28-
<!-- <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />-->
2927
</ItemGroup>
3028
<ItemGroup>
3129
<ProjectReference Include="..\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"version": "6.0.100",
4-
"rollForward": "latestMinor"
4+
"rollForward": "latestFeature"
55
}
66
}

0 commit comments

Comments
 (0)