Skip to content

Commit d5204fd

Browse files
StefHStefH
committed
2 parents 098f096 + f46c61e commit d5204fd

File tree

5 files changed

+55
-47
lines changed

5 files changed

+55
-47
lines changed

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pool:
2-
vmImage: 'vs2017-win2016'
2+
vmImage: 'windows-2019'
33

44
variables:
55
Prerelease: 'ci'
@@ -53,7 +53,7 @@ steps:
5353

5454
# Upload coverage to codecov.io
5555
- script: |
56-
%USERPROFILE%\.nuget\packages\codecov\1.1.0\tools\codecov.exe -f "./test/System.Linq.Dynamic.Core.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)
56+
%USERPROFILE%\.nuget\packages\codecov\1.10.0\tools\codecov.exe -f "./test/System.Linq.Dynamic.Core.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)
5757
displayName: Upload coverage to codecov.io
5858

5959
- task: PublishTestResults@2

‎test/EntityFramework.DynamicLinq.Tests.net452/EntityFramework.DynamicLinq.Tests.net452.csproj‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
4+
<Import Project="..\..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
66
<PropertyGroup>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,7 +35,7 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
38+
<HintPath>..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
3939
</Reference>
4040
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
4141
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
@@ -61,14 +61,14 @@
6161
<Reference Include="MongoDB.Driver.Core, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
6262
<HintPath>..\..\packages\MongoDB.Driver.Core.2.4.4\lib\net45\MongoDB.Driver.Core.dll</HintPath>
6363
</Reference>
64-
<Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
64+
<Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\Moq.4.13.1\lib\net45\Moq.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6868
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
6969
</Reference>
70-
<Reference Include="NFluent, Version=2.1.1.107, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\NFluent.2.1.1\lib\net45\NFluent.dll</HintPath>
70+
<Reference Include="NFluent, Version=2.4.0.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\NFluent.2.7.0\lib\net45\NFluent.dll</HintPath>
7272
</Reference>
7373
<Reference Include="QueryInterceptor.Core, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
7474
<HintPath>..\..\packages\QueryInterceptor.Core.1.0.5.0\lib\net452\QueryInterceptor.Core.dll</HintPath>
@@ -77,11 +77,14 @@
7777
<Reference Include="System.ComponentModel.DataAnnotations" />
7878
<Reference Include="System.Configuration" />
7979
<Reference Include="System.Core" />
80+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
82+
</Reference>
8083
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8184
<HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
8285
</Reference>
83-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
84-
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
86+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
87+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
8588
</Reference>
8689
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
8790
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
@@ -93,16 +96,17 @@
9396
<Reference Include="System.Net.Http" />
9497
<Reference Include="System.Xml" />
9598
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
96-
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
99+
<HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
100+
<Private>True</Private>
97101
</Reference>
98-
<Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
99-
<HintPath>..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
102+
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
103+
<HintPath>..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
100104
</Reference>
101-
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
105+
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
106+
<HintPath>..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
103107
</Reference>
104-
<Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
105-
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
108+
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
109+
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
106110
</Reference>
107111
</ItemGroup>
108112
<ItemGroup>
@@ -361,16 +365,16 @@
361365
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
362366
</ItemGroup>
363367
<ItemGroup>
364-
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
368+
<Analyzer Include="..\..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
365369
</ItemGroup>
366370
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
367371
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
368372
<PropertyGroup>
369373
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
370374
</PropertyGroup>
371-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
372-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
373-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
375+
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
376+
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
377+
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
374378
</Target>
375-
<Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
379+
<Import Project="..\..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
376380
</Project>

