So many stuff (#12)

* made root context implicit

* introduced ContextTerm

* wip on linq provider

* fixed pick boolean method

* fixed lambda argument resolution

* Immutable assembler, removed implicit expression blocks, new EmitContainer, tmp disabled nullable linq-to-objects hack,

* reverted OdataSample project to netcore2.1

* replaced immutabledict with immutablearray to preserve args order

* better expression naming, disabled proxy expr stripping

* updated dependencies, added some e2e tests

* Update dotnetcore.yml

* updated projects refs, min asp support = 3.1

* Update dotnetcore.yml

* odata parser return strings for decimal and ints; prepare test case for nullable dateTime (#14)

Co-authored-by: Kyrylo Lehonkov <kyrylo.leh@2c2p.com>

* fixed test runners

* Update dotnetcore.yml

* fixed nullables

* faster approach for nullables

* now targeting netstandard2.1

* code cleanup

* improved linq implementation

* updated dependencies

* fixed issue with closed Response.Body stream (#16)

Co-authored-by: Kyrylo Lehonkov <klehonkov@globaltechincubator.com.au>

---------

Co-authored-by: Kyrylo Lehonkov <legonkov@gmail.com>
Co-authored-by: Kyrylo Lehonkov <kyrylo.leh@2c2p.com>
Co-authored-by: Kyrylo Lehonkov <klehonkov@globaltechincubator.com.au>

Author: 4 people

.gitattributes

@@ -0,0 +1,64 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+# no eol conversions!
+* -text
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.github/workflows/dotnetcore.yml

@@ -1,45 +1,52 @@
 name: Main
 env:
-  NUGETURL: https://api.nuget.org/v3/index.json
-  NUGET_TOKEN: ${{ secrets.nuget }}
-  MODE: Release
-  CODACY_TOKEN: ${{ secrets.codacy }}
- 
-on: [push]
+  app_release: false
+  app_conf: Release
+  nuget_url: https://api.nuget.org/v3/index.json 
+  
+on:
+  push:
+    branches: 
+        - master
+    tags: 
+        - '**'
+  pull_request:  
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        fetch-depth: 0
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Configure
       run: |
-        TAG=$([[ $GITHUB_REF == refs/tags/* ]] && echo ${GITHUB_REF:10} || echo "")
-        VERSION=${TAG:-0.0.0-dev}
-        echo ::set-env name=TAG::$TAG
-        echo ::set-env name=VERSION::$VERSION
-        echo ::set-env name=VERSIONFULL::$(echo $VERSION:$GITHUB_SHA)
-        echo ::set-env name=ISRELEASE::$(test -z "$TAG")
-    - name: Checkout
-      uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.2.402
+        echo "app_version=`git describe --tags`" >> $GITHUB_ENV
+        echo "app_release=`(git describe --tags --exact-match>/dev/null 2>&1 && echo true) || echo false`" >> $GITHUB_ENV
+    - name: Status
+      run: echo "Release=$app_release, version=$app_version" 
     - name: Build
-      run: dotnet build ./ -c $MODE -p:Version=$VERSION -p:InformationalVersion=$VERSIONFULL
+      run: dotnet build -c $app_conf -p:Version=$app_version -p:InformationalVersion="$app_version:$GITHUB_SHA"
     - name: Test
-      run: dotnet test ./ -c $MODE --no-build
-    - name: Submit coverage
-      run: |
-        curl -Ls "https://github.com/codacy/csharp-codacy-coverage/releases/download/1.0.7/Codacy.CSharpCoverage_linux-x64" --output codacy
-        chmod +x ./codacy
-        coverfiles=$(find . -type f -name coverage.opencover.xml)
-        for coverfile in $coverfiles; do
-        ./codacy -c $GITHUB_SHA -t $CODACY_TOKEN -r "$coverfile" -e opencover -p
-        done
-        if [ -n "$coverfiles" ]; then
-        ./codacy -c $GITHUB_SHA -t $CODACY_TOKEN -f
-        fi
+      run: dotnet test -c $app_conf --no-build
+    - name: Pack
+      run: dotnet pack -c $app_conf --no-build -o ./artifacts -p:Version=$app_version -p:CommitSHA=$GITHUB_SHA
+    - uses: actions/upload-artifact@v1
+      with:
+        name: artifacts
+        path: ./artifacts
+    - name: Publish
+      if: env.app_release == 'true'
+      env:
+        NUGETKEY: ${{ secrets.NUGET_KEY }}
+      working-directory: ./artifacts
+      run: dotnet nuget push *.nupkg -s $nuget_url -k $NUGETKEY   
+
 

.travis.yml

@@ -1,11 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2EC1DEC4-46D5-4A50-B6D4-A031FFC1D1F5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CAA9FEEA-7A2A-41FB-9423-DDFC633830ED}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+		test\Directory.Build.targets = test\Directory.Build.targets
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRest.AspNetCore", "src\QRest.AspNetCore\QRest.AspNetCore.csproj", "{B1F307E4-905C-44F3-ADCD-4D2C85645C48}"
 EndProject
@@ -20,26 +24,16 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution", ".solution", "{68EFFEF7-800B-4592-BE7B-9D9568083814}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		Directory.Build.props = Directory.Build.props
+		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
+		LICENSE = LICENSE
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRest.Semantics.OData", "src\QRest.Semantics.OData\QRest.Semantics.OData.csproj", "{F6B5672A-F0E1-4D0D-9E5C-31CB4F50DC90}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRest.Semantics.OData.Tests", "test\QRest.Semantics.OData.Tests\QRest.Semantics.OData.Tests.csproj", "{12DB82BA-C9AE-43DC-8181-9A33F4FAC55F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{F592F579-DB0F-4E74-B79D-D921DEDBE4B2}"
-	ProjectSection(SolutionItems) = preProject
-		LICENSE = LICENSE
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{3D211EBB-5B03-4FDF-B7BA-E1B36958F523}"
-	ProjectSection(SolutionItems) = preProject
-		.travis.yml = .travis.yml
-		after.QRest.sln.targets = after.QRest.sln.targets
-		Directory.Build.props = Directory.Build.props
-		Directory.build.targets = Directory.build.targets
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRest.Compiler.Standard.Tests", "test\QRest.Compiler.Standard.Tests\QRest.Compiler.Standard.Tests.csproj", "{DA987B08-765B-46E2-ADB7-6D739B95A4F0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRest.AspNetCore.OData.Tests", "test\QRest.AspNetCore.OData.Tests\QRest.AspNetCore.OData.Tests.csproj", "{766A94A2-5A5C-45B9-94C9-A5B06338CEE8}"
@@ -99,8 +93,6 @@ Global
 		{284FC041-7F0D-4F0C-8F49-71A52E92E46D} = {7D715283-67A8-43E2-938E-6CB12ACD30F8}
 		{F6B5672A-F0E1-4D0D-9E5C-31CB4F50DC90} = {2EC1DEC4-46D5-4A50-B6D4-A031FFC1D1F5}
 		{12DB82BA-C9AE-43DC-8181-9A33F4FAC55F} = {CAA9FEEA-7A2A-41FB-9423-DDFC633830ED}
-		{F592F579-DB0F-4E74-B79D-D921DEDBE4B2} = {68EFFEF7-800B-4592-BE7B-9D9568083814}
-		{3D211EBB-5B03-4FDF-B7BA-E1B36958F523} = {68EFFEF7-800B-4592-BE7B-9D9568083814}
 		{DA987B08-765B-46E2-ADB7-6D739B95A4F0} = {CAA9FEEA-7A2A-41FB-9423-DDFC633830ED}
 		{766A94A2-5A5C-45B9-94C9-A5B06338CEE8} = {CAA9FEEA-7A2A-41FB-9423-DDFC633830ED}
 		{B20B30E5-98CB-4C33-805C-921DA5CFAAD4} = {7D715283-67A8-43E2-938E-6CB12ACD30F8}

Directory.Build.targets

@@ -7,8 +7,7 @@
 namespace ODataSamples.Controllers
 {
     [Route("api/[controller]")]
-    [ApiController]
-    public class MemoryController : ControllerBase
+    public class MemoryController : Controller
     {
         [HttpGet("{query?}")]
         public ActionResult<IQueryable<Domain.Order>> Get(Query query)

QRest.sln

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DockerTargetOS>Linux</DockerTargetOS>
   </PropertyGroup>
 
@@ -10,11 +10,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.4.10" />
-    <PackageReference Include="QRest.Semantics.OData" Version="0.4.3-beta" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\QRest.Semantics.OData\QRest.Semantics.OData.csproj" />
   </ItemGroup>
 
 </Project>

after.QRest.sln.targets

@@ -4,7 +4,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using ODataSamples.Contexts;
+using System;
 
 namespace ODataSamples
 {
@@ -19,8 +21,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddDbContext<DataContext>(options =>
-                options.UseSqlServer(Configuration.GetConnectionString("DatabaseCS")));
+            services.
+                AddDbContext<DataContext>(o => o.UseInMemoryDatabase("TestDb"));
 
             services
                .AddQRest()
@@ -30,22 +32,31 @@ public void ConfigureServices(IServiceCollection services)
                    cpl.UseCompilerCache = false;
                });
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddControllers();
 
             var resolver = services.BuildServiceProvider();
-            var ctx = resolver.GetService<DataContext>();
-            ctx.Database.Migrate();
-            
+            var ctx = resolver.GetService<DataContext>();
+            //ctx.Database.Migrate();
+
         }
-
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseMvc();
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+
+            app.UseDeveloperExceptionPage();
+            app.Use(async (context, next) =>
+            {
+                Console.WriteLine($"{context.Request.Path}{context.Request.QueryString}");
+                await next.Invoke();
+            });
+
+            app.UseRouting();
+
+
+            app.UseODataMetadata();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }