Skip to content

Commit 2bd3969

Browse files
alex-kulakovalex-kulakov
committed
Merge branch '6.0' into 6.0-test-fixes
2 parents a80dc77 + 7883217 commit 2bd3969

File tree

4 files changed

+35
-70
lines changed

4 files changed

+35
-70
lines changed

‎Orm.sln

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Cfg", ".Cfg", "{C02BF3D5-F
7676
EndProject
7777
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xtensive.Orm.Weaver", "Weaver\Xtensive.Orm.Weaver\Xtensive.Orm.Weaver.csproj", "{75B3DB45-3055-4A22-854A-BD271D5E4218}"
7878
EndProject
79-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xtensive.Orm.SqlServer", "Orm\Xtensive.Orm.SqlServer\Xtensive.Orm.SqlServer.csproj", "{45000ADE-F647-4171-A91A-428CDF682603}"
79+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xtensive.Orm.SqlServer", "Orm\Xtensive.Orm.SqlServer\Xtensive.Orm.SqlServer.csproj", "{45000ADE-F647-4171-A91A-428CDF682603}"
8080
EndProject
8181
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Publish", ".Publish", "{5726BBD8-14F9-4909-B765-3E7709223B61}"
8282
EndProject
8383
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPublish", "Publish\NuGetPublish.csproj", "{2CC55F3E-8EA5-4305-8716-D5B944120F82}"
8484
EndProject
85+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Xtensive.Orm.Tests.FSharp", "Orm\Xtensive.Orm.Tests.FSharp\Xtensive.Orm.Tests.FSharp.fsproj", "{A68C90C1-AD82-40FD-A18D-F04923514743}"
86+
EndProject
8587
Global
8688
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8789
Debug|Any CPU = Debug|Any CPU
@@ -206,6 +208,10 @@ Global
206208
{45000ADE-F647-4171-A91A-428CDF682603}.Release|Any CPU.Build.0 = Release|Any CPU
207209
{2CC55F3E-8EA5-4305-8716-D5B944120F82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
208210
{2CC55F3E-8EA5-4305-8716-D5B944120F82}.Release|Any CPU.ActiveCfg = Release|Any CPU
211+
{A68C90C1-AD82-40FD-A18D-F04923514743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
212+
{A68C90C1-AD82-40FD-A18D-F04923514743}.Debug|Any CPU.Build.0 = Debug|Any CPU
213+
{A68C90C1-AD82-40FD-A18D-F04923514743}.Release|Any CPU.ActiveCfg = Release|Any CPU
214+
{A68C90C1-AD82-40FD-A18D-F04923514743}.Release|Any CPU.Build.0 = Release|Any CPU
209215
EndGlobalSection
210216
GlobalSection(SolutionProperties) = preSolution
211217
HideSolutionNode = FALSE
@@ -240,6 +246,7 @@ Global
240246
{15CC7358-3A5B-4146-A5CB-78DAE75E88E6} = {DC441957-AF79-423D-AA60-2F102926F6D2}
241247
{45000ADE-F647-4171-A91A-428CDF682603} = {2302847B-292A-4650-A852-BDED40E1BB1C}
242248
{2CC55F3E-8EA5-4305-8716-D5B944120F82} = {5726BBD8-14F9-4909-B765-3E7709223B61}
249+
{A68C90C1-AD82-40FD-A18D-F04923514743} = {8AAB1719-253A-47D2-970F-1911CFEE84B7}
243250
EndGlobalSection
244251
GlobalSection(ExtensibilityGlobals) = postSolution
245252
SolutionGuid = {F995719A-8D35-49A3-B271-42898A587F57}

‎Orm/Xtensive.Orm.Tests.FSharp/FsUnit.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module FsUnit
1+
module FsUnit
22
open NUnit.Framework
33
open NUnit.Framework.Constraints
44

@@ -28,8 +28,6 @@ let Empty = new EmptyConstraint()
2828

2929
let EmptyString = new EmptyStringConstraint()
3030

31-
let NullOrEmptyString = new NullOrEmptyStringConstraint()
32-
3331
let True = new TrueConstraint()
3432

3533
let False = new FalseConstraint()

‎Orm/Xtensive.Orm.Tests.FSharp/Test.fs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
module Test
1+
module Test
22

33
open FsUnit
44
open NUnit.Framework
55
open Xtensive.Orm
66
open Xtensive.Orm.Tests
77
open Model
88
open Microsoft.FSharp.Linq
9-
open Microsoft.FSharp.Linq.Query
109

1110
[<TestFixture>]
1211
type Fixture() =
@@ -25,11 +24,11 @@ type Fixture() =
2524
Person (Name = "John") |> ignore
2625
let persons = session.Query.All<Person> ()
2726
let query =
28-
query <@ seq {
27+
query {
2928
for p in persons do
3029
if p.Name = "John" then
3130
yield p
32-
} @>
31+
}
3332
let list = query |> Seq.toArray
3433
Assert.AreEqual(1, list.Length)
3534
let fetched = list.[0]

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

Lines changed: 23 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,35 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Net40-Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{cf9ed41f-2548-46b6-aa46-71efe5067681}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>Xtensive.Orm.Tests.FSharp</RootNamespace>
11-
<AssemblyName>Xtensive.Orm.Tests.FSharp</AssemblyName>
12-
<Name>Xtensive.Orm.Tests.FSharp</Name>
3+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
4+
<AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
5+
<IsPackable>false</IsPackable>
6+
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
137
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net40-Debug|AnyCPU' ">
15-
<DebugSymbols>true</DebugSymbols>
16-
<DebugType>full</DebugType>
17-
<Optimize>false</Optimize>
18-
<Tailcalls>false</Tailcalls>
19-
<OutputPath>..\..\_Build\Binaries\Debug\Lib\Net40\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<WarningLevel>3</WarningLevel>
22-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net40-Release|AnyCPU' ">
25-
<DebugType>portable</DebugType>
26-
<Optimize>true</Optimize>
27-
<Tailcalls>true</Tailcalls>
28-
<OutputPath>..\..\_Build\Binaries\Release\Lib\Net40\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<WarningLevel>3</WarningLevel>
31-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
8+
<PropertyGroup>
9+
<LangVersion>4.7</LangVersion>
10+
<TargetFramework>netcoreapp2.0</TargetFramework>
11+
<RuntimeFrameworkVersion>2.0.3</RuntimeFrameworkVersion>
12+
<SignAssembly>true</SignAssembly>
13+
<AssemblyOriginatorKeyFile>..\Orm.snk</AssemblyOriginatorKeyFile>
14+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
15+
<WarningLevel>2</WarningLevel>
3216
</PropertyGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
19+
<PackageReference Include="NUnit" Version="3.12.0" />
20+
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<ProjectReference Include="..\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />
24+
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj" />
25+
</ItemGroup>
3326
<ItemGroup>
3427
<Compile Include="FsUnit.fs" />
3528
<Compile Include="Model.fs" />
3629
<Compile Include="Test.fs" />
3730
<None Include="App.config" />
3831
</ItemGroup>
3932
<ItemGroup>
40-
<Reference Include="FSharp.PowerPack.Linq">
41-
<HintPath>..\..\Lib\FSharpPowerPack\FSharp.PowerPack.Linq.dll</HintPath>
42-
</Reference>
43-
<Reference Include="mscorlib" />
44-
<Reference Include="FSharp.Core" />
45-
<Reference Include="nunit.framework, Version=2.5.4.10098, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\..\Lib\NUnit\nunit.framework.dll</HintPath>
48-
</Reference>
49-
<Reference Include="System" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.Transactions" />
52-
<Reference Include="WindowsBase" />
53-
<ProjectReference Include="..\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj">
54-
<Name>Xtensive.Orm.Tests.Framework</Name>
55-
<Project>{f2ce47f7-8170-4fc4-b619-d32e6398d4f9}</Project>
56-
<Private>True</Private>
57-
</ProjectReference>
58-
<ProjectReference Include="..\Xtensive.Orm\Xtensive.Orm.csproj">
59-
<Name>Xtensive.Orm</Name>
60-
<Project>{628737e8-3581-4793-99c8-9a4d2d83fea0}</Project>
61-
<Private>True</Private>
62-
</ProjectReference>
33+
<PackageReference Update="FSharp.Core" Version="4.7.0" />
6334
</ItemGroup>
64-
<Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
65-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
66-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
67-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
68-
Other similar extension points exist, see Microsoft.Common.targets.
69-
<Target Name="BeforeBuild">
70-
</Target>
71-
<Target Name="AfterBuild">
72-
</Target>
73-
-->
7435
</Project>

0 commit comments

Comments
 (0)