Merge branch 'master' into Pseudo-Localisation

martincostello · Nov 10, 2018 · 1699142 · 1699142
2 parents b25f034 + 5e894aa
commit 1699142
Show file tree

Hide file tree

Showing 48 changed files with 632 additions and 354 deletions.
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -0,0 +1,122 @@
+parameters:
+  agentOS: 'Windows'
+  phaseName: ''
+  queueName: ''
+  buildArgs: ''
+  beforeBuild: []
+  afterBuild: []
+  variables: {}
+  dependsOn: ''
+  artifacts:
+    archiveName: 'app.zip'
+    publish: true
+
+phases:
+  - phase: ${{ coalesce(parameters.phaseName, parameters.agentOS) }}
+    dependsOn: ${{ parameters.dependsOn }}
+    displayName: ${{ coalesce(parameters.phaseName, parameters.agentOS) }}
+    queue:
+      ${{ if ne(parameters.queueName, '') }}:
+        name: ${{ parameters.queueName }}
+      ${{ if and(eq(parameters.queueName, ''), eq(parameters.agentOS, 'Linux')) }}:
+        name: Hosted Ubuntu 1604
+      ${{ if and(eq(parameters.queueName, ''), eq(parameters.agentOS, 'macOS')) }}:
+        name: Hosted macOS
+      ${{ if and(eq(parameters.queueName, ''), eq(parameters.agentOS, 'Windows')) }}:
+        name: Hosted VS2017
+    variables:
+      AgentOSName: ${{ parameters.agentOS }}
+      ArchiveName: ${{ parameters.artifacts.archiveName }}
+      BuildArgs: ${{ parameters.buildArgs }}
+      ${{ insert }}: ${{ parameters.variables }}
+    steps:
+      - ${{ parameters.beforeBuild }}
+      - ${{ if eq(parameters.agentOS, 'Linux') }}:
+        - script: |
+            sudo apt-get update
+            sudo apt-get install -y --no-install-recommends gettext libcurl4-openssl-dev libicu-dev libssl-dev libunwind8
+          name: InstallDotNetCoreDeps
+          displayName: Install .NET Core pre-requisites
+      - ${{ if eq(parameters.agentOS, 'Linux') }}:
+        - script: |
+            sudo npm install -g npm
+          name: UpdateNpm
+          displayName: Update to latest npm
+      - ${{ if ne(parameters.agentOS, 'Linux') }}:
+        - script: |
+            npm install -g npm
+          name: UpdateNpm
+          displayName: Update to latest npm
+      - ${{ if eq(parameters.agentOS, 'macOS') }}:
+        - script: |
+            npm install -g gulp@3.9.1
+          name: InstallGulp
+          displayName: Install gulp
+      - ${{ if eq(parameters.agentOS, 'macOS') }}:
+        - script: |
+            brew install brew-cask
+            brew cask install google-chrome
+          name: InstallChrome
+          displayName: Install Google Chrome
+      - ${{ if eq(parameters.agentOS, 'Windows') }}:
+        - powershell: |
+            .\Build.ps1 -OutputPath $(Build.StagingDirectory) $(BuildArgs)
+          name: BuildAndTest
+          displayName: Build and test
+          timeoutInMinutes: 20
+          env:
+            DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+            NUGET_XMLDOC_MODE: skip
+      - ${{ if ne(parameters.agentOS, 'Windows') }}:
+        - script: |
+            ./build.sh --output $(Build.StagingDirectory) $(BuildArgs)
+          name: BuildAndTest
+          displayName: Build and test
+          timeoutInMinutes: 20
+          env:
+            DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+            NUGET_XMLDOC_MODE: skip
+      - ${{ if eq(parameters.agentOS, 'Windows') }}:
+        - task: ArchiveFiles@2
+          name: Package
+          displayName: Create deployment package
+          inputs:
+            rootFolderOrFile: '$(Build.StagingDirectory)/publish'
+            includeRootFolder: false
+            archiveFile: '$(Build.StagingDirectory)/$(ArchiveName)'
+            condition: succeeded()
+      - task: PublishTestResults@2
+        name: PublishTests
+        displayName: Publish test results
+        condition: always()
+        inputs:
+          testRunner: VSTest
+          testRunTitle: Unit and integration tests ($(AgentOSName))
+          testResultsFiles: $(Build.SourcesDirectory)/**/*.trx
+      - ${{ if eq(parameters.agentOS, 'Windows') }}:
+        - task: PublishCodeCoverageResults@1
+          name: PublishCodeCoverage
+          displayName: Publish code coverage
+          condition: always()
+          inputs:
+            codeCoverageTool: cobertura
+            reportDirectory: $(Build.StagingDirectory)/**/coverage
+            summaryFileLocation: $(Build.StagingDirectory)/**/Cobertura.xml
+      - task: PublishBuildArtifacts@1
+        displayName: Publish build artifacts
+        condition: eq(variables['System.PullRequest.IsFork'], false)
+        inputs:
+          PathToPublish: '$(Build.StagingDirectory)'
+          ArtifactType: Container
+          ${{ if eq(parameters.artifacts.name, '') }}:
+            ArtifactName: BuildDrop-$(AgentOSName)
+          ${{ if ne(parameters.artifacts.name, '') }}:
+            ArtifactName: ${{ parameters.artifacts.name }}
+      - ${{ if eq(parameters.agentOS, 'Windows') }}:
+        - task: PublishBuildArtifacts@1
+          displayName: Publish deployment package
+          inputs:
+            PathtoPublish: '$(Build.StagingDirectory)/$(ArchiveName)'
+            ArtifactName: DeploymentPackage
+            condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'], false))
+      - ${{ parameters.afterBuild }}
diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml
@@ -0,0 +1,24 @@
+name: CI_$(Date:yyyyMMdd)$(Rev:.r)
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - master
+
+phases:
+- template: build-template.yml
+  parameters:
+    agentOS: Linux
+    artifacts:
+      archiveName: website.zip
+- template: build-template.yml
+  parameters:
+    agentOS: macOS
+    artifacts:
+      archiveName: website.zip
+#- template: build-template.yml
+#  parameters:
+#    agentOS: Windows
+#    artifacts:
+#      archiveName: website.zip
diff --git a/Build.ps1 b/Build.ps1
@@ -80,7 +80,7 @@ function DotNetTest {
         $openCoverVersion = "4.6.519"
         $openCoverPath = Join-Path $nugetPath "OpenCover\$openCoverVersion\tools\OpenCover.Console.exe"
 
-        $reportGeneratorVersion = "4.0.0-rc4"
+        $reportGeneratorVersion = "4.0.2"
         $reportGeneratorPath = Join-Path $nugetPath "ReportGenerator\$reportGeneratorVersion\tools\netcoreapp2.0\ReportGenerator.dll"
 
         $coverageOutput = Join-Path $OutputPath "code-coverage.xml"
@@ -95,6 +95,7 @@ function DotNetTest {
                 -hideskipped:All `
                 -mergebyhash `
                 -oldstyle `
+                -returntargetcode `
                 -register:user `
                 -skipautoprops `
                 `"-filter:+[LondonTravel.Site]* +[LondonTravel.Site.Views]* -[LondonTravel.Site.Tests]*`"
@@ -108,6 +109,7 @@ function DotNetTest {
                 -hideskipped:All `
                 -mergebyhash `
                 -oldstyle `
+                -returntargetcode `
                 -register:user `
                 -skipautoprops `
                 `"-filter:+[LondonTravel.Site]* +[LondonTravel.Site.Views]* -[LondonTravel.Site.Tests]*`"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,15 +1,18 @@
 <Project>
+  <PropertyGroup>
+    <AnalyzersVersion>2.6.2</AnalyzersVersion>
+  </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
     <Compile Include="$(MSBuildThisFileDirectory)CommonAssemblyInfo.cs" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="2.6.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(AnalyzersVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="$(AnalyzersVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
     <PackageReference Include="OpenCover" Version="4.6.519" PrivateAssets="All" />
-    <PackageReference Include="ReportGenerator" Version="4.0.0-rc4" PrivateAssets="All" />
+    <PackageReference Include="ReportGenerator" Version="4.0.2" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
-    <PackageReference Include="Text.Analyzers" Version="2.6.1" PrivateAssets="All" />
+    <PackageReference Include="Text.Analyzers" Version="$(AnalyzersVersion)" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

diff --git a/LondonTravel.Site.sln b/LondonTravel.Site.sln
@@ -39,6 +39,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".vscode", ".vscode", "{DB85
 		.vscode\tasks.json = .vscode\tasks.json
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".azure-pipelines", ".azure-pipelines", "{6E4177B7-FAE2-448E-8764-B2261F9EEA63}"
+	ProjectSection(SolutionItems) = preProject
+		.azure-pipelines\build-template.yml = .azure-pipelines\build-template.yml
+		.azure-pipelines\build.yml = .azure-pipelines\build.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{4F53FEF1-66BC-45ED-B563-A619E9A193B7}"
+	ProjectSection(SolutionItems) = preProject
+		.github\stale.yml = .github\stale.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4AD9EC06-329C-47FB-8549-1A1EDE980130}"
+	ProjectSection(SolutionItems) = preProject
+		docs\alexa-linking.graphviz = docs\alexa-linking.graphviz
+		docs\site.graphviz = docs\site.graphviz
+		docs\skill.graphviz = docs\skill.graphviz
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,9 @@ Global
 		{F1A4074F-A8DE-4A9A-97EF-91830AEC59B3} = {0EED3EF2-37DE-4E6E-B766-3E641D163515}
 		{0106CA34-73B0-4F30-8BDF-AF8D7AB22A4A} = {668E07A5-C40F-4694-9D3C-EBC1180656CF}
 		{DB85B1E3-701B-456F-AEE1-3B2F1DA23BC2} = {DD7EA67A-4FE1-4D4F-825E-51FF842107AB}
+		{6E4177B7-FAE2-448E-8764-B2261F9EEA63} = {DD7EA67A-4FE1-4D4F-825E-51FF842107AB}
+		{4F53FEF1-66BC-45ED-B563-A619E9A193B7} = {DD7EA67A-4FE1-4D4F-825E-51FF842107AB}
+		{4AD9EC06-329C-47FB-8549-1A1EDE980130} = {DD7EA67A-4FE1-4D4F-825E-51FF842107AB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {612E5D09-113B-4494-BEE6-0376224726FE}

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.402"
+    "version": "2.1.403"
   }
 }
diff --git a/src/LondonTravel.Site/Controllers/AccountController.cs b/src/LondonTravel.Site/Controllers/AccountController.cs
@@ -37,7 +37,7 @@ public class AccountController : Controller
         private readonly ISiteTelemetry _telemetry;
         private readonly IClock _clock;
         private readonly bool _isEnabled;
-        private readonly ILogger<AccountController> _logger;
+        private readonly ILogger _logger;
 
         public AccountController(
             UserManager<LondonTravelUser> userManager,

diff --git a/src/LondonTravel.Site/Controllers/AlexaController.cs b/src/LondonTravel.Site/Controllers/AlexaController.cs
@@ -39,7 +39,7 @@ public class AlexaController : Controller
         /// <summary>
         /// The <see cref="ILogger"/> to use. This field is read-only.
         /// </summary>
-        private readonly ILogger<AlexaController> _logger;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AlexaController"/> class.

diff --git a/src/LondonTravel.Site/Controllers/ApiController.cs b/src/LondonTravel.Site/Controllers/ApiController.cs
@@ -37,7 +37,7 @@ public class ApiController : ControllerBase
         /// <summary>
         /// The <see cref="ILogger"/> to use. This field is read-only.
         /// </summary>
-        private readonly ILogger<ApiController> _logger;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiController"/> class.

diff --git a/src/LondonTravel.Site/Controllers/HelpController.cs b/src/LondonTravel.Site/Controllers/HelpController.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Martin Costello, 2017. All rights reserved.
+// Copyright (c) Martin Costello, 2017. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
 namespace MartinCostello.LondonTravel.Site.Controllers
@@ -23,7 +23,7 @@ public class HelpController : Controller
         /// <summary>
         /// The <see cref="ILogger"/> to use. This field is read-only.
         /// </summary>
-        private readonly ILogger<HelpController> _logger;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HelpController"/> class.

diff --git a/src/LondonTravel.Site/Controllers/HomeController.cs b/src/LondonTravel.Site/Controllers/HomeController.cs
@@ -33,7 +33,7 @@ public class HomeController : Controller
         /// <summary>
         /// The <see cref="ILogger"/> to use. This field is read-only.
         /// </summary>
-        private readonly ILogger<HomeController> _logger;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HomeController"/> class.

diff --git a/src/LondonTravel.Site/Controllers/ManageController.cs b/src/LondonTravel.Site/Controllers/ManageController.cs
@@ -28,22 +28,22 @@ public class ManageController : Controller
     {
         private readonly UserManager<LondonTravelUser> _userManager;
         private readonly SignInManager<LondonTravelUser> _signInManager;
-        private readonly IDocumentClient _documentClient;
+        private readonly IDocumentService _documentService;
         private readonly ITflServiceFactory _tflServiceFactory;
         private readonly ISiteTelemetry _telemetry;
-        private readonly ILogger<ManageController> _logger;
+        private readonly ILogger _logger;
 
         public ManageController(
           UserManager<LondonTravelUser> userManager,
           SignInManager<LondonTravelUser> signInManager,
-          IDocumentClient documentClient,
+          IDocumentService documentService,
           ITflServiceFactory tflServiceFactory,
           ISiteTelemetry telemetry,
           ILogger<ManageController> logger)
         {
             _userManager = userManager;
             _signInManager = signInManager;
-            _documentClient = documentClient;
+            _documentService = documentService;
             _tflServiceFactory = tflServiceFactory;
             _telemetry = telemetry;
             _logger = logger;

diff --git a/src/LondonTravel.Site/Controllers/RegisterController.cs b/src/LondonTravel.Site/Controllers/RegisterController.cs
@@ -14,7 +14,7 @@ namespace MartinCostello.LondonTravel.Site.Controllers
     public class RegisterController : Controller
     {
         private readonly IAccountService _service;
-        private readonly ILogger<RegisterController> _logger;
+        private readonly ILogger _logger;
 
         public RegisterController(IAccountService service, ILogger<RegisterController> logger)
         {
@@ -60,8 +60,8 @@ private async Task<long> GetRegisteredUsersCountAsync()
             }
             catch (Exception)
             {
-                // Over 5,000 users as of 01/01/2018
-                return 5000;
+                // Over 7,000 users as of 28/10/2018
+                return 7_000;
             }
         }
     }

diff --git a/src/LondonTravel.Site/Identity/OAuthEventsHandler.cs b/src/LondonTravel.Site/Identity/OAuthEventsHandler.cs
@@ -29,7 +29,7 @@ public class OAuthEventsHandler : OAuthEvents
         /// <summary>
         /// The <see cref="ILogger"/> to use. This field is read-only.
         /// </summary>
-        private readonly ILogger<OAuthEventsHandler> _logger;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="OAuthEventsHandler"/> class.