From 857f86bb668dbd32ac532464ac89a3d62b16fc98 Mon Sep 17 00:00:00 2001
From: David Driscoll <david.driscoll@gmail.com>
Date: Sat, 5 Jan 2019 13:38:37 -0500
Subject: [PATCH] Added support for new system.reactive version

---
 Common.Build.targets                          | 30 +++++++++----------
 azure-pipelines.yml                           | 19 +++++++++---
 cakefile.cake                                 |  2 +-
 src/Directory.Build.props                     |  6 ++--
 test/Directory.Build.targets                  |  2 +-
 .../Rocket.Surgery.Extensions.Tests.csproj    |  2 +-
 tools/packages.config                         |  2 +-
 7 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Common.Build.targets b/Common.Build.targets
index daf861104..f2902c865 100644
--- a/Common.Build.targets
+++ b/Common.Build.targets
@@ -2,30 +2,30 @@
     <ItemGroup>
         <PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.0" />
         <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
-        <PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
+        <PackageReference Update="Newtonsoft.Json" Version="12.0.1" />
         <PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
         <PackageReference Update="System.Interactive.Async.Providers" Version="3.2.0" />
         <PackageReference Update="System.Interactive.Providers" Version="3.2.0" />
-        <PackageReference Update="System.Reactive" Version="4.1.1" />
-        <PackageReference Update="System.Reactive.Observable.Aliases" Version="4.1.1" />
+        <PackageReference Update="System.Reactive" Version="4.1.2" />
+        <PackageReference Update="System.Reactive.Observable.Aliases" Version="4.1.2" />
         <PackageReference Update="System.Reflection.Emit.Lightweight" Version="4.3.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Update="Rocket.Surgery.Build.Metadata" Version="3.0.0" PrivateAssets="All" />
-        <PackageReference Update="SourceLink.Copy.PdbFiles" Version="2.8.3" PrivateAssets="All" />
-        <PackageReference Update="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
+        <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
+        <PackageReference Update="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
-        <PackageReference Update="Bogus" Version="24.3.0" />
-        <PackageReference Update="coverlet.msbuild" Version="2.3.0" />
-        <PackageReference Update="FakeItEasy" Version="4.9.1" />
-        <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="4.9.1" />
-        <PackageReference Update="FluentAssertions" Version="5.4.2" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-        <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="0.13.0" />
-        <PackageReference Update="xunit" Version="2.4.0" />
-        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Update="XunitXml.TestLogger" Version="2.0.0" />
+        <PackageReference Update="Bogus" Version="25.0.2" />
+        <PackageReference Update="coverlet.msbuild" Version="2.5.0" />
+        <PackageReference Update="FakeItEasy" Version="4.9.2" />
+        <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="4.9.2" />
+        <PackageReference Update="FluentAssertions" Version="5.5.3" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+        <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="0.16.1" />
+        <PackageReference Update="xunit" Version="2.4.1" />
+        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
+        <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
     </ItemGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2e01a5079..9b87d3482 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,17 +1,28 @@
+trigger:
+  branches:
+    include:
+      - master
+      - refs/tags/*
+pr:
+  autoCancel: true
+  branches:
+    include:
+      - master
+
 resources:
   repositories:
     - repository: rsg
       type: github
       name: RocketSurgeonsGuild/AzureDevopsTemplates
-      ref: refs/tags/v0.2.7
+      ref: refs/tags/v0.3.1
       endpoint: github
 
 variables:
   Configuration: Release
   Verbosity: Normal
-  DotNetVersion: "2.1.403"
-  CakeVersion: "0.30.0"
-  NuGetVersion: '4.7.1'
+  DotNetVersion: "2.2.101"
+  CakeVersion: "0.32.1"
+  NuGetVersion: "4.9.2"
   Coverage: "$(Agent.BuildDirectory)/c"
   VstsCoverage: "$(Coverage)"
   Artifacts: $(Build.ArtifactStagingDirectory)
diff --git a/cakefile.cake b/cakefile.cake
index d486ffdf6..20aca9534 100644
--- a/cakefile.cake
+++ b/cakefile.cake
@@ -1,4 +1,4 @@
-#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.8.6";
+#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.2";
 
 Task("Default")
     .IsDependentOn("dotnetcore");
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 04f8314de..1400dfb80 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,11 +3,13 @@
     <PropertyGroup>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <IsPackable>true</IsPackable>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <RootNamespace>$(MSBuildProjectName.Replace('.Extensions', ''))</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Rocket.Surgery.Build.Metadata" />
-        <PackageReference Include="SourceLink.Create.CommandLine" />
-		<PackageReference Include="SourceLink.Copy.PdbFiles" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" />
+		<PackageReference Include="Microsoft.SourceLink.Vsts.Git" />
     </ItemGroup>
 </Project>
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index 746f69957..4a7a33913 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -13,4 +13,4 @@
         <PackageReference Include="XunitXml.TestLogger" />
     </ItemGroup>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj b/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj
index 9c2c7ee9c..4b42a02ec 100644
--- a/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj
+++ b/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp2.2</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Extensions\Rocket.Surgery.Extensions.csproj" />
diff --git a/tools/packages.config b/tools/packages.config
index 05018882e..f27ab48fd 100644
--- a/tools/packages.config
+++ b/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.30.0" />
+    <package id="Cake" version="0.32.1" />
 </packages>