From 5c0c6c1503745cfc721f470fc405e28880b3cad7 Mon Sep 17 00:00:00 2001
From: David Driscoll <david.driscoll@gmail.com>
Date: Sun, 5 Jan 2020 21:23:46 -0500
Subject: [PATCH] Updated to dotnet core 3.1 over 3.0 +semver:minor

---
 .config/dotnet-tools.json                     |  78 +++++-------
 Directory.Build.props                         |   1 +
 Packages.props                                |   7 +-
 Packages.support.props                        |   3 +
 azure-pipelines.yml                           | 114 +++++++++---------
 .../Rocket.Surgery.Meta.Core.Tests.csproj     |   3 +-
 6 files changed, 98 insertions(+), 108 deletions(-)
 create mode 100644 Packages.support.props

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 6e671a3..6665b84 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -1,48 +1,34 @@
 {
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "nukeeper": {
-      "version": "0.25.0",
-      "commands": [
-        "nukeeper"
-      ]
-    },
-    "dotnet-outdated": {
-      "version": "2.6.0",
-      "commands": [
-        "dotnet-outdated"
-      ]
-    },
-    "gitversion.tool": {
-      "version": "5.1.2",
-      "commands": [
-        "dotnet-gitversion"
-      ]
-    },
-    "dotnet-reportgenerator-globaltool": {
-      "version": "4.3.6",
-      "commands": [
-        "reportgenerator"
-      ]
-    },
-    "nuke.globaltool": {
-      "version": "0.23.3",
-      "commands": [
-        "nuke"
-      ]
-    },
-    "gitreleasemanager.tool": {
-      "version": "0.8.0",
-      "commands": [
-        "dotnet-gitreleasemanager"
-      ]
-    },
-    "codecov.tool": {
-      "version": "1.8.0",
-      "commands": [
-        "codecov"
-      ]
+    "version": 1,
+    "isRoot": true,
+    "tools": {
+        "nukeeper": {
+            "version": "0.26.0",
+            "commands": ["nukeeper"]
+        },
+        "dotnet-outdated": {
+            "version": "2.8.0",
+            "commands": ["dotnet-outdated"]
+        },
+        "gitversion.tool": {
+            "version": "5.1.3",
+            "commands": ["dotnet-gitversion"]
+        },
+        "dotnet-reportgenerator-globaltool": {
+            "version": "4.4.0",
+            "commands": ["reportgenerator"]
+        },
+        "nuke.globaltool": {
+            "version": "0.23.4",
+            "commands": ["nuke"]
+        },
+        "gitreleasemanager.tool": {
+            "version": "0.9.0",
+            "commands": ["dotnet-gitreleasemanager"]
+        },
+        "codecov.tool": {
+            "version": "1.9.0",
+            "commands": ["codecov"]
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/Directory.Build.props b/Directory.Build.props
index e5798b0..a8b961c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,7 @@
         <PackageTags>meta;rocket surgery;rocket surgeons;rsg;rocket surgeons guild</PackageTags>
         <LangVersion>8.0</LangVersion>
         <Nullable>enable</Nullable>
+        <LegacySupportPackagesProps>Packages.support.props</LegacySupportPackagesProps>
     </PropertyGroup>
     <ItemGroup>
         <None Include="$(MSBuildThisFileDirectory)/.tmp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.tmp/packageicon.png')" Pack="true" PackagePath="/images/" Visible="false" />
diff --git a/Packages.props b/Packages.props
index 17d0457..73a2311 100644
--- a/Packages.props
+++ b/Packages.props
@@ -17,7 +17,7 @@
     <PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.1" />
     <PackageReference Update="Nuke.Common" Version="0.23.4" />
     <PackageReference Update="ReportGenerator" Version="4.4.0" />
-    <PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.10.1" />
+    <PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.11.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="BenchMarkDotNet" Version="0.12.0" />
@@ -25,8 +25,8 @@
   <ItemGroup>
     <PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="3.3.0" />
     <PackageReference Update="Bogus" Version="28.4.4" />
-    <PackageReference Update="coverlet.collector" Version="1.1.0" />
-    <PackageReference Update="coverlet.msbuild" Version="2.7.0" />
+    <PackageReference Update="coverlet.collector" Version="1.2.0" />
+    <PackageReference Update="coverlet.msbuild" Version="2.8.0" />
     <PackageReference Update="FakeItEasy" Version="5.5.0" />
     <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="5.5.0" />
     <PackageReference Update="FluentAssertions" Version="5.10.0" />
@@ -37,4 +37,5 @@
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)/$(LegacySupportPackagesProps)" Condition="Exists('$(MSBuildThisFileDirectory)/$(LegacySupportPackagesProps)')" />
 </Project>
\ No newline at end of file
diff --git a/Packages.support.props b/Packages.support.props
new file mode 100644
index 0000000..0c98d16
--- /dev/null
+++ b/Packages.support.props
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+</Project>
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2b103bd..61a178d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,66 +1,66 @@
 trigger:
-  batch: true
-  branches:
-    include:
-      - master
-      - refs/tags/*
-  paths:
-    exclude:
-    - '**/*.md'
-    - '.appveyor.yml'
-    - '.codecov.yml'
-    - 'GitVersion.yml'
-    - 'GitReleaseManager.yaml'
-    - .vscode/*
-    - .git*
-    - .editorconfig
-    - .nuke
-    - LICENSE
+    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.11.1
-      endpoint: github
+    repositories:
+        - repository: rsg
+          type: github
+          name: RocketSurgeonsGuild/AzureDevopsTemplates
+          ref: refs/tags/v0.11.1
+          endpoint: github
 
 variables:
-  - 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: '6fb82bba-711d-4736-85be-1e7e04ec6033'
-  - group: rsg-bot
+    - 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: '6fb82bba-711d-4736-85be-1e7e04ec6033'
+    - group: rsg-bot
 
 jobs:
-  - template: pipeline/nuke.yml@rsg
-    parameters:
-      AuthNuGetFeeds:
-        - name: RocketSurgeonsGuild
-          source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
-          username: $(GitHub.UserName)
-          password: $(GitHub.Token)
-      Configuration: $(Configuration)
-      Verbosity: $(Verbosity)
-      GitHub: true
-      GitHubAuthVariableGroup: rsg-bot
-      GitHubPackages: true
-      MyGetPackages: false
-      DotNetSdk:
-        - "2.x"
-        - "3.x"
-      NuGetVersion: "5.3.1"
+    - template: pipeline/nuke.yml@rsg
+      parameters:
+          AuthNuGetFeeds:
+              - name: RocketSurgeonsGuild
+                source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
+                username: $(GitHub.UserName)
+                password: $(GitHub.Token)
+          Configuration: $(Configuration)
+          Verbosity: $(Verbosity)
+          GitHub: true
+          GitHubAuthVariableGroup: rsg-bot
+          GitHubPackages: true
+          MyGetPackages: false
+          DotNetSdk:
+              - '2.x'
+              - '3.x'
+          NuGetVersion: '5.4.0'
diff --git a/test/Meta.Core.Tests/Rocket.Surgery.Meta.Core.Tests.csproj b/test/Meta.Core.Tests/Rocket.Surgery.Meta.Core.Tests.csproj
index ac85d8f..3f97047 100644
--- a/test/Meta.Core.Tests/Rocket.Surgery.Meta.Core.Tests.csproj
+++ b/test/Meta.Core.Tests/Rocket.Surgery.Meta.Core.Tests.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
         <!-- <PackageReference Include="Rocket.Surgery.AspNetCore.Hosting.Autofac" /> -->
     </ItemGroup>
 </Project>