Skip to content

Commit 9b952e6

Browse files
committed
Merge branch '7.2' into 7.2-prefetchquery-iasyncenumerable
2 parents 4b232be + b546192 commit 9b952e6

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

Orm/Xtensive.Orm.Tests.FSharp/Xtensive.Orm.Tests.FSharp.fsproj

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@
66
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<LangVersion>4.7</LangVersion>
109
<SignAssembly>true</SignAssembly>
1110
<AssemblyOriginatorKeyFile>$(OrmKeyFile)</AssemblyOriginatorKeyFile>
1211
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1312
<WarningLevel>2</WarningLevel>
1413
</PropertyGroup>
14+
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
15+
<LangVersion>6.0</LangVersion>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
18+
<LangVersion>7.0</LangVersion>
19+
</PropertyGroup>
20+
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
21+
<LangVersion>8.0</LangVersion>
22+
</PropertyGroup>
1523
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1624
<ItemGroup>
1725
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
@@ -28,7 +36,13 @@
2836
<Compile Include="Test.fs" />
2937
<None Include="App.config" />
3038
</ItemGroup>
31-
<ItemGroup>
32-
<PackageReference Update="FSharp.Core" Version="4.7.0" />
39+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
40+
<PackageReference Update="FSharp.Core" Version="6.0.7" />
41+
</ItemGroup>
42+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
43+
<PackageReference Update="FSharp.Core" Version="7.0.403" />
44+
</ItemGroup>
45+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
46+
<PackageReference Update="FSharp.Core" Version="8.0.403" />
3347
</ItemGroup>
3448
</Project>

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.100",
4+
"rollForward": "latestMinor"
5+
}
6+
}

0 commit comments

Comments
 (0)