From 55bcbc0d55d524aa159b50df62124a2fc931e421 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 8 Sep 2022 15:56:44 +0200
Subject: [PATCH 1/2] Update build pipeline to remove obsoletes (#2042)

* Update build.cake

* Update Tests.csproj

* Update build.cake

* Updates

* Back to square 1

* Update azure-pipelines.yml

* Update azure-pipelines.yml

* Update build.cake
---
 DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj | 1 -
 azure-pipelines.yml                                      | 2 ++
 build.cake                                               | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
index 903c8db25..6d10aeec1 100644
--- a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
+++ b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
@@ -27,7 +27,6 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.devices" Version="2.5.25" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 171fbb91a..e45c26cf6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,6 +34,8 @@ stages:
     jobs:
     - template: .ci/build.v1.yml@components
       parameters:
+        dotnet: '3.1.415'
+        dotnetStable: '3.1.415'
         ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:    # The AzurePipelines-EO pool is only available in DevDiv
           windowsAgentPoolName: AzurePipelines-EO
           windowsImage: ''  # Override the 'windows-latest' default settings
diff --git a/build.cake b/build.cake
index e4d2d4a09..e3dd04ca2 100644
--- a/build.cake
+++ b/build.cake
@@ -47,9 +47,9 @@ Task("tests")
 
 	foreach (var csproj in GetFiles("./Tests/**/*.csproj")) {
 		try {
-			DotNetCoreTest(csproj.FullPath, new DotNetCoreTestSettings {
+			DotNetTest(csproj.FullPath, new DotNetTestSettings {
 				Configuration = "Release",
-				Logger = $"trx;LogFileName={csproj.GetFilenameWithoutExtension()}.trx",
+				Loggers = new [] { $"trx;LogFileName={csproj.GetFilenameWithoutExtension()}.trx" },
 				EnvironmentVariables = new Dictionary<string, string> {
 					{ "RestoreConfigFile", RESTORE_CONFIG }
 				}

From 41169c119c38e4663a98e69368b822c8b65f158e Mon Sep 17 00:00:00 2001
From: Shawn Wang <shawnwang@microsoft.com>
Date: Thu, 8 Sep 2022 23:09:49 +0800
Subject: [PATCH 2/2] [SEO][Rollout Monikered Canonical]Add URL moniker (#2039)

Enable build config to generate canonical URL with moniker

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
---
 docs/en/docfx.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/docfx.json b/docs/en/docfx.json
index 45021f037..8120b3523 100644
--- a/docs/en/docfx.json
+++ b/docs/en/docfx.json
@@ -59,6 +59,7 @@
       }
     },
     "template": [],
+    "isCanonicalUrlWithMoniker": true,
     "dest": "_site",
     "lruSize": 0
   }