Merge branch 'develop' into master

.docker/linux/Spark.Dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2-stretch AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
 WORKDIR /src
 COPY ["./src/Spark.Web/", "Spark.Web/"]
 COPY ["./src/Spark.Engine/", "Spark.Engine/"]

.editorconfig

@@ -1,12 +1,11 @@
-# EditorConfig
-# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference?view=vs-2017
+[*.{cs,vb}]
 
-root = true
+dotnet_naming_rule.private_fields_start_with_underscore.symbols = private_fields
+dotnet_naming_rule.private_fields_start_with_underscore.style = starts_with_underscore
+dotnet_naming_rule.private_fields_start_with_underscore.severity = warning
 
-# Ensure space is used for indentation in all files
-[*]
-indent_style = space
+dotnet_naming_symbols.private_fields.applicable_kinds = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private
 
-# Code files indentation
-[*.{cs,csx}]
-indent_size = 4
+dotnet_naming_style.starts_with_underscore.capitalization = camel_case
+dotnet_naming_style.starts_with_underscore.required_prefix = _

.github/workflows/deploy_docs.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - develop
+    paths:
+      - 'docs/**'
 
 jobs:
   build:

README.md

@@ -1,3 +1,7 @@
+|DSTU2|STU3|R4
+|---|---|---
+|![Tests](https://github.com/FirelyTeam/spark/workflows/Tests/badge.svg?branch=develop)|![Tests](https://github.com/FirelyTeam/spark/workflows/Tests/badge.svg?branch=stu3%2Fdevelop)|![Tests](https://github.com/FirelyTeam/spark/workflows/Tests/badge.svg?branch=r4%2Fdevelop)
+
 Spark
 =====
 

Spark.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.329
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Engine", "src\Spark.Engine\Spark.Engine.csproj", "{426991A6-546C-43D5-B055-A38D0175824F}"
 EndProject
@@ -15,6 +15,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Mongo.Tests", "src\Sp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web", "src\Spark.Web\Spark.Web.csproj", "{6A59CE4B-D912-4995-A805-89705B8134E0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{073444E3-56AE-4904-8EBD-DED0F9B54499}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.IntegrationTest", "src\Spark.IntegrationTest\Spark.IntegrationTest.csproj", "{49FB5DBC-8F10-49C2-B358-84EEF9B12F83}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".docker", ".docker", "{40662456-0D34-4F03-8568-A10372856F88}"
+	ProjectSection(SolutionItems) = preProject
+		.docker\docker-compose.example.yml = .docker\docker-compose.example.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{152C561B-C5BE-448A-9AD9-60BE3064CEAC}"
+	ProjectSection(SolutionItems) = preProject
+		.docker\linux\dstu2.archive.gz = .docker\linux\dstu2.archive.gz
+		.docker\linux\Mongo.Dockerfile = .docker\linux\Mongo.Dockerfile
+		.docker\linux\mongorestore.sh = .docker\linux\mongorestore.sh
+		.docker\linux\Spark.Dockerfile = .docker\linux\Spark.Dockerfile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{36B3A784-1A43-4DDE-8BE9-18D198113729}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3278905B-E0BB-4996-BC5A-EE6B9A04CFE6}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\deploy_docs.yml = .github\workflows\deploy_docs.yml
+		.github\workflows\docker_image_linux.yml = .github\workflows\docker_image_linux.yml
+		.github\workflows\nuget_deploy.yml = .github\workflows\nuget_deploy.yml
+		.github\workflows\run_tests.yaml = .github\workflows\run_tests.yaml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,10 +75,20 @@ Global
 		{6A59CE4B-D912-4995-A805-89705B8134E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A59CE4B-D912-4995-A805-89705B8134E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A59CE4B-D912-4995-A805-89705B8134E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49FB5DBC-8F10-49C2-B358-84EEF9B12F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49FB5DBC-8F10-49C2-B358-84EEF9B12F83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49FB5DBC-8F10-49C2-B358-84EEF9B12F83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49FB5DBC-8F10-49C2-B358-84EEF9B12F83}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{40662456-0D34-4F03-8568-A10372856F88} = {073444E3-56AE-4904-8EBD-DED0F9B54499}
+		{152C561B-C5BE-448A-9AD9-60BE3064CEAC} = {40662456-0D34-4F03-8568-A10372856F88}
+		{36B3A784-1A43-4DDE-8BE9-18D198113729} = {073444E3-56AE-4904-8EBD-DED0F9B54499}
+		{3278905B-E0BB-4996-BC5A-EE6B9A04CFE6} = {36B3A784-1A43-4DDE-8BE9-18D198113729}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B5F4527D-CCCF-4487-9E2D-D324DF3552E8}
 	EndGlobalSection

docs/doczrc.js

@@ -0,0 +1,9 @@
+export default {
+    menu: [
+      'Introduction',
+      'Get started',
+      'Deployment',
+      'Resources',
+      'Contribute to Spark'
+    ],
+  }

docs/gatsby-config.js

@@ -2,26 +2,33 @@ module.exports = {
   siteMetadata: {
     title: `Spark FHIR server | Documentation`,
     description: `C# Reference Implementation for HL7 FHIR`,
-    author: `Spark`,
+    author: `Spark`
   },
   pathPrefix: "/spark",
   plugins: [
     {
       resolve: `gatsby-theme-docz`,
       options: {
         themeConfig: {
-          mode: `dark`,
+          mode: `dark`
         },
-        ignore: ['README.md', 'LICENSE.md'],
-      },
+        ignore: ["README.md", "LICENSE.md"],
+        gatsbyRemarkPlugins: [
+          {
+            resolve: "gatsby-remark-vscode",
+            // OPTIONAL
+            options: {}
+          }
+        ]
+      }
     },
     `gatsby-plugin-react-helmet`,
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         name: `images`,
-        path: `${__dirname}/src/images`,
-      },
+        path: `${__dirname}/src/images`
+      }
     },
     `gatsby-transformer-sharp`,
     `gatsby-plugin-sharp`,
@@ -34,8 +41,8 @@ module.exports = {
         background_color: `#663399`,
         theme_color: `#663399`,
         display: `minimal-ui`,
-        icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site.
-      },
-    },
-  ],
-}
+        icon: `src/images/gatsby-icon.png` // This path is relative to the root of the site.
+      }
+    }
+  ]
+};