diff --git a/System.Linq.Dynamic.Core.sln b/System.Linq.Dynamic.Core.sln
index 94845c1a..ebf06692 100644
--- a/System.Linq.Dynamic.Core.sln
+++ b/System.Linq.Dynamic.Core.sln
@@ -81,6 +81,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src-blazor", "src-blazor",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorAppTest", "src-blazor\BlazorAppTest\BlazorAppTest.csproj", "{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docfx", "docfx", "{012536E6-FFF6-4BF8-AB9F-196017FBB257}"
+ ProjectSection(SolutionItems) = preProject
+ docfx\build-docs.ps1 = docfx\build-docs.ps1
+ docfx\docfx.json = docfx\docfx.json
+ docfx\howto.txt = docfx\howto.txt
+ docfx\index.md = docfx\index.md
+ docfx\toc.yml = docfx\toc.yml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c6f923f6..eaa9d8bd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,5 +1,5 @@
pool:
- vmImage: 'vs2017-win2016'
+ vmImage: 'windows-2019'
variables:
Prerelease: 'ci'
@@ -53,7 +53,7 @@ steps:
# Upload coverage to codecov.io
- script: |
- %USERPROFILE%\.nuget\packages\codecov\1.1.0\tools\codecov.exe -f "./test/System.Linq.Dynamic.Core.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)
+ %USERPROFILE%\.nuget\packages\codecov\1.10.0\tools\codecov.exe -f "./test/System.Linq.Dynamic.Core.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)
displayName: Upload coverage to codecov.io
- task: PublishTestResults@2
diff --git a/docfx/howto.txt b/docfx/howto.txt
new file mode 100644
index 00000000..82658ff3
--- /dev/null
+++ b/docfx/howto.txt
@@ -0,0 +1,3 @@
+1. choco install docfx -y
+
+2. Run powershell script: build-docs.ps1 -serve
diff --git a/docfx/index.md b/docfx/index.md
index 4a7cd310..ca7199ec 100644
--- a/docfx/index.md
+++ b/docfx/index.md
@@ -8,4 +8,7 @@ var query = db.Customers
.Where("City == @0 and Orders.Count >= @1", "London", 10)
.OrderBy("CompanyName")
.Select("new(CompanyName as Name, Phone)");
-```
\ No newline at end of file
+```
+
+# API Documentation
+See [this link](api/System.Linq.Dynamic.Core.html).
diff --git a/docs/index.html b/docs/index.html
index 859f7941..de189b89 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -80,6 +80,8 @@ Overview
.OrderBy("CompanyName")
.Select("new(CompanyName as Name, Phone)");
+API Documentation
+See this link.
@@ -88,7 +90,7 @@ Overview
diff --git a/docs/index.json b/docs/index.json
index a272b5f9..48f80ea5 100644
--- a/docs/index.json
+++ b/docs/index.json
@@ -137,6 +137,6 @@
"index.html": {
"href": "index.html",
"title": "System.Linq.Dynamic.Core",
- "keywords": "System.Linq.Dynamic.Core This is a .NET Core / Standard port of the Microsoft assembly for the .Net 4.0 Dynamic language functionality. Overview With this library it's possible to write Dynamic LINQ queries (string based) on an IQueryable : var query = db.Customers .Where(\"City == @0 and Orders.Count >= @1\", \"London\", 10) .OrderBy(\"CompanyName\") .Select(\"new(CompanyName as Name, Phone)\");"
+ "keywords": "System.Linq.Dynamic.Core This is a .NET Core / Standard port of the Microsoft assembly for the .Net 4.0 Dynamic language functionality. Overview With this library it's possible to write Dynamic LINQ queries (string based) on an IQueryable : var query = db.Customers .Where(\"City == @0 and Orders.Count >= @1\", \"London\", 10) .OrderBy(\"CompanyName\") .Select(\"new(CompanyName as Name, Phone)\"); API Documentation See this link ."
}
}
\ No newline at end of file
diff --git a/docs/manifest.json b/docs/manifest.json
index 20f7a9bf..964186c8 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -13,12 +13,15 @@
"is_incremental": false
},
{
+ "log_codes": [
+ "InvalidFileLink"
+ ],
"type": "Conceptual",
"source_relative_path": "index.md",
"output": {
".html": {
"relative_path": "index.html",
- "hash": "chJWv7F6A/OVfPMM9I/HtA=="
+ "hash": "S3NHAAk85Ok7eYFcHW+YSA=="
}
},
"is_incremental": false,
@@ -382,24 +385,24 @@
"skipped_file_count": 0
},
"processors": {
- "TocDocumentProcessor": {
- "can_incremental": false,
- "details": "Processor TocDocumentProcessor cannot support incremental build because the processor doesn't implement ISupportIncrementalDocumentProcessor interface.",
- "incrementalPhase": "build",
- "total_file_count": 0,
- "skipped_file_count": 0
- },
"ConceptualDocumentProcessor": {
"can_incremental": true,
"incrementalPhase": "build",
"total_file_count": 1,
- "skipped_file_count": 1
+ "skipped_file_count": 0
},
"ManagedReferenceDocumentProcessor": {
"can_incremental": true,
"incrementalPhase": "build",
"total_file_count": 27,
"skipped_file_count": 27
+ },
+ "TocDocumentProcessor": {
+ "can_incremental": false,
+ "details": "Processor TocDocumentProcessor cannot support incremental build because the processor doesn't implement ISupportIncrementalDocumentProcessor interface.",
+ "incrementalPhase": "build",
+ "total_file_count": 0,
+ "skipped_file_count": 0
}
}
},
diff --git a/test/EntityFramework.DynamicLinq.Tests.net452/EntityFramework.DynamicLinq.Tests.net452.csproj b/test/EntityFramework.DynamicLinq.Tests.net452/EntityFramework.DynamicLinq.Tests.net452.csproj
index b37e9d04..d713a80b 100644
--- a/test/EntityFramework.DynamicLinq.Tests.net452/EntityFramework.DynamicLinq.Tests.net452.csproj
+++ b/test/EntityFramework.DynamicLinq.Tests.net452/EntityFramework.DynamicLinq.Tests.net452.csproj
@@ -1,7 +1,7 @@
-
-
+
+
Debug
@@ -35,7 +35,7 @@
- ..\..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll
+ ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll
..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
@@ -61,14 +61,14 @@
..\..\packages\MongoDB.Driver.Core.2.4.4\lib\net45\MongoDB.Driver.Core.dll
-
- ..\..\packages\Moq.4.10.0\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.13.1\lib\net45\Moq.dll
..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
-
- ..\..\packages\NFluent.2.1.1\lib\net45\NFluent.dll
+
+ ..\..\packages\NFluent.2.7.0\lib\net45\NFluent.dll
..\..\packages\QueryInterceptor.Core.1.0.5.0\lib\net452\QueryInterceptor.Core.dll
@@ -77,11 +77,14 @@
+
+ ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll
+
..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
-
- ..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
+
+ ..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
@@ -93,16 +96,17 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
+ True
-
- ..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll
-
- ..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll
-
- ..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll
@@ -361,16 +365,16 @@
-
+
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}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/EntityFramework.DynamicLinq.Tests.net452/packages.config b/test/EntityFramework.DynamicLinq.Tests.net452/packages.config
index e5dd8b28..3148cfef 100644
--- a/test/EntityFramework.DynamicLinq.Tests.net452/packages.config
+++ b/test/EntityFramework.DynamicLinq.Tests.net452/packages.config
@@ -1,6 +1,6 @@
-
+
@@ -8,19 +8,20 @@
-
+
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj b/test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj
index 5285cf81..c20bb237 100644
--- a/test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj
+++ b/test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj
@@ -35,14 +35,17 @@
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
-
-
-
+
+
+
diff --git a/test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj b/test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj
index 01e82d7e..2d1a9ca6 100644
--- a/test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj
+++ b/test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj
@@ -14,15 +14,15 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
@@ -34,9 +34,9 @@
-
-
-
+
+
+