From 2bfab96443a28bf7cf1fd57bbbf9154954b729ae Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 10:22:39 -0700 Subject: [PATCH 01/16] Disable .net native for managed unit tests --- .../Microsoft.ReactNative.Managed.UnitTests.csproj | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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..4410c727dde 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 @@ -87,7 +89,7 @@ false prompt true - true + false true @@ -99,6 +101,7 @@ false prompt true + false bin\x64\Release\ @@ -110,7 +113,7 @@ false prompt true - true + false PackageReference From 8f75b6e050397cd81d8c06c01c5bc7eaa656b442 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 10:23:49 -0700 Subject: [PATCH 02/16] Change files --- ...ative-windows-2020-04-08-10-23-49-mangedunittests.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2020-04-08-10-23-49-mangedunittests.json 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 From a958e7116ac938285372f9eda3853ccaccf4fee8 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 10:29:01 -0700 Subject: [PATCH 03/16] Enable managed unit tests in ci loop --- .ado/windows-vs-pr.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 7bf9a3ef042..30e2d733b8e 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -75,15 +75,13 @@ jobs: project: vnext/ReactWindows-Universal.sln - task: VSTest@2 - displayName: Run Universal Unit Tests + displayName: Run Native Universal Unit Tests 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 @@ -93,6 +91,21 @@ jobs: collectDumpOn: onAbortOnly vsTestVersion: latest condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm'))) + + - task: VSTest@2 + displayName: Run Managed Universal Unit Tests + timeoutInMinutes: 5 # Set smaller timeout , due to hangs + inputs: + testSelector: testAssemblies + testAssemblyVer2: | + Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe + searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) + runTestsInIsolation: true + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + publishRunAttachments: true + collectDumpOn: onAbortOnly + vsTestVersion: latest - template: templates/publish-build-artifacts-for-nuget.yml parameters: From f6c0e250633a170aa901226e37d2ee58df676bb8 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 11:10:32 -0700 Subject: [PATCH 04/16] re-merge unit test tasks, can't run arm anyway --- .ado/windows-vs-pr.yml | 20 +++----------------- vnext/ReactWindows-Universal.sln | 8 -------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 30e2d733b8e..7919cb3d3af 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -75,13 +75,14 @@ jobs: project: vnext/ReactWindows-Universal.sln - task: VSTest@2 - displayName: Run Native Universal Unit Tests - timeoutInMinutes: 5 # Set smaller timeout , due to hangs + displayName: Run Universal Unit Tests + timeoutInMinutes: 10 # Set smaller timeout , due to hangs inputs: testSelector: testAssemblies testAssemblyVer2: | Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.exe Mso.UnitTests/Mso.UnitTests.exe + Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe pathtoCustomTestAdapters: $(GoogleTestAdapterPath) searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) runTestsInIsolation: true @@ -91,21 +92,6 @@ jobs: collectDumpOn: onAbortOnly vsTestVersion: latest condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm'))) - - - task: VSTest@2 - displayName: Run Managed Universal Unit Tests - timeoutInMinutes: 5 # Set smaller timeout , due to hangs - inputs: - testSelector: testAssemblies - testAssemblyVer2: | - Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe - searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - runTestsInIsolation: true - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - publishRunAttachments: true - collectDumpOn: onAbortOnly - vsTestVersion: latest - template: templates/publish-build-artifacts-for-nuget.yml parameters: 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 From 1da22e663be736cfff7440fe50c91a4a04109c50 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 12:43:27 -0700 Subject: [PATCH 05/16] Remove prefer 32bit from 64bit flavors --- .../Microsoft.ReactNative.Managed.UnitTests.csproj | 4 ---- 1 file changed, 4 deletions(-) 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 4410c727dde..abd3711f882 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj @@ -76,7 +76,6 @@ ARM64 false prompt - true false @@ -88,7 +87,6 @@ ARM64 false prompt - true false @@ -100,7 +98,6 @@ x64 false prompt - true false @@ -112,7 +109,6 @@ x64 false prompt - true false From 5399de47f23fc98ab22f9b04f84745ad9de5f321 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 12:58:06 -0700 Subject: [PATCH 06/16] Update mstest dependencies --- .../Microsoft.ReactNative.Managed.UnitTests.csproj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 abd3711f882..7f6a06e7c41 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj @@ -156,10 +156,13 @@ 6.2.9 - 1.4.0 + 2.1.1 - 1.4.0 + 2.1.1 + + + 16.5.0 From 241da60c973abae1febc29f1e9d2305b5b2cd2ef Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 14:21:59 -0700 Subject: [PATCH 07/16] Managed tests are separate again --- .ado/windows-vs-pr.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 7919cb3d3af..3d1fcc153cb 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -75,14 +75,13 @@ jobs: project: vnext/ReactWindows-Universal.sln - task: VSTest@2 - displayName: Run Universal Unit Tests - timeoutInMinutes: 10 # Set smaller timeout , due to hangs + 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 - Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe pathtoCustomTestAdapters: $(GoogleTestAdapterPath) searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) runTestsInIsolation: true @@ -93,6 +92,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.exe + 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')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) + - template: templates/publish-build-artifacts-for-nuget.yml parameters: artifactName: ReactWindows From 10a10a1581fdf35d7bd60f01393685457e8e042a Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 14:23:37 -0700 Subject: [PATCH 08/16] Add comment --- .ado/windows-vs-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 3d1fcc153cb..477a2a459ad 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -106,7 +106,7 @@ jobs: publishRunAttachments: true collectDumpOn: onAbortOnly vsTestVersion: latest - condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) + condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) # Only running on x86 Debug due to https://github.com/microsoft/react-native-windows/issues/4533 - template: templates/publish-build-artifacts-for-nuget.yml parameters: From d1229429a233b4661739105459ec848770ae41e8 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 14:53:17 -0700 Subject: [PATCH 09/16] Add test adapter path --- .ado/windows-vs-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 477a2a459ad..70946ce7f0e 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -99,6 +99,7 @@ jobs: testSelector: testAssemblies testAssemblyVer2: | Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe + pathtoCustomTestAdapters: $(GoogleTestAdapterPath) searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) runTestsInIsolation: true platform: $(BuildPlatform) From a9c325ff26b32ff4573b6d1013096f55055fa970 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 15:33:13 -0700 Subject: [PATCH 10/16] x86 debug again --- .ado/windows-vs-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 70946ce7f0e..dbb43b04c59 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -99,14 +99,14 @@ jobs: testSelector: testAssemblies testAssemblyVer2: | Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe - pathtoCustomTestAdapters: $(GoogleTestAdapterPath) searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) runTestsInIsolation: true platform: $(BuildPlatform) configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: latest + vsTestVersion: toolsInstaller + otheConsoleOptions: /framework:FrameworkUap10 condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) # Only running on x86 Debug due to https://github.com/microsoft/react-native-windows/issues/4533 - template: templates/publish-build-artifacts-for-nuget.yml From c62163e1e6160ee575ddbafdd34502de8e1bf3fd Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 16:05:41 -0700 Subject: [PATCH 11/16] Update test adapter folder --- .ado/windows-vs-pr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index dbb43b04c59..2b0a590723b 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -89,7 +89,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: latest + vsTestVersion: toolsInstaller condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm'))) - task: VSTest@2 @@ -99,6 +99,8 @@ jobs: testSelector: testAssemblies testAssemblyVer2: | Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe + pathtoCustomTestAdapters: | + $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration)/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/ searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) runTestsInIsolation: true platform: $(BuildPlatform) From 1e9ba2021c9d9e9bcfdaf2511195d8332db6d818 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 8 Apr 2020 16:43:34 -0700 Subject: [PATCH 12/16] Try again --- .ado/windows-vs-pr.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 2b0a590723b..f7a805e628b 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -99,8 +99,6 @@ jobs: testSelector: testAssemblies testAssemblyVer2: | Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe - pathtoCustomTestAdapters: | - $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration)/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/ searchFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) runTestsInIsolation: true platform: $(BuildPlatform) @@ -108,7 +106,7 @@ jobs: publishRunAttachments: true collectDumpOn: onAbortOnly vsTestVersion: toolsInstaller - otheConsoleOptions: /framework:FrameworkUap10 + otherConsoleOptions: /framework:FrameworkUap10 condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) # Only running on x86 Debug due to https://github.com/microsoft/react-native-windows/issues/4533 - template: templates/publish-build-artifacts-for-nuget.yml From fe5560d3a0cb42ce13a0cbf3e2314500932e52e2 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Apr 2020 11:59:50 -0700 Subject: [PATCH 13/16] remove frameworkuap10 --- .ado/windows-vs-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 2735ae217ea..4c1bce55802 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -107,7 +107,6 @@ jobs: publishRunAttachments: true collectDumpOn: onAbortOnly vsTestVersion: toolsInstaller - otherConsoleOptions: /framework:FrameworkUap10 condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) # Only running on x86 Debug due to https://github.com/microsoft/react-native-windows/issues/4533 - template: templates/publish-build-artifacts-for-nuget.yml From f760778ab6ab177dae3fbfb78ba08bfd9985a31e Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Apr 2020 12:42:34 -0700 Subject: [PATCH 14/16] Switch to appxrecipie --- .ado/windows-vs-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 4c1bce55802..819685d5143 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -99,7 +99,7 @@ jobs: inputs: testSelector: testAssemblies testAssemblyVer2: | - Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.exe + 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) @@ -107,7 +107,7 @@ jobs: publishRunAttachments: true collectDumpOn: onAbortOnly vsTestVersion: toolsInstaller - condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm')), eq(variables.BuildPlatform, 'x86'), eq(variables.BuildConfiguration, 'Debug')) # Only running on x86 Debug due to https://github.com/microsoft/react-native-windows/issues/4533 + condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm'))) - template: templates/publish-build-artifacts-for-nuget.yml parameters: From 116307c513e2c5bf51b4dec9cdef764110f7afca Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Apr 2020 13:36:27 -0700 Subject: [PATCH 15/16] Try to switch to installed version of vstest --- .ado/windows-vs-pr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 819685d5143..5647ab870ec 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -65,10 +65,10 @@ jobs: clean: false submodules: false - - task: VisualStudioTestPlatformInstaller@1 - inputs: - testPlatformVersion: latestStable - condition: not(startsWith(variables.BuildPlatform, 'arm')) + # - task: VisualStudioTestPlatformInstaller@1 + # inputs: + # testPlatformVersion: latestStable + # condition: not(startsWith(variables.BuildPlatform, 'arm')) - template: templates/build-rnw.yml parameters: @@ -90,7 +90,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm'))) - task: VSTest@2 @@ -106,7 +106,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest condition: and(succeeded(), not(startsWith(variables.BuildPlatform, 'arm'))) - template: templates/publish-build-artifacts-for-nuget.yml From d3f4423a25f373f4fa81c9fb26cdc4e36b833fc3 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Apr 2020 14:02:27 -0700 Subject: [PATCH 16/16] Remove installer task --- .ado/windows-vs-pr.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 5647ab870ec..c2ba6407581 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -65,11 +65,6 @@ 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