Merge branch 'master' of https://github.com/RehanSaeed/Schema.NET

Author: RehanSaeed

CONTRIBUTING.md

@@ -4,13 +4,13 @@
 
  If you want to make If it's a small change, go ahead and raise a PR, otherwise follow these steps:
 
-1. View the [Projects](https://github.com/RehanSaeed/Schema.NET/projects) page to see a To-Do list of things to be implemented.
-2. Raise an issue or comment on an existing issue with what you want to contribute.
+1. View the [Projects](https://github.com/RehanSaeed/Schema.NET/issues) page to see a To-Do list of things to be implemented.
+2. Raise an issue or comment on an existing issue with what you want to contribute if one does not already exist.
 3. When you get the go ahead, follow the coding guidelines and raise a PR.
 
 # Coding Guidelines
 
-- Projects use StyleCop to produce style warnings. Please fix all warnings in any code you submit.
+- Projects use StyleCop and .editroconfig to produce style warnings. Please fix all warnings in any code you submit.
 - Write unit tests for any code written.
 
 # Special Thanks

README.md

@@ -151,15 +151,16 @@ For more examples and actual running code samples, take a look at the unit tests
 
 | Name            | Operating System | Status |
 | :---            | :---             | :---   |
-| Azure Pipelines | Windows          | [![Azure Pipelines Windows Build Status](https://dev.azure.com/schema-net/Schema.NET/_apis/build/status/Schema.NET?branchName=master&jobName=Windows)](https://dev.azure.com/schema-net/Schema.NET/_build/latest?definitionId=1&branchName=master) |
-| Azure Pipelines | Ubuntu           | [![Azure Pipelines Ubuntu Build Status](https://dev.azure.com/schema-net/Schema.NET/_apis/build/status/Schema.NET?branchName=master&jobName=Ubuntu)](https://dev.azure.com/schema-net/Schema.NET/_build/latest?definitionId=1&branchName=master) |
+| Azure Pipelines | Ubuntu           | [![Azure Pipelines Ubuntu Build Status](https://dev.azure.com/schema-net/Schema.NET/_apis/build/status/Schema.NET?branchName=master&stageName=Build&jobName=Build&configuration=Build%20Linux)](https://dev.azure.com/schema-net/Schema.NET/_build/latest?definitionId=1&branchName=master) |
+| Azure Pipelines | Mac              | [![Azure Pipelines Mac Build Status](https://dev.azure.com/schema-net/Schema.NET/_apis/build/status/Schema.NET?branchName=master&stageName=Build&jobName=Build&configuration=Build%20Mac)](https://dev.azure.com/schema-net/Schema.NET/_build/latest?definitionId=1&branchName=master) |
+| Azure Pipelines | Windows          | [![Azure Pipelines Windows Build Status](https://dev.azure.com/schema-net/Schema.NET/_apis/build/status/Schema.NET?branchName=master&stageName=Build&jobName=Build&configuration=Build%20Windows)](https://dev.azure.com/schema-net/Schema.NET/_build/latest?definitionId=1&branchName=master) |
 | AppVeyor        | Ubuntu & Windows | [![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/djxrpkw8ckyf24c1?svg=true)](https://ci.appveyor.com/project/RehanSaeed/schema-net) |
 
 ## NuGet Packages
 
-| Name | NuGet | MyGet |
-| :--- | :---  | :---  |
-| Schema.NET | [![Schema.NET NuGet Package](https://img.shields.io/nuget/v/Schema.NET.svg)](https://www.nuget.org/packages/Schema.NET) | [![Schema.NET MyGet Package](https://img.shields.io/myget/schema-net/v/Schema.Net.svg)](http://myget.org/gallery/schema-net) |
+| Name | NuGet | Azure Artifacts |
+| :--- | :---  | :---            |
+| Schema.NET | [![Schema.NET NuGet Package](https://img.shields.io/nuget/v/Schema.NET.svg)](https://www.nuget.org/packages/Schema.NET) | [![Schema.NET Azure Artifacts Package](https://feeds.dev.azure.com/schema-net/_apis/public/Packaging/Feeds/64e69c35-cb00-46e4-9cba-6d8faf1f41d6/Packages/fa72270b-6c54-4403-9307-aa826e43530e/Badge)](https://dev.azure.com/schema-net/Schema.NET/_packaging?_a=package&feed=64e69c35-cb00-46e4-9cba-6d8faf1f41d6&package=fa72270b-6c54-4403-9307-aa826e43530e&preferRelease=true) |
 
 ## Contributions and Thanks
 

Schema.NET.sln

@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F20E2797-D1E3-4321-91BB-FAE54954D2A0}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		azure-pipelines.yml = azure-pipelines.yml
@@ -23,6 +24,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{7EDFA103-DB69-4C88-9DE4-97ADBF8253A1}"
 	ProjectSection(SolutionItems) = preProject
 		CONTRIBUTING.md = CONTRIBUTING.md
+		ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection

Source/Schema.NET/Schema.NET.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
-    <VersionPrefix>4.0.0</VersionPrefix>
+    <VersionPrefix>4.1.0</VersionPrefix>
     <Authors>Muhammad Rehan Saeed (RehanSaeed.com)</Authors>
     <Product>Schema.NET</Product>
     <Description>Schema.org objects turned into strongly typed C# POCO classes for use in .NET. All classes can be serialized into JSON/JSON-LD and XML, typically used to represent structured data in the head section of html page.</Description>

Tests/Schema.NET.Test/Schema.NET.Test.csproj

@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
+    <PackageReference Include="Moq" Version="4.11.0" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Version="1.1.118" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

appveyor.yml

@@ -25,7 +25,9 @@ build_script:
 - sh: sudo apt-get install -y dotnet-sdk-2.2
 - cmd: choco install dotnetcore-sdk --no-progress --confirm --version 2.2.300
 - pwsh: dotnet tool install --global Cake.Tool
-- pwsh: dotnet cake
+- pwsh: dotnet cake --target=Build
+- pwsh: dotnet cake --target=Test
+- pwsh: dotnet cake --target=Pack
 
 test: off
 
@@ -35,30 +37,4 @@ artifacts:
 - name: NuGet Symbol Packages
   path: ./Artifacts/**/*.snupkg
 - name: xUnit Test Results
-  path: ./Artifacts/**/*.xml
-
-deploy:
-# Publish MyGet packages
-- provider: NuGet
-  server: https://www.myget.org/F/schema-net/api/v2/package
-  api_key:
-    secure: aunGGWt32irQiOTX2wIO6e2Y5Ga0girA3xSUsmQv6E9d6ohHdbK5HJpXpmxW9QM3
-  on:
-    # Only publish on Windows
-    CI_WINDOWS: true
-    # Only publish from the master branch
-    branch: master
-# Publish NuGet packages
-- provider: NuGet
-  name: production
-  api_key:
-    secure: 73eFUWSfho6pxCy1VRP1H0AYh/SFiyEREV+/ATcoj0I+sSH9dec/WXs6H2Jy5vlS
-  on:
-    # Only publish on Windows
-    CI_WINDOWS: true
-    # Only publish from the master branch
-    branch: master
-    # Only publish if the trigger was a Git tag
-    # git tag v0.1.0-beta
-    # git push origin --tags
-    appveyor_repo_tag: true
+  path: ./Artifacts/**/*.xml

azure-pipelines.yml

@@ -1,84 +1,97 @@
-# Azure Pipelines documentation https://aka.ms/yaml
-
-trigger:
-  branches:
-    include:
-    - '*'
-  tags:
-    include:
-    - '*'
-
-variables:
-  # Set the DOTNET_SKIP_FIRST_TIME_EXPERIENCE environment variable to stop wasting time caching packages
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  # Disable sending usage data to Microsoft
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
-
-jobs:
-- job: Ubuntu
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-  - task: Bash@3
-    displayName: 'Install .NET Core SDK'
-    inputs:
-      targetType: 'inline'
-      script: 'sudo apt-get update && sudo apt-get install -y dotnet-sdk-2.2'
-  - task: Bash@3
-    displayName: 'Install Cake Tool'
-    inputs:
-      targetType: 'inline'
-      script: 'dotnet tool install --global Cake.Tool'
-      failOnStderr: true
-  - task: Bash@3
-    displayName: 'Dotnet Cake'
-    inputs:
-      targetType: 'inline'
-      script: 'dotnet cake'
-      failOnStderr: true
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results'
-    inputs:
-      testResultsFormat: 'VSTest'
-      testResultsFiles: '**/*.trx'
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Artifacts'
-    inputs:
-      artifactName: 'Ubuntu Artifacts'
-      targetPath: './Artifacts'
-
-- job: Windows
-  pool:
-    vmImage: 'windows-latest'
-  steps:
-  - task: PowerShell@2
-    displayName: 'Install .NET Core SDK'
-    inputs:
-      targetType: 'inline'
-      script: 'choco install dotnetcore-sdk --no-progress --confirm --version 2.2.300'
-      failOnStderr: true
-      pwsh: true
-  - task: PowerShell@2
-    displayName: 'Install Cake Tool'
-    inputs:
-      targetType: 'inline'
-      script: 'dotnet tool install --global Cake.Tool'
-      failOnStderr: true
-      pwsh: true
-  - task: PowerShell@2
-    displayName: 'Dotnet Cake'
-    inputs:
-      targetType: 'inline'
-      script: 'dotnet cake'
-      failOnStderr: true
-      pwsh: true
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results'
-    inputs:
-      testResultsFormat: 'VSTest'
-      testResultsFiles: '**/*.trx'
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Artifacts'
-    inputs:
-      artifactName: 'Windows Artifacts'
-      targetPath: './Artifacts'
+# Azure Pipelines documentation https://aka.ms/yaml
+
+trigger:
+  branches:
+    include:
+    - '*'
+  tags:
+    include:
+    - '*'
+
+variables:
+  # Set the DOTNET_SKIP_FIRST_TIME_EXPERIENCE environment variable to stop wasting time caching packages
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  # Disable sending usage data to Microsoft
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+
+stages:
+- stage: Build
+  jobs:
+  - job: Build
+    strategy:
+      matrix:
+        Linux:
+          matrixName: Ubuntu
+          vmImageName: ubuntu-latest
+        Mac:
+          matrixName: Mac
+          vmImageName: macos-latest
+        Windows:
+          matrixName: Windows
+          vmImageName: windows-latest
+    pool:
+      vmImage: $(vmImageName)
+    timeoutInMinutes: 10
+    steps:
+    - task: UseDotNet@2
+      displayName: 'Install .NET Core SDK'
+      inputs:
+        packageType: 'sdk'
+        version: '2.2.300'
+    - script: 'dotnet tool install --global Cake.Tool'
+      displayName: 'Install Cake Tool'
+      failOnStderr: true
+    - script: 'dotnet cake --target=Build'
+      displayName: 'Dotnet Cake Build'
+      failOnStderr: true
+    - script: 'dotnet cake --target=Test'
+      displayName: 'Dotnet Cake Test'
+      failOnStderr: true
+    - script: 'dotnet cake --target=Pack'
+      displayName: 'Dotnet Cake Pack'
+      failOnStderr: true
+    - task: PublishTestResults@2
+      displayName: 'Publish Test Results'
+      inputs:
+        testResultsFormat: 'VSTest'
+        testResultsFiles: '**/*.trx'
+    - task: PublishPipelineArtifact@0
+      displayName: 'Publish Artifacts'
+      inputs:
+        artifactName: $(matrixName)
+        targetPath: './Artifacts'
+- stage: Deploy
+  jobs:
+  - deployment: AzureArtifacts
+    displayName: 'Azure Artifacts'
+    pool:
+      vmImage: ubuntu-latest
+    environment: 'Azure Artifacts'
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          - task: DotNetCoreCLI@2
+            displayName: 'Dotnet NuGet Push'
+            inputs:
+              command: push
+              nuGetFeedType: internal
+              packagesToPush: '/home/vsts/work/1/Windows/*.nupkg'
+              publishVstsFeed: schema-net
+  - deployment: NuGet
+    pool:
+      vmImage: ubuntu-latest
+    environment: 'NuGet'
+    condition: startsWith(variables['build.sourceBranch'], 'refs/tags/')
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          # Dotnet NuGet does not work yet https://github.com/Microsoft/azure-pipelines-tasks/issues/7160
+          - task: NuGetCommand@2
+            displayName: 'Dotnet NuGet Push'
+            inputs:
+              command: push
+              nuGetFeedType: external
+              packagesToPush: '/home/vsts/work/1/Windows/*.nupkg'
+              publishFeedCredentials: NuGet