Merge branch 'master' into dev/7.0.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,6 @@
-## Fixes #
-<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged -->
+## Fixes #<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged -->
+
+<!-- Add a brief overview here of the feature/bug & fix -->
 
 ## PR Type
 What kind of change does this PR introduce?
@@ -20,6 +21,7 @@ What kind of change does this PR introduce?
 
 
 ## What is the new behavior?
+<!-- Describe how was this issue resolved or changed? -->
 
 
 ## PR Checklist
@@ -32,9 +34,9 @@ Please check if your PR fulfills the following requirements:
     - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
 - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
 - [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
+- [ ] If new feature, add to [Feature List](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/readme.md#-features)
 - [ ] Contains **NO** breaking changes
 
-
 <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. 
      Please note that breaking changes are likely to be rejected -->
 

.runsettings

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <MSTest>
+	<MaxCpuCount>0</MaxCpuCount>
+    <Parallelize>
+      <Workers>0</Workers>
+      <Scope>ClassLevel</Scope>
+    </Parallelize>
+  </MSTest>
+</RunSettings>

UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
   </ItemGroup>

azure-pipelines.yml

@@ -28,8 +28,16 @@ steps:
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk'
-    version: '3.1.101'
-  displayName: Use .NET Core sdk
+    version: '2.1.202' # This SDK contains .Net Core 2.0.9, which we still need to run some of our .Net Core Tests
+    performMultiLevelLookup: true
+  displayName: Use .NET Core sdk 2
+
+- task: UseDotNet@2
+  inputs:
+    packageType: 'sdk'
+    version: '3.1.200'
+    performMultiLevelLookup: true
+  displayName: Use .NET Core sdk 3
 
 - task: DotNetCoreCLI@2  
   inputs:
@@ -50,7 +58,7 @@ steps:
 - task: PublishTestResults@2
   inputs:
     testResultsFormat: 'VSTest'
-    testResultsFiles: '**/VsTestResults.xml'
+    testResultsFiles: '**/VsTestResults*.trx'
   displayName: Publish Test Results
   condition: succeededOrFailed()
 

build/build.cake

@@ -265,22 +265,33 @@ public string getMSTestAdapterPath(){
 Task("Test")
 	.Description("Runs all Tests")
 	.IsDependentOn("Build")
-	.Does(() =>
+    .Does(() =>
 {
 	var vswhere = VSWhereLatest(new VSWhereLatestSettings
 	{
 		IncludePrerelease = false
 	});
-	
+
 	var testSettings = new VSTestSettings
 	{
 	    ToolPath = vswhere + "/Common7/IDE/CommonExtensions/Microsoft/TestWindow/vstest.console.exe",
 		TestAdapterPath = getMSTestAdapterPath(),
-        ArgumentCustomization = arg => arg.Append("/logger:trx;LogFileName=VsTestResults.xml /framework:FrameworkUap10"),
+        ArgumentCustomization = arg => arg.Append("/logger:trx;LogFileName=VsTestResultsUwp.trx /framework:FrameworkUap10"),
 	};
 
-	VSTest(baseDir + "/**/UnitTests.*.appxrecipe", testSettings);
-});
+	VSTest(baseDir + "/**/Release/**/UnitTests.*.appxrecipe", testSettings);
+}).DoesForEach(GetFiles(baseDir + "/**/UnitTests.*.NetCore.csproj"), (file) => 
+{
+    var testSettings = new DotNetCoreTestSettings
+	{
+		Configuration = "Release",
+		NoBuild = true,
+		Logger = "trx;LogFilePrefix=VsTestResults",
+		Verbosity = DotNetCoreVerbosity.Normal,
+		ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings"),
+	};
+    DotNetCoreTest(file.FullPath, testSettings);
+}).DeferOnError();