diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
index 7c8636ad4a8..c2ba6407581 100644
--- a/.ado/windows-vs-pr.yml
+++ b/.ado/windows-vs-pr.yml
@@ -65,26 +65,19 @@ jobs:
clean: false
submodules: false
- - task: VisualStudioTestPlatformInstaller@1
- inputs:
- testPlatformVersion: latestStable
- condition: not(startsWith(variables.BuildPlatform, 'arm'))
-
- template: templates/build-rnw.yml
parameters:
yarnBuildCmd: build
project: vnext/Microsoft.ReactNative.sln
- task: VSTest@2
- displayName: Run Universal Unit Tests
+ displayName: Run Universal Unit Tests (Native)
timeoutInMinutes: 5 # Set smaller timeout , due to hangs
inputs:
testSelector: testAssemblies
testAssemblyVer2: |
Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.exe
Mso.UnitTests/Mso.UnitTests.exe
- # Managed unit tests crash with .net native https://github.com/Microsoft/vstest/issues/3838
- # Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe
pathtoCustomTestAdapters: $(GoogleTestAdapterPath)
searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration)
runTestsInIsolation: true
@@ -95,6 +88,22 @@ jobs:
vsTestVersion: latest
condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')))
+ - task: VSTest@2
+ displayName: Run Universal Unit Tests (Managed)
+ timeoutInMinutes: 5 # Set smaller timeout , due to hangs
+ inputs:
+ testSelector: testAssemblies
+ testAssemblyVer2: |
+ Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.build.appxrecipe
+ searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration)
+ runTestsInIsolation: true
+ platform: $(BuildPlatform)
+ configuration: $(BuildConfiguration)
+ publishRunAttachments: true
+ collectDumpOn: onAbortOnly
+ vsTestVersion: latest
+ condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')))
+
- template: templates/publish-build-artifacts-for-nuget.yml
parameters:
artifactName: ReactWindows
diff --git a/change/react-native-windows-2020-04-08-10-23-49-mangedunittests.json b/change/react-native-windows-2020-04-08-10-23-49-mangedunittests.json
new file mode 100644
index 00000000000..a5ca70c8b58
--- /dev/null
+++ b/change/react-native-windows-2020-04-08-10-23-49-mangedunittests.json
@@ -0,0 +1,8 @@
+{
+ "type": "prerelease",
+ "comment": "Enable managed unit tests",
+ "packageName": "react-native-windows",
+ "email": "jthysell@microsoft.com",
+ "dependentChangeType": "patch",
+ "date": "2020-04-08T17:23:49.253Z"
+}
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj
index dc3275b866a..7f6a06e7c41 100644
--- a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj
@@ -29,6 +29,7 @@
false
prompt
true
+ false
bin\x86\Release\
@@ -40,7 +41,7 @@
false
prompt
true
- true
+ false
true
@@ -52,6 +53,7 @@
false
prompt
true
+ false
bin\ARM\Release\
@@ -63,7 +65,7 @@
false
prompt
true
- true
+ false
true
@@ -74,7 +76,6 @@
ARM64
false
prompt
- true
false
@@ -86,8 +87,7 @@
ARM64
false
prompt
- true
- true
+ false
true
@@ -98,7 +98,7 @@
x64
false
prompt
- true
+ false
bin\x64\Release\
@@ -109,8 +109,7 @@
x64
false
prompt
- true
- true
+ false
PackageReference
@@ -157,10 +156,13 @@
6.2.9
- 1.4.0
+ 2.1.1
- 1.4.0
+ 2.1.1
+
+
+ 16.5.0
diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln
index 9f8665cf8fd..f9ae2a965b2 100644
--- a/vnext/ReactWindows-Universal.sln
+++ b/vnext/ReactWindows-Universal.sln
@@ -315,11 +315,7 @@ Global
{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32
{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.ActiveCfg = Debug|ARM
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Build.0 = Debug|ARM
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Deploy.0 = Debug|ARM
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Build.0 = Debug|ARM64
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Deploy.0 = Debug|ARM64
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.ActiveCfg = Debug|x64
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Deploy.0 = Debug|x64
@@ -327,11 +323,7 @@ Global
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Build.0 = Debug|x86
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Deploy.0 = Debug|x86
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.ActiveCfg = Release|ARM
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Build.0 = Release|ARM
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Deploy.0 = Release|ARM
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.ActiveCfg = Release|ARM64
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Build.0 = Release|ARM64
- {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Deploy.0 = Release|ARM64
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.ActiveCfg = Release|x64
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64
{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Deploy.0 = Release|x64