PR For Bulk Operation and ODataBind Review for Beta Release

.github/CONTRIBUTION.md

@@ -26,7 +26,7 @@ Pull request of features and bug fixes are both welcomed. Before you send a pull
 ### Complete a Contribution License Agreement (CLA)
 You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
 
-Please submit a Contributor License Agreement (CLA) before submitting a pull request. Please fill and submit the [Contribution License Agreement Form | Microsoft](https://cla.microsoft.com/). Be sure to include your GitHub user name along with the agreement. Only after we have received the signed CLA, we'll review the pull request that you send. You only need to do this once for contributing to any Microsoft open source projects. 
+Please submit a Contributor License Agreement (CLA) before submitting a pull request. Please fill and submit the [Contributor License Agreement](https://cla.dotnetfoundation.org/). Be sure to include your GitHub user name along with the agreement. Only after we have received the signed CLA, we'll review the pull request that you send. This needs to only be done once for any .NET Foundation OSS project.
 
 ### Create a new issue on the issue tracker and link the pull request to it
 You should have an issue created on the [issue tracker](https://github.com/OData/WebApi/issues) before you work on the pull request. After the OData Web API team has reviewed this issue and change its label to "accepting pull request", you can issue a pull request to us in which the link to the related issue is included.

License.txt

@@ -1,6 +1,6 @@
 OData-WebAPI
 
-Copyright (c) Microsoft. All rights reserved.
+Copyright (c) .NET Foundation and Contributors
 
 Material in this repository is made available under the following terms:
   1. Code is licensed under the MIT license, reproduced below.
@@ -23,4 +23,3 @@ NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPO
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES 
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

README.md

@@ -2,8 +2,9 @@
 
  Build  | Status
 --------|---------
+Odata.WebApi Rolling Dotnet pipeline | <img src="https://dev.azure.com/dotnet/OData/_apis/build/status/OData.WebApi-Rolling?branchName=master"/> 
 WebApi Rolling | <img src="https://identitydivision.visualstudio.com/OData/_apis/build/status/WebApi/WebApi-master-pipeline-Rolling"/> 
-WebApi Nightly | <img src="https://identitydivision.visualstudio.com/OData/_apis/build/status/WebApi/WebApi-master-pipeline-Nightly"/> 
+WebApi Nightly | <img src="https://dev.azure.com/dotnet/OData/_apis/build/status/OData.WebApi%20Nightly?branchName=master"/> 
 
 ### Introduction
 
@@ -118,4 +119,10 @@ Please refer to the [How to debug](https://docs.microsoft.com/en-us/odata/webapi
 
 ### Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+This project has adopted the [.NET Foundation Contributor Covenant Code of Conduct](https://dotnetfoundation.org/about/code-of-conduct). For more information see the [Code of Conduct FAQ](https://dotnetfoundation.org/about/faq).
+
+### .NET Foundation
+
+This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
+
+WebApi is a Copyright of &copy; .NET Foundation and other contributors. It is licensed under [MIT License](https://github.com/OData/WebApi/blob/master/License.txt)

configs/filelist.txt

@@ -0,0 +1 @@
+**/*.dll

pipelines/azure_pipelines.yml

@@ -0,0 +1,29 @@
+trigger:
+  branches:
+    include:
+    - master
+
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: master
+
+pr:
+  - master
+variables:
+  BuildPlatform: 'Any Cpu'
+  BuildConfiguration: 'Release'
+stages: 
+- stage: Build
+  jobs:
+    - job: Main
+      displayName: Main Build
+      # setting a 3hour timeout as webapi tests normally take about 2hr 30 mins
+      timeoutInMinutes: 180
+
+      pool:
+        vmImage: windows-latest
+
+      steps:
+        - template: ./common.yml

pipelines/azure_pipelines_nightly.yml

@@ -0,0 +1,107 @@
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily Nightly build
+  branches:
+    include:
+    - master
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: master
+variables:
+  BuildPlatform: 'Any Cpu'
+  BuildConfiguration: 'Release'
+  RootDir: '$(Build.SourcesDirectory)'
+  ProductBinPath: '$(RootDir)\bin\$(BuildConfiguration)'
+  RELEASE_SEMANTICS: '$(ReleaseSemantics)'
+  SourcesRoot: '$(RootDir)'
+stages:
+- stage: Build
+  variables:
+    - group: SigningConfig
+  jobs:
+    - job: Main
+      displayName: Main Build
+      # setting a 3hour timeout as webapi tests normally take about 2hr 30 mins
+      timeoutInMinutes: 180
+      pool:
+        vmImage: windows-latest
+      steps:
+      - template: ./common.yml
+      - task: MSBuild@1
+        displayName: 'Get Nuget Package Metadata'
+        inputs:
+          solution: tools/GetNugetPackageMetadata.proj
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+      - pwsh: |
+               $date = Get-Date
+               $NightlyBuildVersion = $date.ToString('yyyyMMddHHmm')
+               echo "##vso[task.setvariable variable=NightlyBuildVersion]$NightlyBuildVersion"
+        displayName: Generate Nightly Build version
+      - task: DotNetCoreCLI@2
+        displayName: Packing ASP.NET Core OData
+        inputs:
+          command: custom
+          custom: pack
+          arguments: >
+            $(RootDir)\src\Microsoft.AspNetCore.OData\Microsoft.AspNetCore.OData.csproj
+            /p:NuspecFile=$(rootDir)\src\Microsoft.AspNetCore.OData\Microsoft.AspNetCore.OData.$(RELEASE_SEMANTICS).nuspec
+            --configuration=$(buildConfiguration) 
+            --output=$(Build.ArtifactStagingDirectory)\Packages 
+            -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+
+      - task: NuGetCommand@2
+        displayName: 'Packing AspNet.OData'
+        inputs:
+          command: custom
+          arguments: pack $(RootDir)\src\Microsoft.AspNet.OData\Microsoft.AspNet.OData.$(RELEASE_SEMANTICS).nuspec -NonInteractive -OutputDirectory $(Build.ArtifactStagingDirectory)\Packages -Properties Configuration=$(BuildConfiguration);ProductRoot=$(ProductBinPath);SourcesRoot=$(Build.SourcesDirectory);VersionNuGetSemantic=$(VersionNuGetSemantic);NightlyBuildVersion=$(NightlyBuildVersion);AspNetPackageDependency="$(AspNetPackageDependency)";DependencyInjection1PackageDependency="$(DependencyInjection1PackageDependency)";ODataLibPackageDependency="$(ODataLibPackageDependency)" -Verbosity Detailed -Symbols  -SymbolPackageFormat snupkg
+      - publish: $(Build.ArtifactStagingDirectory)\Packages
+        displayName: Publish Build Artifacts  
+        artifact: BuildPackages
+      - pwsh: |
+              $config = "{""SignClient"":{""AzureAd"":{""AADInstance"":""$(AADInstance)"",""ClientId"":""$(ClientId)"",""TenantId"":""$(TenantId)""},""Service"":{""Url"":""https://codesign.dotnetfoundation.org/"",""ResourceId"":""$(ResourceId)""}}}"
+              $config > .\configs\SignClient.json
+        displayName: Generate Sign config
+      - publish: configs
+        displayName: Publish Signing Scripts
+        artifact: configs
+
+- stage: CodeSign
+  condition: and(succeeded('Build'), not(eq(variables['build.reason'], 'PullRequest')))
+  jobs:
+  - deployment: CodeSign
+    displayName: Code Signing
+    pool:
+      vmImage: windows-latest    
+    environment: Code Sign - Approvals
+    variables:
+    - group: Code Signing
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          - task: DotNetCoreCLI@2
+            inputs:
+              command: custom
+              custom: tool
+              arguments: install --tool-path . SignClient
+            displayName: Install SignTool tool
+
+          - pwsh: |
+              .\SignClient "Sign" `
+              --baseDirectory "$(Pipeline.Workspace)\BuildPackages" `
+              --input "**/*.nupkg" `
+              --config "$(Pipeline.Workspace)\configs\SignClient.json" `
+              --filelist "$(Pipeline.Workspace)\configs\filelist.txt" `
+              --user "$(SignClientUser)" `
+              --secret "$(SignClientSecret)" `
+              --name "Code Sign packages" `
+              --description "Signing packages" `
+              --descriptionUrl "https://github.com/OData/WebApi"
+            displayName: Sign packages
+
+          - publish: $(Pipeline.Workspace)/BuildPackages
+            displayName: Publish Signed Packages
+            artifact: SignedPackages

pipelines/common.yml

@@ -0,0 +1,121 @@
+steps:
+- checkout: self
+
+- task: NuGetToolInstaller@1
+  displayName: Use NuGet >=5.2.0
+  inputs:
+    versionSpec: '>=5.2.0'
+    checkLatest: true
+
+- task: UseDotNet@2
+  displayName: Use .NET Core sdk 3.1
+  inputs:
+    version: 3.x
+
+- task: UseDotNet@2
+  displayName: Use .NET Core sdk 2.0.x
+  inputs:
+    version: 2.0.x
+
+- task: UseDotNet@2
+  displayName: Use .NET Core sdk 5.x
+  inputs:
+    version: 5.x
+    includePreviewVersions: true
+
+- task: NuGetCommand@2
+  displayName: 'NuGet restore **\*.sln'
+  inputs:
+   restoreSolution: 'sln/WebApiOData.AspNet.sln;sln/WebApiOData.AspNetCore.sln;sln/WebApiOData.E2E.AspNet.sln;sln/WebApiOData.E2E.AspNetCore.sln'
+
+- task: VSBuild@1
+  displayName: 'Build solution sln\WebApiOData.AspNet.sln'
+  inputs:
+    solution: 'sln\WebApiOData.AspNet.sln '
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+
+- task: VSBuild@1
+  displayName: 'Build solution sln\WebApiOData.E2E.AspNet.sln'
+  inputs:
+    solution: 'sln\WebApiOData.E2E.AspNet.sln'
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Build Microsoft.AspNetCore.OData.csproj '
+  inputs:
+    projects: '$(Build.SourcesDirectory)\src\Microsoft.AspNetCore.OData\Microsoft.AspNetCore.OData.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-incremental'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Build .NET Core Unit test project'
+  inputs:
+    projects: '$(Build.SourcesDirectory)\test\UnitTest\Microsoft.AspNetCore.OData.Test\Microsoft.AspNetCore.OData.Test.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-incremental'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Build .NET Core E2E test project'
+  inputs:
+    projects: '$(Build.SourcesDirectory)\test\E2ETest\Microsoft.Test.E2E.AspNet.OData\Build.AspNetCore\Microsoft.Test.E2E.AspNetCore.OData.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-incremental'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Build .NET Core 3x E2E test project'
+  inputs:
+    projects: '$(Build.SourcesDirectory)\test\E2ETest\Microsoft.Test.E2E.AspNet.OData\Build.AspNetCore3x\Microsoft.Test.E2E.AspNetCore3x.OData.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-incremental'
+
+- powershell: |
+   $PROGRAMFILESX86 = [Environment]::GetFolderPath("ProgramFilesX86")
+
+   $SN = $PROGRAMFILESX86 + "\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\sn.exe"
+   $SNx64 = $PROGRAMFILESX86 + "\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe"
+
+   & $SN /Vr $(Build.SourcesDirectory)\bin\Release\Microsoft.AspNet.OData.dll
+   & $SNx64 /Vr $(Build.SourcesDirectory)\bin\Release\Microsoft.AspNet.OData.dll
+
+   & $SN /Vr $(Build.SourcesDirectory)\bin\release\netstandard2.0\Microsoft.AspNetCore.OData.dll
+   & $SNx64 /Vr $(Build.SourcesDirectory)\bin\release\netstandard2.0\Microsoft.AspNetCore.OData.dll
+
+   & $SN /Vr $(Build.SourcesDirectory)\bin\Release\UnitTest\AspNet\Microsoft.AspNet.OData.Test.dll
+   & $SNx64 /Vr $(Build.SourcesDirectory)\bin\Release\UnitTest\AspNet\Microsoft.AspNet.OData.Test.dll
+
+   & $SN /Vr $(Build.SourcesDirectory)\bin\Release\E2ETest\AspNet\Microsoft.Test.E2E.AspNet.OData.dll
+   & $SNx64 /Vr $(Build.SourcesDirectory)\bin\Release\E2ETest\AspNet\Microsoft.Test.E2E.AspNet.OData.dll
+
+   & $SN /Vr $(Build.SourcesDirectory)\bin\release\E2ETest\AspNetCore\Microsoft.Test.E2E.AspNetCore.OData.dll
+   & $SNx64 /Vr $(Build.SourcesDirectory)\bin\release\E2ETest\AspNetCore\Microsoft.Test.E2E.AspNetCore.OData.dll
+  displayName: 'Skip StrongName for Classic'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Core E2E Tests (Microsoft.Test.E2E.AspNetCore.OData.csproj)'
+  inputs:
+    command: test
+    projects: '$(Build.SourcesDirectory)\test\E2ETest\Microsoft.Test.E2E.AspNet.OData\Build.AspNetCore\Microsoft.Test.E2E.AspNetCore.OData.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-build'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Core E2E 3x Tests (Microsoft.Test.E2E.AspNetCore3x.OData.csproj)'
+  inputs:
+    command: test
+    projects: '$(Build.SourcesDirectory)\test\E2ETest\Microsoft.Test.E2E.AspNet.OData\Build.AspNetCore3x\Microsoft.Test.E2E.AspNetCore3x.OData.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-build --filter FullyQualifiedName!=Microsoft.Test.E2E.AspNet.OData.QueryComposition.SelectExpandEFTests.QueryForLongSelectList -v diag'
+
+- task: VSTest@2
+  displayName: 'Classic Unit Tests (Microsoft.AspNet.OData.Test.dll)'
+  inputs:
+    testAssemblyVer2: '**\bin\**\UnitTest\**\Microsoft.AspNet.OData.Test.dll'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Core Unit Tests (Microsoft.AspNetCore.OData.Test.csproj) '
+  inputs:
+    command: test
+    projects: '$(Build.SourcesDirectory)\test\UnitTest\Microsoft.AspNetCore.OData.Test\Microsoft.AspNetCore.OData.Test.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-build'
+
+- task: VSTest@2
+  displayName: 'Classic E2E Tests (Microsoft.Test.E2E.AspNet.OData.dll)'
+  inputs:
+    testAssemblyVer2: '**\bin\**\E2ETest\**\Microsoft.Test.E2E.AspNet.OData.dll'
+    testFiltercriteria: '(DisplayName!=Microsoft.Test.E2E.AspNet.OData.ODataPathHandler.UnicodeRouteTests_Todoü.CRUDEntitySetShouldWork)'

samples/AspNetCore3xEndpointSample.Web/Controllers/CustomersController.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="CustomersController.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using System.Collections.Generic;
 using System.Linq;

samples/AspNetCore3xEndpointSample.Web/Controllers/ODataOperationImportController.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="ODataOperationImportController.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;

samples/AspNetCore3xEndpointSample.Web/Controllers/WeatherForecastController.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="WeatherForecastController.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using System;
 using System.Collections.Generic;

samples/AspNetCore3xEndpointSample.Web/Models/CustomerOrder.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="CustomerOrder.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;

samples/AspNetCore3xEndpointSample.Web/Models/CustomerOrderContext.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="CustomerOrderContext.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using Microsoft.EntityFrameworkCore;
 

samples/AspNetCore3xEndpointSample.Web/Models/EdmModelBuilder.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="EdmModelBuilder.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using Microsoft.AspNet.OData.Builder;
 using Microsoft.OData.Edm;
@@ -39,4 +43,4 @@ public static IEdmModel GetEdmModel()
         }
 
     }
-}
+}

samples/AspNetCore3xEndpointSample.Web/Models/WeatherForecast.cs

@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-// Licensed under the MIT License.  See License.txt in the project root for license information.
+//-----------------------------------------------------------------------------
+// <copyright file="WeatherForecast.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
 
 using System;