OmniSharp · david-driscoll · Mar 19, 2020 · Mar 19, 2020 · Mar 19, 2020 · Mar 19, 2020
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -1,45 +1,106 @@
 trigger:
-  branches:
-    include:
-      - master
-      - refs/tags/*
+    batch: true
+    branches:
+        include:
+            - master
+            - refs/tags/*
+    paths:
+        exclude:
+            - '**/*.md'
+            - '.appveyor.yml'
+            - '.codecov.yml'
+            - 'GitVersion.yml'
+            - 'GitReleaseManager.yaml'
+            - .vscode/*
+            - .git*
+            - .editorconfig
+            - .nuke
+            - LICENSE
+
 pr:
-  autoCancel: true
-  branches:
-    include:
-      - master
+    autoCancel: true
+    branches:
+        include:
+            - master
 
 resources:
-  repositories:
-    - repository: rsg
-      type: github
-      name: RocketSurgeonsGuild/AzureDevopsTemplates
-#      ref: refs/tags/v0.12.0
-      endpoint: github
+    repositories:
+        - repository: rsg
+          type: github
+          name: RocketSurgeonsGuild/AzureDevopsTemplates
+          ref: refs/tags/v0.12.0
+          endpoint: github
 
 variables:
-  Configuration: Release
-  Verbosity: Normal
-  Coverage: "$(Agent.BuildDirectory)/c"
-  VstsCoverage: "$(Coverage)"
-  Artifacts: $(Build.ArtifactStagingDirectory)
-  VstsArtifacts: "$(Artifacts)"
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
+    - name: CONFIGURATION
+      value: Release
+    - name: VERBOSITY
+      value: Normal
+    - name: COVERAGE
+      value: '$(Agent.BuildDirectory)/c'
+    - name: ARTIFACTS
+      value: $(Build.ArtifactStagingDirectory)
+    - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+      value: 'true'
+    - name: CodeCovToken
+      value: 'd122bf99-4ca6-4a7c-a7ff-90468bcc7703'
+    # Fixes the github package repo warnings on restore
+    - name: EmitAssetsLogMessages
+      value: false
+    - name: HideWarningsAndErrors
+      value: true
 
 jobs:
-  - template: pipeline/cake.yml@rsg
-    parameters:
-      dependsOn: GitVersion
-      Configuration: $(Configuration)
-      Verbosity: $(Verbosity)
-      Script: build.cake
-      EnableReleaseNotes: false
-      Matrix:
-        Windows:
-          BuildName: "Windows"
-          ImageName: "windows-latest"
-          ScriptName: build.ps1
-        Linux:
-          BuildName: "Linux"
-          ImageName: "ubuntu-latest"
-          ScriptName: build.sh
+    - template: jobs/gitversion.yml@rsg
+
+    - job: Build
+      strategy:
+          matrix:
+              Windows:
+                  BuildName: 'Windows'
+                  ImageName: 'windows-latest'
+              Linux:
+                  BuildName: 'Linux'
+                  ImageName: 'ubuntu-latest'
+              macOS:
+                  BuildName: 'macOS'
+                  ImageName: 'macOS-latest'
+      pool:
+          vmImage: $(ImageName)
+      steps:
+          - template: support/mono.yml@rsg
+          - template: support/install-dotnet.yml@rsg
+            parameters:
+                DotNetSdk:
+                    - '2.x'
+                    - '3.x'
+          - template: support/gitversion-hack.yml@rsg
+
+          - task: DotNetCoreCLI@2
+            displayName: 'dotnet tool restore'
+            inputs:
+                command: custom
+                custom: tool
+                arguments: 'restore'
+
+          - task: DotNetCoreCLI@2
+            displayName: 'dotnet restore'
+            inputs:
+                command: restore
+                feedsToUse: config
+                nugetConfigPath: NuGet.config
+                verbosityRestore: Minimal
+
+          - template: ./azure-pipelines.nuke.yml
+            parameters:
+                Artifacts: $(Artifacts)
+                Configuration: $(Configuration)
+                Coverage: $(Coverage)
+
+          - template: support/publish-artifacts.yml@rsg
+            parameters:
+                Artifacts: $(Artifacts)
+                Configuration: $(Configuration)
+                Coverage: $(Coverage)
+                Postfix: ' - $(BuildName)'
+                PublishVSTest: true
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "gitversion.tool": {
-      "version": "5.0.1",
+      "version": "5.2.4",
       "commands": [
         "dotnet-gitversion"
       ]
@@ -19,6 +19,30 @@
       "commands": [
         "reportgenerator"
       ]
+    },
+    "codecov.tool": {
+      "version": "1.10.0",
+      "commands": [
+        "codecov"
+      ]
+    },
+    "gitreleasemanager.tool": {
+      "version": "0.11.0",
+      "commands": [
+        "dotnet-gitreleasemanager"
+      ]
+    },
+    "nuke.globaltool": {
+      "version": "0.24.4",
+      "commands": [
+        "nuke"
+      ]
+    },
+    "nukeeper": {
+      "version": "0.26.1",
+      "commands": [
+        "nukeeper"
+      ]
     }
   }
 }
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,34 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Update="GitVersion.Tool" Version="5.1.3" />
-        <PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.4" />
-        <PackageReference Update="Nuke.Common" Version="0.24.4" />
-        <PackageReference Update="ReportGenerator" Version="4.5.0" />
-        <PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.13.4" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
-        <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-        <PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
-        <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-        <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-        <PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
-        <PackageReference Update="xunit" Version="2.4.1" />
-        <PackageReference Update="FluentAssertions" Version="5.6.0" />
-        <PackageReference Update="NSubstitute" Version="3.1.0" />
-        <PackageReference Update="Autofac" Version="4.8.1" />
-        <PackageReference Update="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
-        <PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
-        <PackageReference Update="Serilog.Sinks.XUnit" Version="1.0.7" />
-        <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
-        <PackageReference Update="coverlet.msbuild" Version="2.5.1" />
-        <PackageReference Update="System.Reactive" Version="4.1.2" />
-        <PackageReference Update="MediatR" Version="7.0.0" />
-        <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="0.3.1" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="GitVersion.Tool" Version="5.2.4" />
+    <PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.4" />
+    <PackageReference Update="Nuke.Common" Version="0.24.4" />
+    <PackageReference Update="ReportGenerator" Version="4.5.2" />
+    <PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.13.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
+    <PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Update="xunit" Version="2.4.1" />
+    <PackageReference Update="FluentAssertions" Version="5.10.2" />
+    <PackageReference Update="NSubstitute" Version="4.2.1" />
+    <PackageReference Update="Autofac" Version="4.8.1" />
+    <PackageReference Update="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
+    <PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
+    <PackageReference Update="Serilog.Sinks.XUnit" Version="1.0.21" />
+    <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
+    <PackageReference Update="coverlet.collector" Version="1.2.0" />
+    <PackageReference Update="coverlet.msbuild" Version="2.8.0" />
+    <PackageReference Update="System.Reactive" Version="4.3.2" />
+    <PackageReference Update="MediatR" Version="8.0.1" />
+    <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -12,6 +12,7 @@
         <PackageReference Include="Serilog.Extensions.Logging" />
         <PackageReference Include="Serilog.Sinks.XUnit" />
         <PackageReference Include="XunitXml.TestLogger" />
+        <PackageReference Include="coverlet.collector" />
         <PackageReference Include="coverlet.msbuild" />
     </ItemGroup>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />