CPP runner under .NET (Core)

scripts/build.ps1

@@ -483,6 +483,26 @@ function Publish-Package
  Write-Verbose "Copy-Item $newtonsoft $coreCLR20PackageDir -Force"
  Copy-Item $newtonsoft $coreCLR20PackageDir -Force
 
+ # Copy .NET Standard CPP Test adapter
+ New-Item "$fullCLRPackage451Dir\TestHost" -ItemType Directory -Force | Out-Null 
+ $fullCLRTestHostDir = "$fullCLRPackage451Dir\TestHost"
+
+ $testPlatformRemoteExternalsVersion = ([xml](Get-Content "$env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props")).Project.PropertyGroup.TestPlatformRemoteExternalsVersion
+ $testPlatformRemoteExternalsSourceDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Remote\$testPlatformRemoteExternalsVersion\tools\netstandard\Extensions\*"
+ Copy-Item $testPlatformRemoteExternalsSourceDirectory $coreCLR20PackageDir -Force -Recurse
+ Copy-Item $testPlatformRemoteExternalsSourceDirectory $fullCLRTestHostDir -Force -Recurse
+
+ # Copy standalone testhost
+ $standaloneTesthost = Join-Path $env:TP_ROOT_DIR "temp\testhost\*"
+ Copy-Item $standaloneTesthost $coreCLR20PackageDir -Force
+ Copy-Item $testhostCore20PackageDir\testhost.dll $coreCLR20PackageDir -Force
+ Copy-Item $testhostCore20PackageDir\testhost.pdb $coreCLR20PackageDir -Force
+
+ Get-Item "$testhostCore20PackageDir\*" | 
+ Where-Object { $_.Name -notin ("x64", "x86", "win7-x64", "win7-x86", "testhost.deps.json", "testhost.runtimeconfig.json")} | 
+ Copy-Item -Recurse -Destination $fullCLRTestHostDir -Force
+ Copy-Item $standaloneTesthost $fullCLRTestHostDir -Force
+
  # For libraries that are externally published, copy the output into artifacts. These will be signed and packaged independently.
  Copy-PackageItems "Microsoft.TestPlatform.Build"
 

scripts/build/TestPlatform.Dependencies.props

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
  <VSSdkBuildToolsVersion>15.8.3247</VSSdkBuildToolsVersion>
@@ -27,14 +27,17 @@
 
  <ChutzpahAdapterVersion>4.4.12</ChutzpahAdapterVersion>
 
- <NuGetFrameworksVersion>5.0.0</NuGetFrameworksVersion>
+ <!-- This version also needs to be updated in src\package\nuspec\TestPlatform.ObjectModel.nuspec -->
+ <NuGetFrameworksVersion>5.11.0</NuGetFrameworksVersion>
  <ILAsmPackageVersion>5.0.0</ILAsmPackageVersion>
  <JsonNetVersion>9.0.1</JsonNetVersion>
  <MoqVersion>4.8.3</MoqVersion>
 
  <TestPlatformExternalsVersion>17.0.0-previews-4-31630-230</TestPlatformExternalsVersion>
  <!-- <TestPlatformMSDiaVersion>$(TestPlatformExternalsVersion)</TestPlatformMSDiaVersion> -->
  <TestPlatformMSDiaVersion>17.0.0-previews-3-31515-332</TestPlatformMSDiaVersion>
+ <!-- Portable CPP test runner -->
+ <TestPlatformRemoteExternalsVersion>17.1.0-preview-1-31807-420</TestPlatformRemoteExternalsVersion>
 
  <InteropExternalsVersion>17.0.0-preview-2-31223-026</InteropExternalsVersion>
  <MicrosoftFakesVersion>17.0.0-beta.21179.1</MicrosoftFakesVersion>

scripts/verify-nupkgs.ps1

@@ -14,9 +14,9 @@ function Verify-Nuget-Packages($packageDirectory, $version)
  $expectedNumOfFiles = @{
  "Microsoft.CodeCoverage" = 59;
  "Microsoft.NET.Test.Sdk" = 27;
- "Microsoft.TestPlatform" = 478;
+ "Microsoft.TestPlatform" = 599;
  "Microsoft.TestPlatform.Build" = 21;
- "Microsoft.TestPlatform.CLI" = 371;
+ "Microsoft.TestPlatform.CLI" = 404;
  "Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
  "Microsoft.TestPlatform.ObjectModel" = 238;
  "Microsoft.TestPlatform.AdapterUtilities" = 62;

src/Microsoft.TestPlatform.ObjectModel/Architecture.cs

@@ -9,6 +9,7 @@ public enum Architecture
  X86,
  X64,
  ARM,
- AnyCPU
+ AnyCPU,
+ ARM64,
  }
 }

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Unshipped.txt

@@ -1 +1 @@
-
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture

src/Microsoft.TestPlatform.ObjectModel/RunSettings/RunConfiguration.cs

@@ -784,7 +784,8 @@ public static RunConfiguration FromXml(XmlReader reader)
  try
  {
  archType = (Architecture)Enum.Parse(typeof(Architecture), value, true);
- if (archType != Architecture.X64 && archType != Architecture.X86 && archType != Architecture.ARM)
+ // Ensure that the parsed value is actually in the enum, and that Default or AnyCpu are not provided.
+ if (!Enum.IsDefined(typeof(Architecture), archType) || Architecture.Default == archType || Architecture.AnyCPU == archType)
  {
  throw new SettingsException(
  string.Format(