Merge branch 'main' into patch-1

xamarin · Sep 8, 2022 · bab2fc4 · bab2fc4
2 parents ffcd2e3 + 41169c1
commit bab2fc4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 }
 				}

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