From 5c984ab9ae8b45765b542299b1f1f66c7693ef3c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 2 Oct 2018 11:14:01 -0700 Subject: [PATCH 1/3] Updating submodule(s) WebSockets => 67f2c3149efd03511794ed64726a196ee0b1ab36 [auto-updated: submodules] --- modules/WebSockets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/WebSockets b/modules/WebSockets index c88e5147da..67f2c3149e 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit c88e5147da35c47902b378eefc6b11bb5f7dd46b +Subproject commit 67f2c3149efd03511794ed64726a196ee0b1ab36 From 44a8e0812b0d81029b052888fe13396204a5ed33 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 15:58:07 +0000 Subject: [PATCH 2/3] Updating BuildTools from 2.1.3-rtm-15817 to 2.1.3-rtm-15818 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2c5726ee93..bf8a3bdc01 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15817 -commithash:37649a7c2991b5f9fee5ca3ac3e0c7b567099225 +version:2.1.3-rtm-15818 +commithash:9d11c8c087e0b1fc9f6fd7b0e96379515827794e From 9c37082a747eba843cdff239ca568caf08a07401 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 3 Oct 2018 11:02:59 -0700 Subject: [PATCH 3/3] Add Linux, Node8, and Node10 to test matrix (#1445) - Test both Node8 and Node10 on Windows and Linux - Only test Node8 on MacOS, since the ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS - https://github.com/aspnet/Templating/issues/608 - Move Windows build to "Hosted VS2017" pool which has more agents - We would rather use the "Hosted" pool, but "npm restore" currently fails on agents in this pool - Remove "Preview" from Mac pool name --- .azure/pipelines/e2e-tests.yml | 96 ++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 15 deletions(-) diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml index 528dfd6929..69a3e58755 100644 --- a/.azure/pipelines/e2e-tests.yml +++ b/.azure/pipelines/e2e-tests.yml @@ -2,22 +2,38 @@ trigger: none phases: - phase: Host_Windows queue: - name: DotNetCore-Windows - parallel: 4 + name: Hosted VS2017 + parallel: 8 matrix: - Portable: + Portable_Node8: Test.RuntimeIdentifier: none - SelfContainedWindows: + Node.Version: 8.x + Portable_Node10: + Test.RuntimeIdentifier: none + Node.Version: 10.x + SelfContainedWindows_Node8: Test.RuntimeIdentifier: win-x64 - SelfContainedLinux: + Node.Version: 8.x + SelfContainedWindows_Node10: + Test.RuntimeIdentifier: win-x64 + Node.Version: 10.x + SelfContainedLinux_Node8: Test.RuntimeIdentifier: linux-x64 - SelfContainedMacOs: + Node.Version: 8.x + SelfContainedLinux_Node10: + Test.RuntimeIdentifier: linux-x64 + Node.Version: 10.x + SelfContainedMacOs_Node8: Test.RuntimeIdentifier: osx-x64 + Node.Version: 8.x + SelfContainedMacOs_Node10: + Test.RuntimeIdentifier: osx-x64 + Node.Version: 10.x steps: - task: NodeTool@0 - displayName: Install Node 10.x + displayName: Install Node $(Node.Version) inputs: - versionSpec: 10.x + versionSpec: $(Node.Version) - powershell: | test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true') @@ -30,22 +46,72 @@ phases: testResultsFiles: 'artifacts/logs/**/*.trx' - phase: Host_macOS queue: - name: Hosted macOS Preview + name: Hosted macOS parallel: 4 + # The ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS + # https://github.com/aspnet/Templating/issues/608 matrix: - Portable: + Portable_Node8: Test.RuntimeIdentifier: none - SelfContainedWindows: + Node.Version: 8.x + SelfContainedWindows_Node8: Test.RuntimeIdentifier: win-x64 - SelfContainedLinux: + Node.Version: 8.x + SelfContainedLinux_Node8: Test.RuntimeIdentifier: linux-x64 - SelfContainedMacOs: + Node.Version: 8.x + SelfContainedMacOs_Node8: Test.RuntimeIdentifier: osx-x64 + Node.Version: 8.x steps: - task: NodeTool@0 - displayName: Install Node 8.x + displayName: Install Node $(Node.Version) inputs: - versionSpec: 8.x + versionSpec: $(Node.Version) + - powershell: | + test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES + condition: ne(variables['PB_SkipTests'], 'true') + displayName: Run E2E tests + - task: PublishTestResults@2 + displayName: Publish test results + condition: always() + inputs: + testRunner: vstest + testResultsFiles: 'artifacts/logs/**/*.trx' +- phase: Host_Linux + queue: + name: Hosted Linux Preview + parallel: 8 + matrix: + Portable_Node8: + Test.RuntimeIdentifier: none + Node.Version: 8.x + Portable_Node10: + Test.RuntimeIdentifier: none + Node.Version: 10.x + SelfContainedWindows_Node8: + Test.RuntimeIdentifier: win-x64 + Node.Version: 8.x + SelfContainedWindows_Node10: + Test.RuntimeIdentifier: win-x64 + Node.Version: 10.x + SelfContainedLinux_Node8: + Test.RuntimeIdentifier: linux-x64 + Node.Version: 8.x + SelfContainedLinux_Node10: + Test.RuntimeIdentifier: linux-x64 + Node.Version: 10.x + SelfContainedMacOs_Node8: + Test.RuntimeIdentifier: osx-x64 + Node.Version: 8.x + SelfContainedMacOs_Node10: + Test.RuntimeIdentifier: osx-x64 + Node.Version: 10.x + steps: + - task: NodeTool@0 + displayName: Install Node $(Node.Version) + inputs: + versionSpec: $(Node.Version) - powershell: | test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true')