‎test/EntityFramework.DynamicLinq.Tests.net452/packages.config‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="4.3.1" targetFramework="net452" />
3+
<package id="Castle.Core" version="4.4.0" targetFramework="net452" />
44
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
55
<package id="Linq.PropertyTranslator.Core" version="1.0.3.0" targetFramework="net452" />
66
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
77
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net452" />
88
<package id="MongoDB.Bson" version="2.4.4" targetFramework="net452" />
99
<package id="MongoDB.Driver" version="2.4.4" targetFramework="net452" />
1010
<package id="MongoDB.Driver.Core" version="2.4.4" targetFramework="net452" />
11-
<package id="Moq" version="4.10.0" targetFramework="net452" />
11+
<package id="Moq" version="4.13.1" targetFramework="net452" />
1212
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
13-
<package id="NFluent" version="2.1.1" targetFramework="net452" />
13+
<package id="NFluent" version="2.7.0" targetFramework="net452" />
1414
<package id="QueryInterceptor.Core" version="1.0.5.0" targetFramework="net452" />
15+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net452" />
1516
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net452" />
16-
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net452" />
17+
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net452" />
1718
<package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
18-
<package id="xunit" version="2.3.1" targetFramework="net452" />
19-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
20-
<package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
21-
<package id="xunit.assert" version="2.3.1" targetFramework="net452" />
22-
<package id="xunit.core" version="2.3.1" targetFramework="net452" />
23-
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
24-
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
25-
<package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net452" developmentDependency="true" />
19+
<package id="xunit" version="2.4.1" targetFramework="net452" />
20+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net452" />
21+
<package id="xunit.analyzers" version="0.10.0" targetFramework="net452" />
22+
<package id="xunit.assert" version="2.4.1" targetFramework="net452" />
23+
<package id="xunit.core" version="2.4.1" targetFramework="net452" />
24+
<package id="xunit.extensibility.core" version="2.4.1" targetFramework="net452" />
25+
<package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net452" />
26+
<package id="xunit.runner.visualstudio" version="2.4.1" targetFramework="net452" developmentDependency="true" />
2627
</packages>

‎test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@
3535
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
3636
<PackageReference Include="MongoDB.Driver" Version="2.4.4" />
3737
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
38-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
38+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageReference>
3942
<PackageReference Include="Linq.PropertyTranslator.Core" Version="1.0.3" />
4043
<PackageReference Include="QueryInterceptor.Core" Version="1.0.5" />
4144
<PackageReference Include="EntityFramework" Version="6.2.0" />
4245
<PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.1" />
43-
<PackageReference Include="xunit" Version="2.3.1" />
44-
<PackageReference Include="NFluent" Version="2.1.1" />
45-
<PackageReference Include="Moq" Version="4.10.0" />
46+
<PackageReference Include="xunit" Version="2.4.1" />
47+
<PackageReference Include="NFluent" Version="2.7.0" />
48+
<PackageReference Include="Moq" Version="4.13.1" />
4649
<PackageReference Include="LinqKit.EntityFramework" Version="1.1.15" />
4750
</ItemGroup>
4851

‎test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Codecov" Version="1.1.0" />
18-
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
17+
<PackageReference Include="Codecov" Version="1.10.0" />
18+
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="FluentAssertions" Version="5.7.0" />
22+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
24-
<PackageReference Include="OpenCover" Version="4.6.519" />
25-
<PackageReference Include="ReportGenerator" Version="4.0.0" />
24+
<PackageReference Include="OpenCover" Version="4.7.922" />
25+
<PackageReference Include="ReportGenerator" Version="4.5.4" />
2626
<PackageReference Include="xunit.runner.console" Version="2.4.1">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -34,9 +34,9 @@
3434
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
3535
<PackageReference Include="Linq.PropertyTranslator.Core" Version="1.0.5" />
3636
<PackageReference Include="QueryInterceptor.Core" Version="1.0.7" />
37-
<PackageReference Include="xunit" Version="2.4.0" />
38-
<PackageReference Include="NFluent" Version="2.1.1" />
39-
<PackageReference Include="Moq" Version="4.10.0" />
37+
<PackageReference Include="xunit" Version="2.4.1" />
38+
<PackageReference Include="NFluent" Version="2.7.0" />
39+
<PackageReference Include="Moq" Version="4.13.1" />
4040
</ItemGroup>
4141

4242
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">

0 commit comments

Comments
 (0)