From 09b618740a8ccf07464fcdf6e40fc0d780222cf0 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 14:46:04 +0100
Subject: [PATCH 1/7] Use Ubuntu for coverage. Touch #1376

---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0e093a8347..1422606a6d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,7 +18,7 @@ jobs:
                       framework: netcoreapp3.1
                       runtime: -x64
                       codecov: false
-                    - os: windows-latest
+                    - os: ubuntu-latest
                       framework: netcoreapp3.1
                       runtime: -x64
                       codecov: true

From 7621fabb689fa1ae44a35005550084bd1d340ad2 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 14:57:54 +0100
Subject: [PATCH 2/7] Enable windows netcore 3.1

---
 .github/workflows/build-and-test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1422606a6d..c8f3997946 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -17,11 +17,11 @@ jobs:
                     - os: ubuntu-latest
                       framework: netcoreapp3.1
                       runtime: -x64
-                      codecov: false
-                    - os: ubuntu-latest
+                      codecov: true
+                    - os: windows-latest
                       framework: netcoreapp3.1
                       runtime: -x64
-                      codecov: true
+                      codecov: false
                     - os: windows-latest
                       framework: netcoreapp2.1
                       runtime: -x64

From 8a7587ae6294a4153634d0ad2935d48643debd9d Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 15:31:51 +0100
Subject: [PATCH 3/7] Try bumping SDK

---
 tests/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index e9e93a855f..acdf684328 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -31,7 +31,7 @@
     <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All"/>
     <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.15.5" />
     <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200116-01" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Update="Moq" Version="4.14.5" />
     <PackageReference Update="Pfim" Version="0.9.1" />
     <PackageReference Update="SharpZipLib" Version="1.2.0" />

From 699c3719150ecb900beff928a8aa7a1f15ef8e61 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 16:48:06 +0100
Subject: [PATCH 4/7] Update deterministic workaround

---
 Directory.Build.targets     |  2 +-
 src/Directory.Build.targets | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4e7ab9e6b7..5d27adc652 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -18,7 +18,7 @@
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
     <!--Global Dependencies-->
-    <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.3.1" />
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.7.0" />
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
     
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index d1875262d3..9b8be05b56 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -21,16 +21,25 @@
   </PropertyGroup>
 
   <!-- Workaround for running Coverlet with Determenistic builds -->
-  <!-- https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/DeterministicBuild.md -->
+  <PropertyGroup>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
+  <ItemGroup>
+    <SourceRoot Include="$(NuGetPackageRoot)" />
+  </ItemGroup>
+
   <Target Name="CoverletGetPathMap"
-            DependsOnTargets="InitializeSourceRootMappedPaths"
-            Returns="@(_LocalTopLevelSourceRoot)"
-            Condition="'$(DeterministicSourcePaths)' == 'true'">
+          DependsOnTargets="InitializeSourceRootMappedPaths"
+          Returns="@(_LocalTopLevelSourceRoot)"
+          Condition="'$(DeterministicSourcePaths)' == 'true'">
     <ItemGroup>
       <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
     </ItemGroup>
   </Target>
-  
+
   <ItemDefinitionGroup>
     <InternalsVisibleTo>
       <Visible>false</Visible>
@@ -62,7 +71,7 @@
   <!-- Empty target so that `dotnet test` will work on the solution -->
   <!-- https://github.com/Microsoft/vstest/issues/411 -->
   <Target Name="VSTest" Condition="'$(IsTestProject)' == 'true'"/>
-  
+
   <ItemGroup>
     <!--Shared config files that have to exist at root level.-->
     <ConfigFilesToCopy Include="..\..\shared-infrastructure\.editorconfig;..\..\shared-infrastructure\.gitattributes" />
@@ -74,7 +83,7 @@
           SkipUnchangedFiles = "true"
           DestinationFolder="..\..\" />
   </Target>
-  
+
   <!-- Allows regenerating T4-generated files at build time using MsBuild -->
   <!-- Enable on Windows OS to build all T4 templates. TODO: XPlat
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TextTemplating\Microsoft.TextTemplating.targets" />
@@ -82,5 +91,5 @@
     <TransformOnBuild>true</TransformOnBuild>
   </PropertyGroup>
   -->
-  
+
 </Project>

From c90150b3fbc04db5e01ee9317a7d47d9a2428d29 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 17:03:39 +0100
Subject: [PATCH 5/7] Revert SDK bump

---
 Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5d27adc652..4e7ab9e6b7 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -18,7 +18,7 @@
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
     <!--Global Dependencies-->
-    <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.7.0" />
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.3.1" />
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
     

From 1578f307b9903c671ca5a39d70a5dc6a8c83f23f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 18:06:51 +0100
Subject: [PATCH 6/7] Use coverlet nightlies

---
 Directory.Build.props         | 1 +
 tests/Directory.Build.targets | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0f9c5bdde2..c4610d0ed3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -120,6 +120,7 @@
       https://api.nuget.org/v3/index.json;
       <!-- Contains RemoteExecutor. Taken from: https://github.com/dotnet/runtime/blob/master/NuGet.config -->
       https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
+      https://www.myget.org/F/coverlet-dev/api/v3/index.json;
     </RestoreSources>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index acdf684328..9ee4e2a2e2 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -28,7 +28,7 @@
     <PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" Condition="'$(OS)' == 'Windows_NT'" />    
     <PackageReference Update="Colourful" Version="2.0.5" />
-    <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All"/>
+    <PackageReference Update="coverlet.collector" Version="1.3.1-preview.27.gdd2237a3be" PrivateAssets="All"/>
     <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.15.5" />
     <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />

From fdca78787584f2c0d5d0114626f433ecb4040527 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 12 Oct 2020 19:07:42 +0100
Subject: [PATCH 7/7] Update Directory.Build.targets

---
 tests/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 9ee4e2a2e2..335f3d106c 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -31,7 +31,7 @@
     <PackageReference Update="coverlet.collector" Version="1.3.1-preview.27.gdd2237a3be" PrivateAssets="All"/>
     <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.15.5" />
     <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Update="Moq" Version="4.14.5" />
     <PackageReference Update="Pfim" Version="0.9.1" />
     <PackageReference Update="SharpZipLib" Version="1.2.0" />