From 1dc754a81d324108d3c7ab6f04a3bd6a44df33cd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 4 Nov 2019 13:45:09 -0800 Subject: [PATCH 001/121] Turn on project templates for helix to see what blows up --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 037552d49270..50fcaf4b10cc 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -13,10 +13,7 @@ - false false - - From d5f751d1d6e959b37faf340d2119c6fd87a34d91 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 9 Nov 2019 03:29:57 -0800 Subject: [PATCH 002/121] Try to include shared fx in helix payload --- .../test/Microsoft.AspNetCore.Authentication.Core.Test.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj index ca55bdd85c94..7ebcf2afd676 100644 --- a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj +++ b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj @@ -7,6 +7,9 @@ + + + From df12fba2001985897f0acc8d437c633c6149fcdf Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 9 Nov 2019 03:33:01 -0800 Subject: [PATCH 003/121] Update Helix.props --- eng/targets/Helix.props | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 40e9420500a3..ae0164c94840 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -45,4 +45,9 @@ + + + + + From 1372178c88721a04ef244e02bc694f9e6c3674a4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 9 Nov 2019 03:34:18 -0800 Subject: [PATCH 004/121] Update Microsoft.AspNetCore.Authentication.Core.Test.csproj --- .../test/Microsoft.AspNetCore.Authentication.Core.Test.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj index 7ebcf2afd676..20589a16889e 100644 --- a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj +++ b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj @@ -2,14 +2,12 @@ $(DefaultNetCoreTargetFramework) + true - - - From 03952a5a59054d496a8d05ba0925cc15a52485a1 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 9 Nov 2019 05:21:32 -0800 Subject: [PATCH 005/121] Update Helix.props --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index ae0164c94840..16bbc0cebf9c 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -45,7 +45,7 @@ - + From 71a97ea817006ff183134846244fcabbca849c78 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 11 Nov 2019 22:20:46 -0800 Subject: [PATCH 006/121] Turn on template tests for helix --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 50fcaf4b10cc..be06d7a09f52 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -11,6 +11,7 @@ true true + true false From a6f53554430399b47bb096b911cebd628c41b44c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 11 Nov 2019 22:24:21 -0800 Subject: [PATCH 007/121] Update Helix.props --- eng/targets/Helix.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 16bbc0cebf9c..a6a48e7fd1b6 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -19,6 +19,7 @@ false false 10.15.3 + 5.0.0-ci @@ -46,8 +47,8 @@ - - + + From 8cbcec01ad3b9e065c4327f9c639a8d89614faa7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 11 Nov 2019 22:29:11 -0800 Subject: [PATCH 008/121] Test correct output directory for node script --- eng/helix/content/InstallNode.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallNode.ps1 b/eng/helix/content/InstallNode.ps1 index 84425f271b63..3754eee5f556 100644 --- a/eng/helix/content/InstallNode.ps1 +++ b/eng/helix/content/InstallNode.ps1 @@ -29,9 +29,9 @@ if (Get-Command "node.exe" -ErrorAction SilentlyContinue) exit } -if (Test-Path "$output_dir\node.exe") +if (Test-Path "$InstallDir\node.exe") { - Write-Host "Node.exe found at $output_dir" + Write-Host "Node.exe found at $InstallDir" exit } From 43e44612c3a572640ecfff8459e856ba6721d28d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 11 Nov 2019 22:39:07 -0800 Subject: [PATCH 009/121] Create InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 eng/helix/content/InstallAppRuntime.ps1 diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 new file mode 100644 index 000000000000..e286354dca05 --- /dev/null +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -0,0 +1,36 @@ + <# + .SYNOPSIS + Installs an AspNetCore shared framework on a machine + .DESCRIPTION + This script installs an AspNetCore shared framework on a machine + .PARAMETER AppRuntimePath + The path to the app runtime package to install. + .PARAMETER InstallDir + The directory to install the shared framework to. + #> +param( + [Parameter(Mandatory = $true)] + $AppRuntimePath, + + [Parameter(Mandatory = $true)] + $InstallDir) + +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 + +Set-StrictMode -Version 1 + +Write-Host "Extracting to $InstallDir" + +if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { + # Use built-in commands where possible as they are cross-plat compatible + Microsoft.PowerShell.Archive\Expand-Archive -Path $AppRuntimePath -DestinationPath $InstallDir -Force +} +else { + Remove-Item $tempDir -Recurse -ErrorAction Ignore + # Fallback to old approach for old installations of PowerShell + Add-Type -AssemblyName System.IO.Compression.FileSystem + [System.IO.Compression.ZipFile]::ExtractToDirectory($AppRuntimePath, $InstallDir) +} + +Write-Host "Expanded App Runtime to $InstallDir" From d82c597efd1e010569f5c679f5e3e3d138be8809 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 11 Nov 2019 22:42:54 -0800 Subject: [PATCH 010/121] Update Helix.props --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index a6a48e7fd1b6..838ee6a77ee8 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -48,7 +48,7 @@ - + From 40ec31a2073313bd65a54a9dbd9ef747eb986134 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 11 Nov 2019 22:43:37 -0800 Subject: [PATCH 011/121] Update Helix.props --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 838ee6a77ee8..d035a5df966e 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -48,7 +48,7 @@ - + From 8af51dee39a6b7779d081922d1e42a082595ac7c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 12 Nov 2019 00:08:04 -0800 Subject: [PATCH 012/121] Update ci.yml --- .azure/pipelines/ci.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index dee7ba698557..0f68a4fa602a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -577,8 +577,19 @@ stages: agentOs: Windows timeoutInMinutes: 180 steps: - - script: .\restore.cmd -ci - displayName: Restore + # Build the x86 shared framework + # TODO: make it possible to build for one Windows architecture at a time + # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196 + - script: ./build.cmd + -ci + -arch x86 + -pack + -all + -buildNative + -noBuildJava + /p:OnlyPackPlatformSpecificPackages=true + /bl:artifacts/log/build.x86.binlog + displayName: Build x86 shared fx - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: From c291b67858d27467c58805c710eb4ffb1b96ae60 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sun, 17 Nov 2019 21:00:32 -0800 Subject: [PATCH 013/121] Force failure to get some logs --- eng/helix/content/InstallAppRuntime.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index e286354dca05..b0947355d5f7 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -34,3 +34,4 @@ else { } Write-Host "Expanded App Runtime to $InstallDir" +exit /b 1 From 2786edcdde7102849bc6cdec83fb114836fb7d9d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 18 Nov 2019 12:37:57 -0800 Subject: [PATCH 014/121] Break test --- src/Http/Authentication.Core/test/AuthenticationServiceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs b/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs index 6134ca91729f..8b6ef3a45ffa 100644 --- a/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs +++ b/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs @@ -24,7 +24,7 @@ public async Task AuthenticateThrowsForSchemeMismatch() await context.AuthenticateAsync("base"); var ex = await Assert.ThrowsAsync(() => context.AuthenticateAsync("missing")); - Assert.Contains("base", ex.Message); + Assert.Contains("baseadf", ex.Message); } [Fact] From 56a4c2ea092d747529ed003ea2f4dfdc540a6541 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 18 Nov 2019 14:53:48 -0800 Subject: [PATCH 015/121] Update Helix.props --- eng/targets/Helix.props | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index d035a5df966e..2ff0ef669b71 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -46,9 +46,14 @@ - + + + + + + From 7bcadb24d1f213c8ffd3daddfedd683077d5775f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 18 Nov 2019 14:56:46 -0800 Subject: [PATCH 016/121] Create installappruntime.sh --- eng/helix/content/installappruntime.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 eng/helix/content/installappruntime.sh diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh new file mode 100644 index 000000000000..933be2e97b36 --- /dev/null +++ b/eng/helix/content/installappruntime.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Cause the script to fail if any subcommand fails +set -e + +appRuntimePath=$1 +output_dir=$2 + +echo "Installing shared framework from $appRuntimePath" +mkdir $output_dir +echo "Unpacking to $output_dir" +tar --strip-components 1 -xzf "$appRuntimePath" --no-same-owner --directory "$output_dir" From d0e84f1dd713f033cbaa0195635dd07651c9e797 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 00:08:05 -0800 Subject: [PATCH 017/121] Copy to shared fx to Microsoft.AspNetCore.App in root --- eng/targets/Helix.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 2ff0ef669b71..55a6715ffa15 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -48,12 +48,12 @@ - + - + From 63726b1af51cb6f3528d77237a761c87c4c146f2 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 00:14:38 -0800 Subject: [PATCH 018/121] Install shared fx if found before running tests --- eng/helix/content/runtests.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 663b20afb338..f2c909ae2e0a 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -82,6 +82,12 @@ if [ $? -ne 0 ]; then done fi +# Copy over any local shared fx if found +if [ -d "Microsoft.AspNetCore.App" ] +then + mv Microsoft.AppNetCore.App/* $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/ +fi + $DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt if grep -q "Exception thrown" discovered.txt; then echo -e "${RED}Exception thrown during test discovery${RESET}". From 1f05baf54955ad3ff2084cdd4e5f8225e819a554 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 00:19:21 -0800 Subject: [PATCH 019/121] Copy shared fx if found --- eng/helix/content/runtests.cmd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 2e1f87878ba9..edb9fffcb896 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -21,6 +21,12 @@ set PATH=%DOTNET_ROOT%;%PATH%;%HELIX_CORRELATION_PAYLOAD%\node\bin powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Version %sdkVersion% -InstallDir %DOTNET_ROOT%" powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%" +if (Test-Path "Microsoft.AspNetCore.App") +{ + Write-Host "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App" + Copy-Item "Microsoft.AspNetCore.App" -Destination %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App -Recurse +} + set HELIX=%helixQueue% if (%targetFrameworkIdentifier%==.NETFramework) ( From c8418d912c92b003078b29daf574fb483da47d6d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 00:21:39 -0800 Subject: [PATCH 020/121] Update Helix.props --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 55a6715ffa15..d7ada7702864 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -48,7 +48,7 @@ - + From c6af10cbdc7a844ef915ade9f6a995bdde63bff0 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 20:40:52 -0800 Subject: [PATCH 021/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index edb9fffcb896..574c9d3f938c 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -21,11 +21,10 @@ set PATH=%DOTNET_ROOT%;%PATH%;%HELIX_CORRELATION_PAYLOAD%\node\bin powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Version %sdkVersion% -InstallDir %DOTNET_ROOT%" powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%" -if (Test-Path "Microsoft.AspNetCore.App") -{ - Write-Host "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App" - Copy-Item "Microsoft.AspNetCore.App" -Destination %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App -Recurse -} +if EXIST ".\Microsoft.AspNetCore.App" ( + echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App" + xcopy ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App /s +) set HELIX=%helixQueue% From e9f01e2c388e41f1e1d3fdf4fc67fb6c587691a7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 23:52:11 -0800 Subject: [PATCH 022/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index b0947355d5f7..13456a1551b3 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -22,15 +22,17 @@ Set-StrictMode -Version 1 Write-Host "Extracting to $InstallDir" +$zipPackage = [io.path]::ChangeExtension($AppRuntimePath, ".zip") +Rename-Item -Path $AppRuntimePath -NewName $zipPackage if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $AppRuntimePath -DestinationPath $InstallDir -Force + Microsoft.PowerShell.Archive\Expand-Archive -Path $zipPackage -DestinationPath $InstallDir -Force } else { Remove-Item $tempDir -Recurse -ErrorAction Ignore # Fallback to old approach for old installations of PowerShell Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($AppRuntimePath, $InstallDir) + [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, $InstallDir) } Write-Host "Expanded App Runtime to $InstallDir" From e9e8b0944af5e754ad20b778d496fee3adf87dd9 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 19 Nov 2019 23:58:43 -0800 Subject: [PATCH 023/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 933be2e97b36..fb92f173579e 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -7,6 +7,7 @@ appRuntimePath=$1 output_dir=$2 echo "Installing shared framework from $appRuntimePath" -mkdir $output_dir +cp $appRuntimePath sharedFx.gz +mkdir -p $output_dir echo "Unpacking to $output_dir" -tar --strip-components 1 -xzf "$appRuntimePath" --no-same-owner --directory "$output_dir" +tar -xzf sharedFx.gz --no-same-owner --directory "$output_dir" From 0ecda9dfd90c300c9b58c356c1488019a9fbfead Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 20 Nov 2019 13:44:45 -0800 Subject: [PATCH 024/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 13456a1551b3..599df04c07ef 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -23,6 +23,7 @@ Set-StrictMode -Version 1 Write-Host "Extracting to $InstallDir" $zipPackage = [io.path]::ChangeExtension($AppRuntimePath, ".zip") +Write-Host "Renaming to $zipPackage" Rename-Item -Path $AppRuntimePath -NewName $zipPackage if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { # Use built-in commands where possible as they are cross-plat compatible @@ -36,4 +37,4 @@ else { } Write-Host "Expanded App Runtime to $InstallDir" -exit /b 1 +Get-ChildItem -Path $InstallDir From 2a07f0b84945424953c5e90ed788df5cf8124f30 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 20 Nov 2019 13:47:55 -0800 Subject: [PATCH 025/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index fb92f173579e..0ed1eef307ea 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -7,7 +7,9 @@ appRuntimePath=$1 output_dir=$2 echo "Installing shared framework from $appRuntimePath" -cp $appRuntimePath sharedFx.gz +cp $appRuntimePath sharedFx.zip mkdir -p $output_dir +echo "Installing unzip" +apt-get install unzip echo "Unpacking to $output_dir" -tar -xzf sharedFx.gz --no-same-owner --directory "$output_dir" +unzip sharedFx.zip -d $output_dir From 782953a1ed7f474e4015116cc60276f780d64741 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 20 Nov 2019 21:21:58 -0800 Subject: [PATCH 026/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 0ed1eef307ea..8ca185991294 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -9,7 +9,5 @@ output_dir=$2 echo "Installing shared framework from $appRuntimePath" cp $appRuntimePath sharedFx.zip mkdir -p $output_dir -echo "Installing unzip" -apt-get install unzip echo "Unpacking to $output_dir" unzip sharedFx.zip -d $output_dir From 90bae46d385e598d92c45949d4a05a7aea155c1f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 21 Nov 2019 16:41:12 -0800 Subject: [PATCH 027/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 599df04c07ef..86c7b7e8261f 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -27,14 +27,20 @@ Write-Host "Renaming to $zipPackage" Rename-Item -Path $AppRuntimePath -NewName $zipPackage if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $zipPackage -DestinationPath $InstallDir -Force + Microsoft.PowerShell.Archive\Expand-Archive -Path $zipPackage -DestinationPath ".\tmpRuntime" -Force } else { - Remove-Item $tempDir -Recurse -ErrorAction Ignore + Remove-Item ".\tmpRuntime" -Recurse -ErrorAction Ignore # Fallback to old approach for old installations of PowerShell Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, $InstallDir) + [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, ".\tmpRuntime") } -Write-Host "Expanded App Runtime to $InstallDir" +Write-Host "Expanded App Runtime to tmpRuntime" +Get-ChildItem -Path ".\tmpRuntime" + +Write-Host "Copying managed files to $InstallDir" +Copy-Item -Path ".\tmpRuntime\win-x64\lib\netcoreapp5.0\*" $InstallDir +Write-Host "Copying native files to $InstallDir" +Copy-Item -Path ".\tmpRuntime\win-x64\native\*" $InstallDir Get-ChildItem -Path $InstallDir From 626e81a26da57c74ead8e362eed2baeb4092b060 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 21 Nov 2019 22:53:17 -0800 Subject: [PATCH 028/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 86c7b7e8261f..7e69d378e53b 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -40,7 +40,7 @@ Write-Host "Expanded App Runtime to tmpRuntime" Get-ChildItem -Path ".\tmpRuntime" Write-Host "Copying managed files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\win-x64\lib\netcoreapp5.0\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\netcoreapp5.0\*" $InstallDir Write-Host "Copying native files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\win-x64\native\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\native\*" $InstallDir Get-ChildItem -Path $InstallDir From de0fe18c614c54f5c9fb43ea989df3732b02e0d5 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 21 Nov 2019 22:55:57 -0800 Subject: [PATCH 029/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 8ca185991294..16fd8c0c2649 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -5,9 +5,15 @@ set -e appRuntimePath=$1 output_dir=$2 +tmpDir=./tmpRuntime echo "Installing shared framework from $appRuntimePath" cp $appRuntimePath sharedFx.zip + +mkdir -p $tmpDir +echo "Unpacking to $tmpDir" +unzip sharedFx.zip -d $tmpDir mkdir -p $output_dir -echo "Unpacking to $output_dir" -unzip sharedFx.zip -d $output_dir +echo "Copying to $output_dir" +cp $tmpDir/runtimes/win-x86/lib/netcoreapp5.0/* $output_dir +cp $tmpDir/runtimes/win-x86/native/* $output_dir From 15e858d11cf2435dd32fdd6fb96883c8f8e16f4e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 22 Nov 2019 00:38:47 -0800 Subject: [PATCH 030/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 7e69d378e53b..eb99b5f241a1 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -37,7 +37,7 @@ else { } Write-Host "Expanded App Runtime to tmpRuntime" -Get-ChildItem -Path ".\tmpRuntime" +Get-ChildItem -Path ".\tmpRuntime\runtimes" Write-Host "Copying managed files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\netcoreapp5.0\*" $InstallDir From 11e4ea8536820104b6adfc5bbf9e559b91356d2a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 22 Nov 2019 00:39:33 -0800 Subject: [PATCH 031/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 16fd8c0c2649..baf11af8c18c 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -13,6 +13,7 @@ cp $appRuntimePath sharedFx.zip mkdir -p $tmpDir echo "Unpacking to $tmpDir" unzip sharedFx.zip -d $tmpDir +ls -la $tmpDir/runtimes mkdir -p $output_dir echo "Copying to $output_dir" cp $tmpDir/runtimes/win-x86/lib/netcoreapp5.0/* $output_dir From 3dee8b0579a7c45cd9dafd31c7007f926af5056a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 22 Nov 2019 09:25:56 -0800 Subject: [PATCH 032/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index baf11af8c18c..c697cdf85ed7 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -13,8 +13,8 @@ cp $appRuntimePath sharedFx.zip mkdir -p $tmpDir echo "Unpacking to $tmpDir" unzip sharedFx.zip -d $tmpDir -ls -la $tmpDir/runtimes mkdir -p $output_dir echo "Copying to $output_dir" cp $tmpDir/runtimes/win-x86/lib/netcoreapp5.0/* $output_dir cp $tmpDir/runtimes/win-x86/native/* $output_dir +ls -la $output_dir From e4cac96c09768a38cd1698d6ad1cc2c9ab784c40 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 22 Nov 2019 09:27:59 -0800 Subject: [PATCH 033/121] Update runtests.sh --- eng/helix/content/runtests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index f2c909ae2e0a..1508c9831400 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -82,6 +82,9 @@ if [ $? -ne 0 ]; then done fi +ls -la Microsoft.AspNetCore.App +ls -la $DOTNET_ROOT/shared/Microsoft.AspNetCore.App + # Copy over any local shared fx if found if [ -d "Microsoft.AspNetCore.App" ] then From e9d17d82a4d2f180b8f9d527c5d1172bbea232fd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 22 Nov 2019 19:39:27 -0800 Subject: [PATCH 034/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index c697cdf85ed7..16fd8c0c2649 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -17,4 +17,3 @@ mkdir -p $output_dir echo "Copying to $output_dir" cp $tmpDir/runtimes/win-x86/lib/netcoreapp5.0/* $output_dir cp $tmpDir/runtimes/win-x86/native/* $output_dir -ls -la $output_dir From c38f8987f6a1959d42643a00fe68e3211d9ca6bb Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 22 Nov 2019 19:41:36 -0800 Subject: [PATCH 035/121] Update runtests.sh --- eng/helix/content/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 1508c9831400..b01169615eb2 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -88,7 +88,7 @@ ls -la $DOTNET_ROOT/shared/Microsoft.AspNetCore.App # Copy over any local shared fx if found if [ -d "Microsoft.AspNetCore.App" ] then - mv Microsoft.AppNetCore.App/* $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/ + cp Microsoft.AppNetCore.App/* $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version fi $DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt From b2613dbe3c1aee30782ebeab6c635f327b389a38 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 23 Nov 2019 02:20:23 -0800 Subject: [PATCH 036/121] Update runtests.sh --- eng/helix/content/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index b01169615eb2..6809f6920fa9 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -88,7 +88,7 @@ ls -la $DOTNET_ROOT/shared/Microsoft.AspNetCore.App # Copy over any local shared fx if found if [ -d "Microsoft.AspNetCore.App" ] then - cp Microsoft.AppNetCore.App/* $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version + cp -r Microsoft.AppNetCore.App $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version fi $DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt From 99df82df525a70fcf5ff86a8d3858a63358f48aa Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 23 Nov 2019 02:21:23 -0800 Subject: [PATCH 037/121] Update Helix.props --- eng/targets/Helix.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index d7ada7702864..4f010450a8d2 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -48,12 +48,12 @@ - + - + From 927d2d0be02f438b21bc9cfb3db2f0e1f8243d4b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 23 Nov 2019 02:23:08 -0800 Subject: [PATCH 038/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index eb99b5f241a1..2d8d41dd1b49 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -40,7 +40,7 @@ Write-Host "Expanded App Runtime to tmpRuntime" Get-ChildItem -Path ".\tmpRuntime\runtimes" Write-Host "Copying managed files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\netcoreapp5.0\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\lib\netcoreapp5.0\*" $InstallDir Write-Host "Copying native files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\native\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\native\*" $InstallDir Get-ChildItem -Path $InstallDir From d60da6d4676cf32edc75a045d86ec60f45e106e3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 23 Nov 2019 02:24:09 -0800 Subject: [PATCH 039/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 574c9d3f938c..f1d124a5793e 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -22,8 +22,8 @@ powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePo powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%" if EXIST ".\Microsoft.AspNetCore.App" ( - echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App" - xcopy ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App /s + echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%" + xcopy ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion% /s ) set HELIX=%helixQueue% From d5f473c32fb344640fa53cf0b170a45c1f6fc7e2 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Sat, 23 Nov 2019 09:36:12 -0800 Subject: [PATCH 040/121] Update runtests.sh --- eng/helix/content/runtests.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 6809f6920fa9..bc1fe5b8f977 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -82,13 +82,12 @@ if [ $? -ne 0 ]; then done fi -ls -la Microsoft.AspNetCore.App -ls -la $DOTNET_ROOT/shared/Microsoft.AspNetCore.App - # Copy over any local shared fx if found if [ -d "Microsoft.AspNetCore.App" ] then - cp -r Microsoft.AppNetCore.App $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version + ls -la Microsoft.AspNetCore.App + cp -r Microsoft.AspNetCore.App $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version + ls -la $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version fi $DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt From b82c0251faf45fcd7385e79b7c01fe93528d969e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 2 Dec 2019 01:28:38 -0800 Subject: [PATCH 041/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index f1d124a5793e..ec9a56326e66 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -23,7 +23,7 @@ powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePo if EXIST ".\Microsoft.AspNetCore.App" ( echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%" - xcopy ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion% /s + xcopy ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion% /s /i ) set HELIX=%helixQueue% From 62edbb3efeb1443888c1273d06d91fe8569049c4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 2 Dec 2019 01:29:57 -0800 Subject: [PATCH 042/121] Update runtests.sh --- eng/helix/content/runtests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index bc1fe5b8f977..0769914ad6fa 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -85,9 +85,8 @@ fi # Copy over any local shared fx if found if [ -d "Microsoft.AspNetCore.App" ] then - ls -la Microsoft.AspNetCore.App + echo "Found Microsoft.AspNetCore.App directory, copying to $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version." cp -r Microsoft.AspNetCore.App $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version - ls -la $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version fi $DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt From 74f9286b38ccf7874524ba4b8111e1e03ac18b0f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 2 Dec 2019 09:11:05 -0800 Subject: [PATCH 043/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 2d8d41dd1b49..343a1803ed72 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -36,11 +36,7 @@ else { [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, ".\tmpRuntime") } -Write-Host "Expanded App Runtime to tmpRuntime" -Get-ChildItem -Path ".\tmpRuntime\runtimes" - Write-Host "Copying managed files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\lib\netcoreapp5.0\*" $InstallDir Write-Host "Copying native files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\native\*" $InstallDir -Get-ChildItem -Path $InstallDir From a95865aaac26b1c8cad9d14314ebe5cecc2de2c6 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 2 Dec 2019 09:12:27 -0800 Subject: [PATCH 044/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index ec9a56326e66..da3597059482 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -23,7 +23,7 @@ powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePo if EXIST ".\Microsoft.AspNetCore.App" ( echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%" - xcopy ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion% /s /i + xcopy /i ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion% ) set HELIX=%helixQueue% From 495ee43022166fb386c92f8cabc9db18ec956392 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 3 Dec 2019 02:19:48 -0800 Subject: [PATCH 045/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index da3597059482..71fabd01b75c 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -23,7 +23,7 @@ powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePo if EXIST ".\Microsoft.AspNetCore.App" ( echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%" - xcopy /i ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion% + xcopy /i ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\ ) set HELIX=%helixQueue% From f7a8dd594fc2bf2a61c17b6a46e79158948cd405 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 3 Dec 2019 14:51:20 -0800 Subject: [PATCH 046/121] Always install shared fx for helix tests --- eng/targets/Helix.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 4f010450a8d2..62e8563c46fe 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -46,12 +46,12 @@ - + - + From 1e7d5d2b7d298f25bf3887601143485021c88acd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 3 Dec 2019 14:51:32 -0800 Subject: [PATCH 047/121] Update Microsoft.AspNetCore.Authentication.Core.Test.csproj --- .../test/Microsoft.AspNetCore.Authentication.Core.Test.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj index 20589a16889e..ca55bdd85c94 100644 --- a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj +++ b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj @@ -2,7 +2,6 @@ $(DefaultNetCoreTargetFramework) - true From 01e256ff2ab54f9c3d80d7952c80f93fc2b09b68 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 3 Dec 2019 14:51:54 -0800 Subject: [PATCH 048/121] Update ProjectTemplates.Tests.csproj --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index be06d7a09f52..50fcaf4b10cc 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -11,7 +11,6 @@ true true - true false From e3e2ce8c3ce035d1ee154301b3aed681035b3537 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 3 Dec 2019 18:18:07 -0800 Subject: [PATCH 049/121] Update AuthenticationServiceTests.cs --- src/Http/Authentication.Core/test/AuthenticationServiceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs b/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs index 8b6ef3a45ffa..6134ca91729f 100644 --- a/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs +++ b/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs @@ -24,7 +24,7 @@ public async Task AuthenticateThrowsForSchemeMismatch() await context.AuthenticateAsync("base"); var ex = await Assert.ThrowsAsync(() => context.AuthenticateAsync("missing")); - Assert.Contains("baseadf", ex.Message); + Assert.Contains("base", ex.Message); } [Fact] From fb60dfd53b61cd37a5e5a5f46af2816932a5bc96 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Jan 2020 23:10:22 -0800 Subject: [PATCH 050/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 16fd8c0c2649..0afe85754c9d 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -11,7 +11,6 @@ echo "Installing shared framework from $appRuntimePath" cp $appRuntimePath sharedFx.zip mkdir -p $tmpDir -echo "Unpacking to $tmpDir" unzip sharedFx.zip -d $tmpDir mkdir -p $output_dir echo "Copying to $output_dir" From 4a9cafb2ab136bf4dc1a071acbe65e11a20c6941 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 28 Jan 2020 13:44:07 -0800 Subject: [PATCH 051/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 71fabd01b75c..ded87283b829 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -23,7 +23,7 @@ powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePo if EXIST ".\Microsoft.AspNetCore.App" ( echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%" - xcopy /i ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\ + xcopy /i /y ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\ ) set HELIX=%helixQueue% From cdc0cecfc868ef623774b2bdd9f5db20824ddba4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jan 2020 11:43:57 -0800 Subject: [PATCH 052/121] Cleanup --- .azure/pipelines/ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 0f68a4fa602a..92c08d6d8657 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -120,8 +120,7 @@ stages: displayName: Build x64 # Build the x86 shared framework - # TODO: make it possible to build for one Windows architecture at a time - # This is going to actually build x86 native assets. See https://github.com/dotnet/aspnetcore/issues/7196 + # This is going to actually build x86 native assets. - script: ./build.cmd -ci -arch x86 @@ -578,8 +577,7 @@ stages: timeoutInMinutes: 180 steps: # Build the x86 shared framework - # TODO: make it possible to build for one Windows architecture at a time - # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196 + # This is going to actually build x86 native assets. - script: ./build.cmd -ci -arch x86 @@ -609,7 +607,19 @@ stages: steps: - script: .\restore.cmd -ci displayName: Restore - - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl + # Build the x86 shared framework + # This is going to actually build x86 native assets. + - script: ./build.cmd + -ci + -arch x86 + -pack + -all + -buildNative + -noBuildJava + /p:OnlyPackPlatformSpecificPackages=true + /bl:artifacts/log/build.x86.binlog + displayName: Build x86 shared fx + - script: .\build.cmd -ci -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops From 5f6bb8a81f3c36c1095c4222718a9abc7496d899 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jan 2020 11:47:25 -0800 Subject: [PATCH 053/121] Pass in target framework version to install --- eng/targets/Helix.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 62e8563c46fe..0b35f709cd3f 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -48,12 +48,12 @@ - + - + From 82f6b71080bae99717d0f04680edda1e7877d04f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jan 2020 11:47:53 -0800 Subject: [PATCH 054/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 0afe85754c9d..362812227028 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -5,6 +5,7 @@ set -e appRuntimePath=$1 output_dir=$2 +framework=$3 tmpDir=./tmpRuntime echo "Installing shared framework from $appRuntimePath" @@ -14,5 +15,5 @@ mkdir -p $tmpDir unzip sharedFx.zip -d $tmpDir mkdir -p $output_dir echo "Copying to $output_dir" -cp $tmpDir/runtimes/win-x86/lib/netcoreapp5.0/* $output_dir +cp $tmpDir/runtimes/win-x86/lib/$framework/* $output_dir cp $tmpDir/runtimes/win-x86/native/* $output_dir From 6465791f52e00404ab0ebb50c997d1c8c710aed1 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jan 2020 11:49:06 -0800 Subject: [PATCH 055/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 343a1803ed72..2cc1c04b85a7 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -7,13 +7,18 @@ The path to the app runtime package to install. .PARAMETER InstallDir The directory to install the shared framework to. + .PARAMETER Framework + The framework directory to copy the shared framework from. #> param( [Parameter(Mandatory = $true)] $AppRuntimePath, [Parameter(Mandatory = $true)] - $InstallDir) + $InstallDir, + + [Parameter(Mandatory = $true)] + $Framework) $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 @@ -37,6 +42,6 @@ else { } Write-Host "Copying managed files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\lib\netcoreapp5.0\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\lib\$Framework\*" $InstallDir Write-Host "Copying native files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\native\*" $InstallDir From 2b9cfcebc9fb88706a021c393503f6ccf9bfe25d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 3 Feb 2020 23:01:41 -0800 Subject: [PATCH 056/121] restore --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 92c08d6d8657..69febc127f40 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -588,7 +588,7 @@ stages: /p:OnlyPackPlatformSpecificPackages=true /bl:artifacts/log/build.x86.binlog displayName: Build x86 shared fx - - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl + - script: .\build.cmd -ci -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops From 419ec20ad934c9c58ceac721bc826ba095ac30f3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 09:11:15 -0800 Subject: [PATCH 057/121] Clean up shared fx build steps --- .azure/pipelines/ci.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 69febc127f40..87472d684761 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -576,18 +576,9 @@ stages: agentOs: Windows timeoutInMinutes: 180 steps: - # Build the x86 shared framework - # This is going to actually build x86 native assets. - - script: ./build.cmd - -ci - -arch x86 - -pack - -all - -buildNative - -noBuildJava - /p:OnlyPackPlatformSpecificPackages=true - /bl:artifacts/log/build.x86.binlog - displayName: Build x86 shared fx + # Build the shared framework + - script: ./build.cmd -ci -all -pack + displayName: Build shared fx - script: .\build.cmd -ci -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: @@ -605,20 +596,8 @@ stages: agentOs: Windows timeoutInMinutes: 180 steps: - - script: .\restore.cmd -ci - displayName: Restore - # Build the x86 shared framework - # This is going to actually build x86 native assets. - - script: ./build.cmd - -ci - -arch x86 - -pack - -all - -buildNative - -noBuildJava - /p:OnlyPackPlatformSpecificPackages=true - /bl:artifacts/log/build.x86.binlog - displayName: Build x86 shared fx + - script: ./build.cmd -ci -all -pack + displayName: Build shared fx - script: .\build.cmd -ci -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: From dd5d76447367d75f1c483f7e285b016c5af84077 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 10:50:58 -0800 Subject: [PATCH 058/121] Update Helix.props --- eng/targets/Helix.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 0b35f709cd3f..a304639bc15a 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -47,13 +47,13 @@ - - + + - - + + From 2be9211fb8e383a7b80fec7fd1ae3d0306e57879 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 10:51:22 -0800 Subject: [PATCH 059/121] Update installappruntime.sh --- eng/helix/content/installappruntime.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh index 362812227028..d1a9f845b91a 100644 --- a/eng/helix/content/installappruntime.sh +++ b/eng/helix/content/installappruntime.sh @@ -15,5 +15,5 @@ mkdir -p $tmpDir unzip sharedFx.zip -d $tmpDir mkdir -p $output_dir echo "Copying to $output_dir" -cp $tmpDir/runtimes/win-x86/lib/$framework/* $output_dir -cp $tmpDir/runtimes/win-x86/native/* $output_dir +cp $tmpDir/runtimes/win-x64/lib/$framework/* $output_dir +cp $tmpDir/runtimes/win-x64/native/* $output_dir From 815d33657be5d22be531e53656cd83de7b431370 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 10:51:45 -0800 Subject: [PATCH 060/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 2cc1c04b85a7..28851e467644 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -42,6 +42,6 @@ else { } Write-Host "Copying managed files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\lib\$Framework\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\$Framework\*" $InstallDir Write-Host "Copying native files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\runtimes\win-x86\native\*" $InstallDir +Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\native\*" $InstallDir From 87e8f1089053562d45b80bb424bb08f5d9da81d5 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 16:28:24 -0800 Subject: [PATCH 061/121] Print out runtime contents --- eng/helix/content/InstallAppRuntime.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 28851e467644..933caeff76d3 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -41,6 +41,8 @@ else { [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, ".\tmpRuntime") } +Get-ChildItem -Path ".\tmpRuntime" -Recursive + Write-Host "Copying managed files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\$Framework\*" $InstallDir Write-Host "Copying native files to $InstallDir" From be1d67bf77681a1eda97c9d1824609c08a32eb3a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 16:37:25 -0800 Subject: [PATCH 062/121] Tweaks --- .azure/pipelines/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 87472d684761..ad431a5f3f9d 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -577,9 +577,9 @@ stages: timeoutInMinutes: 180 steps: # Build the shared framework - - script: ./build.cmd -ci -all -pack + - script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.build.x64.binlog displayName: Build shared fx - - script: .\build.cmd -ci -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl + - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops @@ -596,9 +596,9 @@ stages: agentOs: Windows timeoutInMinutes: 180 steps: - - script: ./build.cmd -ci -all -pack + - script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.daily.build.x64.binlog displayName: Build shared fx - - script: .\build.cmd -ci -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl + - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops From 65e89049d42e21677e9ee7958fda69bbe879c472 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 4 Feb 2020 18:01:52 -0800 Subject: [PATCH 063/121] x86 pieces are required --- .azure/pipelines/ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index ad431a5f3f9d..988cd44dece7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -579,6 +579,19 @@ stages: # Build the shared framework - script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.build.x64.binlog displayName: Build shared fx + # Build the x86 shared framework + # This is going to actually build x86 native assets. + - script: ./build.cmd + -ci + -arch x86 + -pack + -all + -buildNative + -noBuildJava + /p:OnlyPackPlatformSpecificPackages=true + /bl:artifacts/log/helix.build.x86.binlog + $(_BuildArgs) + displayName: Build x86 shared framework pieces - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: @@ -598,6 +611,19 @@ stages: steps: - script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.daily.build.x64.binlog displayName: Build shared fx + # Build the x86 shared framework + # This is going to actually build x86 native assets. + - script: ./build.cmd + -ci + -arch x86 + -pack + -all + -buildNative + -noBuildJava + /p:OnlyPackPlatformSpecificPackages=true + /bl:artifacts/log/helix.daily.build.x86.binlog + $(_BuildArgs) + displayName: Build x86 shared framework pieces - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: From 029148f9ffacd335abd03e3cf4877395bd1c3fcd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 02:12:20 -0800 Subject: [PATCH 064/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index 933caeff76d3..f66336c8ed2a 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -41,7 +41,7 @@ else { [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, ".\tmpRuntime") } -Get-ChildItem -Path ".\tmpRuntime" -Recursive +Get-ChildItem -Path ".\tmpRuntime" -Recurse Write-Host "Copying managed files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\$Framework\*" $InstallDir From 1cbe21ae4b8e644151cefbc9762ebf0e79987f17 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 02:25:54 -0800 Subject: [PATCH 065/121] Update TemplatePackageInstaller.cs --- .../test/Helpers/TemplatePackageInstaller.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index 30983a55fca0..84f204ec329b 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -81,14 +81,22 @@ public static async Task RunDotNetNew(ITestOutputHelper output, strin private static async Task InstallTemplatePackages(ITestOutputHelper output) { - var builtPackages = Directory.EnumerateFiles( - typeof(TemplatePackageInstaller).Assembly + string packagesDir; + if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + { + packagesDir = "Templates"; + } + else + { + packagesDir = typeof(TemplatePackageInstaller).Assembly .GetCustomAttributes() - .Single(a => a.Key == "ArtifactsShippingPackagesDir").Value, - "*.nupkg") + .Single(a => a.Key == "ArtifactsShippingPackagesDir").Value + } + + var builtPackages = Directory.EnumerateFiles(packagesDir, "*.nupkg") .Where(p => _templatePackages.Any(t => Path.GetFileName(p).StartsWith(t, StringComparison.OrdinalIgnoreCase))) .ToArray(); - + Assert.Equal(5, builtPackages.Length); /* From 0aad54b816c845a273e49c85df88fd5c380f0fb7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 02:29:57 -0800 Subject: [PATCH 066/121] Update ci.yml --- .azure/pipelines/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 988cd44dece7..b68d4b80b2fc 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -592,6 +592,8 @@ stages: /bl:artifacts/log/helix.build.x86.binlog $(_BuildArgs) displayName: Build x86 shared framework pieces + - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/helix.template.pack.binlog" + displayName: Pack Templates - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target env: From f709295df98ab5e0ed210decc11e50cb37714c11 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 02:35:25 -0800 Subject: [PATCH 067/121] Include templates --- eng/targets/Helix.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index a304639bc15a..2c640cec13d4 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -56,4 +56,8 @@ + + + From fa2337cc30787b6166178b7a829bba3755927105 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 02:36:37 -0800 Subject: [PATCH 068/121] Search for templates nupkgs only --- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index 84f204ec329b..24991922ca3d 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -84,7 +84,7 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output) string packagesDir; if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) { - packagesDir = "Templates"; + packagesDir = "."; } else { @@ -93,7 +93,7 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output) .Single(a => a.Key == "ArtifactsShippingPackagesDir").Value } - var builtPackages = Directory.EnumerateFiles(packagesDir, "*.nupkg") + var builtPackages = Directory.EnumerateFiles(packagesDir, "*Templates*.nupkg") .Where(p => _templatePackages.Any(t => Path.GetFileName(p).StartsWith(t, StringComparison.OrdinalIgnoreCase))) .ToArray(); From 3b73a988093404b2a5d887d61de7a82fa7308b20 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 10:40:40 -0800 Subject: [PATCH 069/121] Update Helix.props --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 2c640cec13d4..4f8322c2cb8d 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -56,7 +56,7 @@ - From 3587793aaf252cb61054ad8823d12ca9c87091fd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 18:03:43 -0800 Subject: [PATCH 070/121] Update TemplatePackageInstaller.cs --- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index 24991922ca3d..cf22df09c7b8 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -90,7 +90,7 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output) { packagesDir = typeof(TemplatePackageInstaller).Assembly .GetCustomAttributes() - .Single(a => a.Key == "ArtifactsShippingPackagesDir").Value + .Single(a => a.Key == "ArtifactsShippingPackagesDir").Value; } var builtPackages = Directory.EnumerateFiles(packagesDir, "*Templates*.nupkg") From d28d0eb644a146ccb35e7c9496587e712c5d92c7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 21:04:25 -0800 Subject: [PATCH 071/121] Update InstallAppRuntime.ps1 --- eng/helix/content/InstallAppRuntime.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1 index f66336c8ed2a..81b3fb36186d 100644 --- a/eng/helix/content/InstallAppRuntime.ps1 +++ b/eng/helix/content/InstallAppRuntime.ps1 @@ -45,5 +45,5 @@ Get-ChildItem -Path ".\tmpRuntime" -Recurse Write-Host "Copying managed files to $InstallDir" Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\lib\$Framework\*" $InstallDir -Write-Host "Copying native files to $InstallDir" -Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\native\*" $InstallDir +Write-Host "Todo: Copying native files to $InstallDir" +# Copy-Item -Path ".\tmpRuntime\runtimes\win-x64\native\*" $InstallDir From 1147ec71c1d110f6fe70098bfa2b6c84d4918d3a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 5 Feb 2020 21:05:56 -0800 Subject: [PATCH 072/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index ded87283b829..91752cd57482 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -28,6 +28,8 @@ if EXIST ".\Microsoft.AspNetCore.App" ( set HELIX=%helixQueue% +dir + if (%targetFrameworkIdentifier%==.NETFramework) ( xunit.console.exe %target% -xml testResults.xml exit /b %ERRORLEVEL% From ffc6c3d96faaa83892b61434811f58ffb9d893c2 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 6 Feb 2020 00:56:08 -0800 Subject: [PATCH 073/121] Update Helix.props --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 4f8322c2cb8d..eb2a9a510951 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -57,7 +57,7 @@ - + From 425d2d264fae57ca1140cd6a14ea726172cb968b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 6 Feb 2020 00:57:40 -0800 Subject: [PATCH 074/121] Include templates packages in helix payloads --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index eb2a9a510951..3d858dce44da 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -57,7 +57,7 @@ - + From 9e35b55d0355e59c13b825d2304755b006005f0b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 6 Feb 2020 13:19:32 -0800 Subject: [PATCH 075/121] Only install aspnet runtime/templates when asked --- eng/targets/Helix.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 3d858dce44da..b38b525bfa67 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -46,17 +46,17 @@ - + - + - + From 3417691c7efed4ba834153ca2d68361220da0d6f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 6 Feb 2020 13:20:36 -0800 Subject: [PATCH 076/121] Opt into aspnet runtime only for templates test --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 50fcaf4b10cc..d5c0b6240853 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -20,6 +20,7 @@ TestTemplates\ $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\ TemplateTests.props + true From 21eb87ae3b9ba9306158859c144369a2051226f7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 7 Feb 2020 13:21:13 -0800 Subject: [PATCH 077/121] Update Helix.props --- eng/targets/Helix.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index b38b525bfa67..bb038752f5f2 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -20,6 +20,7 @@ false 10.15.3 5.0.0-ci + false From e4d039df8fea1b373874004c29153940f7d1d9d9 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Feb 2020 13:01:56 -0800 Subject: [PATCH 078/121] Comment out shared fx build to debug --- .azure/pipelines/ci.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index b68d4b80b2fc..5fd9bfae5009 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -577,21 +577,12 @@ stages: timeoutInMinutes: 180 steps: # Build the shared framework - - script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.build.x64.binlog - displayName: Build shared fx + #- script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.build.x64.binlog + # displayName: Build shared fx # Build the x86 shared framework # This is going to actually build x86 native assets. - - script: ./build.cmd - -ci - -arch x86 - -pack - -all - -buildNative - -noBuildJava - /p:OnlyPackPlatformSpecificPackages=true - /bl:artifacts/log/helix.build.x86.binlog - $(_BuildArgs) - displayName: Build x86 shared framework pieces + #- script: ./build.cmd -ci -arch x86 -pack -all -buildNative -noBuildJava /p:OnlyPackPlatformSpecificPackages=true /bl:artifacts/log/helix.build.x86.binlog $(_BuildArgs) + # displayName: Build x86 shared framework pieces - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/helix.template.pack.binlog" displayName: Pack Templates - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl From b154815900efe0450f9f8d3f2adb18a3d37786e3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Feb 2020 15:14:53 -0800 Subject: [PATCH 079/121] Specify artifact logs --- .azure/pipelines/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 5fd9bfae5009..8a3be44a3c8a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -577,13 +577,13 @@ stages: timeoutInMinutes: 180 steps: # Build the shared framework - #- script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.build.x64.binlog - # displayName: Build shared fx + - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog + displayName: Build shared fx # Build the x86 shared framework # This is going to actually build x86 native assets. - #- script: ./build.cmd -ci -arch x86 -pack -all -buildNative -noBuildJava /p:OnlyPackPlatformSpecificPackages=true /bl:artifacts/log/helix.build.x86.binlog $(_BuildArgs) - # displayName: Build x86 shared framework pieces - - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/helix.template.pack.binlog" + - script: ./build.cmd -ci -arch x86 -pack -all -buildNative -noBuildJava /p:OnlyPackPlatformSpecificPackages=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x86.binlog $(_BuildArgs) + displayName: Build x86 shared framework pieces + - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.template.pack.binlog" displayName: Pack Templates - script: .\build.cmd -ci -noBuildRepoTasks -noRestore -noBuild -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl displayName: Run build.cmd helix target @@ -602,7 +602,7 @@ stages: agentOs: Windows timeoutInMinutes: 180 steps: - - script: ./build.cmd -ci -all -pack -arch x64 /bl:artifacts/log/helix.daily.build.x64.binlog + - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog displayName: Build shared fx # Build the x86 shared framework # This is going to actually build x86 native assets. @@ -614,6 +614,7 @@ stages: -buildNative -noBuildJava /p:OnlyPackPlatformSpecificPackages=true + /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x86.binlog $(_BuildArgs) displayName: Build x86 shared framework pieces From b97095b335e8a0f148a4774197c9e7483c45252b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Feb 2020 17:34:09 -0800 Subject: [PATCH 080/121] Update TemplatePackageInstaller.cs --- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index cf22df09c7b8..3308051a58d7 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -96,7 +96,7 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output) var builtPackages = Directory.EnumerateFiles(packagesDir, "*Templates*.nupkg") .Where(p => _templatePackages.Any(t => Path.GetFileName(p).StartsWith(t, StringComparison.OrdinalIgnoreCase))) .ToArray(); - + Assert.Equal(5, builtPackages.Length); /* From c098d38622f491388ce8fb160e14fd816c319f5b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Feb 2020 00:02:18 -0800 Subject: [PATCH 081/121] Fix hive path on helix --- .../test/Helpers/TemplatePackageInstaller.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index 3308051a58d7..bbfc788b3078 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -42,10 +42,12 @@ internal static class TemplatePackageInstaller "Microsoft.AspNetCore.Blazor.Templates", }; - public static string CustomHivePath { get; } = typeof(TemplatePackageInstaller) - .Assembly.GetCustomAttributes() - .Single(s => s.Key == "CustomTemplateHivePath").Value; - + public static string CustomHivePath { get; } = (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + ? typeof(TemplatePackageInstaller) + .Assembly.GetCustomAttributes() + .Single(s => s.Key == "CustomTemplateHivePath").Value + : Path.Combine("Hives", ".templateEngine"); + public static async Task EnsureTemplatingEngineInitializedAsync(ITestOutputHelper output) { await InstallerLock.WaitAsync(); From 55b95d7f3e67e420e39d5b2988dc485cac736a71 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Feb 2020 12:02:09 -0800 Subject: [PATCH 082/121] Fix paths --- src/ProjectTemplates/test/Helpers/Project.cs | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index 33e50d209151..bbbf429d6d04 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -24,7 +24,16 @@ public class Project public static bool IsCIEnvironment => typeof(Project).Assembly.GetCustomAttributes() .Any(a => a.Key == "ContinuousIntegrationBuild"); - public static string ArtifactsLogDir => GetAssemblyMetadata("ArtifactsLogDir"); + public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + ? Path.Combine("artifacts", "log"); + : GetAssemblyMetadata("ArtifactsLogDir"); + + // FIGURE OUT EF PATH + public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + ? Path.Combine("NuGetPackageRoot", "dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll"); + : typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes() + .First(attribute => attribute.Key == "DotNetEfFullPath") + .Value; public SemaphoreSlim DotNetNewLock { get; set; } public SemaphoreSlim NodeLock { get; set; } @@ -32,7 +41,9 @@ public class Project public string ProjectArguments { get; set; } public string ProjectGuid { get; set; } public string TemplateOutputDir { get; set; } - public string TargetFramework { get; set; } = GetAssemblyMetadata("Test.DefaultTargetFramework"); + public string TargetFramework { get; set; } = (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + ? "netcoreapp5.0" + : GetAssemblyMetadata("Test.DefaultTargetFramework"); public string TemplateBuildDir => Path.Combine(TemplateOutputDir, "bin", "Debug", TargetFramework); public string TemplatePublishDir => Path.Combine(TemplateOutputDir, "bin", "Release", TargetFramework, "publish"); @@ -295,15 +306,11 @@ private async Task RestoreAsync(ITestOutputHelper output, string work } } + + internal async Task RunDotNetEfCreateMigrationAsync(string migrationName) { - var assembly = typeof(ProjectFactoryFixture).Assembly; - - var dotNetEfFullPath = assembly.GetCustomAttributes() - .First(attribute => attribute.Key == "DotNetEfFullPath") - .Value; - - var args = $"\"{dotNetEfFullPath}\" --verbose --no-build migrations add {migrationName}"; + var args = $"\"{DotNetEfFullPath}\" --verbose --no-build migrations add {migrationName}"; // Only run one instance of 'dotnet new' at once, as a workaround for // https://github.com/aspnet/templating/issues/63 @@ -322,13 +329,7 @@ internal async Task RunDotNetEfCreateMigrationAsync(string migrationN internal async Task RunDotNetEfUpdateDatabaseAsync() { - var assembly = typeof(ProjectFactoryFixture).Assembly; - - var dotNetEfFullPath = assembly.GetCustomAttributes() - .First(attribute => attribute.Key == "DotNetEfFullPath") - .Value; - - var args = $"\"{dotNetEfFullPath}\" --verbose --no-build database update"; + var args = $"\"{DotNetEfFullPath}\" --verbose --no-build database update"; // Only run one instance of 'dotnet new' at once, as a workaround for // https://github.com/aspnet/templating/issues/63 From 6ea8340af357ac0c63b3f24356738acd5cb751cf Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Feb 2020 13:08:46 -0800 Subject: [PATCH 083/121] Update Project.cs --- src/ProjectTemplates/test/Helpers/Project.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index bbbf429d6d04..f98fa0b3b3ad 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -25,12 +25,12 @@ public class Project .Any(a => a.Key == "ContinuousIntegrationBuild"); public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) - ? Path.Combine("artifacts", "log"); + ? Path.Combine("artifacts", "log") : GetAssemblyMetadata("ArtifactsLogDir"); // FIGURE OUT EF PATH public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) - ? Path.Combine("NuGetPackageRoot", "dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll"); + ? Path.Combine("NuGetPackageRoot", "dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll") : typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes() .First(attribute => attribute.Key == "DotNetEfFullPath") .Value; From b58fb2d4e3194ef8f2a83baf961767f25ca35455 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Feb 2020 23:46:38 -0800 Subject: [PATCH 084/121] Update ProjectFactoryFixture.cs --- src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs b/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs index ffd1b0ae4ffc..d57af3ea415d 100644 --- a/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs +++ b/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs @@ -61,7 +61,9 @@ public async Task GetOrCreateProject(string projectKey, ITestOutputHelp } private static string GetTemplateFolderBasePath(Assembly assembly) => - assembly.GetCustomAttributes() + (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + ? Path.Combine("Templates", "BaseFolder") + : assembly.GetCustomAttributes() .Single(a => a.Key == "TestTemplateCreationFolder") .Value; From 7547e7ad264bec41ac4dac4f63a4d854980e658a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Feb 2020 08:11:19 -0800 Subject: [PATCH 085/121] Fix stuff --- src/ProjectTemplates/test/Helpers/Project.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index f98fa0b3b3ad..f5d3452818b5 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -25,8 +25,8 @@ public class Project .Any(a => a.Key == "ContinuousIntegrationBuild"); public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) - ? Path.Combine("artifacts", "log") - : GetAssemblyMetadata("ArtifactsLogDir"); + ? GetAssemblyMetadata("ArtifactsLogDir") + : Path.Combine("artifacts", "log"); // FIGURE OUT EF PATH public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) @@ -41,9 +41,7 @@ public class Project public string ProjectArguments { get; set; } public string ProjectGuid { get; set; } public string TemplateOutputDir { get; set; } - public string TargetFramework { get; set; } = (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) - ? "netcoreapp5.0" - : GetAssemblyMetadata("Test.DefaultTargetFramework"); + public string TargetFramework { get; set; } = GetAssemblyMetadata("Test.DefaultTargetFramework"); public string TemplateBuildDir => Path.Combine(TemplateOutputDir, "bin", "Debug", TargetFramework); public string TemplatePublishDir => Path.Combine(TemplateOutputDir, "bin", "Release", TargetFramework, "publish"); From 3d07b4c6ee661e0ae5066ea57499369b344e84ee Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Feb 2020 13:48:05 -0800 Subject: [PATCH 086/121] Fix folder resolution --- src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs b/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs index d57af3ea415d..6d1cc7457426 100644 --- a/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs +++ b/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs @@ -62,10 +62,10 @@ public async Task GetOrCreateProject(string projectKey, ITestOutputHelp private static string GetTemplateFolderBasePath(Assembly assembly) => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) - ? Path.Combine("Templates", "BaseFolder") - : assembly.GetCustomAttributes() + ? assembly.GetCustomAttributes() .Single(a => a.Key == "TestTemplateCreationFolder") - .Value; + .Value + : Path.Combine("Templates", "BaseFolder"); public void Dispose() { From c4f2bcc6605fdae7fe22ae04eee40fe0d1739c7a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Feb 2020 18:58:57 -0800 Subject: [PATCH 087/121] Update ProcessEx.cs --- src/ProjectTemplates/test/Helpers/ProcessEx.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/ProcessEx.cs b/src/ProjectTemplates/test/Helpers/ProcessEx.cs index f5bf857996d6..44676166d24f 100644 --- a/src/ProjectTemplates/test/Helpers/ProcessEx.cs +++ b/src/ProjectTemplates/test/Helpers/ProcessEx.cs @@ -189,11 +189,12 @@ public void WaitForExit(bool assertSuccess, TimeSpan? timeSpan = null) } } - private static string GetNugetPackagesRestorePath() => - typeof(ProcessEx).Assembly + private static string GetNugetPackagesRestorePath() => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + ? typeof(ProcessEx).Assembly .GetCustomAttributes() .First(attribute => attribute.Key == "TestPackageRestorePath") - .Value; + .Value + : Path.Combine("nugetRestore", "packages"); public void Dispose() { From 1704910b843052cc789c8988ece6bf71094376ea Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Feb 2020 20:16:59 -0800 Subject: [PATCH 088/121] Update ProcessEx.cs --- src/ProjectTemplates/test/Helpers/ProcessEx.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/Helpers/ProcessEx.cs b/src/ProjectTemplates/test/Helpers/ProcessEx.cs index 44676166d24f..18d67ceb3721 100644 --- a/src/ProjectTemplates/test/Helpers/ProcessEx.cs +++ b/src/ProjectTemplates/test/Helpers/ProcessEx.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Linq; using System.Reflection; using System.Runtime.InteropServices; From e38a0a59021d715b94f496d3ea228f09b210ad1b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Feb 2020 22:17:34 -0800 Subject: [PATCH 089/121] Update TemplatePackageInstaller.cs --- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index bbfc788b3078..d5d876a0878b 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -42,7 +42,7 @@ internal static class TemplatePackageInstaller "Microsoft.AspNetCore.Blazor.Templates", }; - public static string CustomHivePath { get; } = (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + public static string CustomHivePath { get; } = (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) ? typeof(TemplatePackageInstaller) .Assembly.GetCustomAttributes() .Single(s => s.Key == "CustomTemplateHivePath").Value From d91f61da4339a9021042fe6cd765e4cc452c1c8b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Feb 2020 22:18:23 -0800 Subject: [PATCH 090/121] Update Project.cs --- src/ProjectTemplates/test/Helpers/Project.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index f5d3452818b5..569d7768c909 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -30,10 +30,10 @@ public class Project // FIGURE OUT EF PATH public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) - ? Path.Combine("NuGetPackageRoot", "dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll") - : typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes() + ? typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes() .First(attribute => attribute.Key == "DotNetEfFullPath") - .Value; + .Value + : Path.Combine("NuGetPackageRoot", "dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll"); public SemaphoreSlim DotNetNewLock { get; set; } public SemaphoreSlim NodeLock { get; set; } From c902007d0ad99638fffb440f61918d76fcb98100 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 13 Feb 2020 10:40:44 -0800 Subject: [PATCH 091/121] Create nuget restore directory --- eng/helix/content/runtests.cmd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 91752cd57482..3ce9890f9558 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -28,6 +28,10 @@ if EXIST ".\Microsoft.AspNetCore.App" ( set HELIX=%helixQueue% +set NUGET_RESTORE=%cd%\nugetRestore +echo Creating nuget restore directory: %NUGET_RESTORE% +mkdir %NUGET_RESTORE% + dir if (%targetFrameworkIdentifier%==.NETFramework) ( From c8b05dcefb6a701a073aab4efa140fdc1e521cea Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 13 Feb 2020 10:42:01 -0800 Subject: [PATCH 092/121] Update ProcessEx.cs --- src/ProjectTemplates/test/Helpers/ProcessEx.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/ProcessEx.cs b/src/ProjectTemplates/test/Helpers/ProcessEx.cs index 18d67ceb3721..2f3ff961b46e 100644 --- a/src/ProjectTemplates/test/Helpers/ProcessEx.cs +++ b/src/ProjectTemplates/test/Helpers/ProcessEx.cs @@ -190,12 +190,12 @@ public void WaitForExit(bool assertSuccess, TimeSpan? timeSpan = null) } } - private static string GetNugetPackagesRestorePath() => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + private static string GetNugetPackagesRestorePath() => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("NUGET_RESTORE"))) ? typeof(ProcessEx).Assembly .GetCustomAttributes() .First(attribute => attribute.Key == "TestPackageRestorePath") .Value - : Path.Combine("nugetRestore", "packages"); + : Environment.GetEnvironmentVariable("NUGET_RESTORE"); public void Dispose() { From 04c7bf0394d3bc7d97a4311acf1737fe98c3840e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 13 Feb 2020 10:44:29 -0800 Subject: [PATCH 093/121] Update runtests.sh --- eng/helix/content/runtests.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 97ad8b07c986..5ee4b9122c6f 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -32,6 +32,10 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Used by SkipOnHelix attribute export helix="$helix_queue_name" +export NUGET_RESTORE="$DIR/nugetRestore" +echo "Creating nugetRestore directory: $NUGET_RESTORE" +mkdir $NUGET_RESTORE + RESET="\033[0m" RED="\033[0;31m" YELLOW="\033[0;33m" From 7be4e777f5dce32567b55e40a46d21d2d1e991cc Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 10:40:39 -0800 Subject: [PATCH 094/121] Update SeleniumStandaloneServer.cs --- src/Shared/E2ETesting/SeleniumStandaloneServer.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Shared/E2ETesting/SeleniumStandaloneServer.cs b/src/Shared/E2ETesting/SeleniumStandaloneServer.cs index 8ca56542437a..fd0878aec2ff 100644 --- a/src/Shared/E2ETesting/SeleniumStandaloneServer.cs +++ b/src/Shared/E2ETesting/SeleniumStandaloneServer.cs @@ -113,6 +113,13 @@ private static async Task InitializeInstance(ITestOutputHelper output) // It's important that we get the folder value before we start the process to prevent // untracked processes when the tracking folder is not correctly configure. var trackingFolder = GetProcessTrackingFolder(); + if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + { + // Just create a random tracking folder on helix + trackingFolder = Path.Combine(Directory.GetCurrentDirectory(), Path.GetRandomFileName()); + Directory.CreateDirectory(trackingFolder); + } + if (!Directory.Exists(trackingFolder)) { throw new InvalidOperationException($"Invalid tracking folder. Set the 'SeleniumProcessTrackingFolder' MSBuild property to a valid folder."); From d4a767b2d2ddbc067ed5912d2c6453f36c05bf1d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 14:37:58 -0800 Subject: [PATCH 095/121] Set base helix path --- eng/helix/content/runtests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 3ce9890f9558..ede848230003 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -27,7 +27,7 @@ if EXIST ".\Microsoft.AspNetCore.App" ( ) set HELIX=%helixQueue% - +set HELIX_DIR=%cd% set NUGET_RESTORE=%cd%\nugetRestore echo Creating nuget restore directory: %NUGET_RESTORE% mkdir %NUGET_RESTORE% From 785c64b4154d004fcfc28a3cddc5af5f0420b2b5 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 14:38:26 -0800 Subject: [PATCH 096/121] Set helix dir --- eng/helix/content/runtests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 5ee4b9122c6f..e2beb6178172 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -31,6 +31,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Used by SkipOnHelix attribute export helix="$helix_queue_name" +export HELIX_DIR="$DIR" export NUGET_RESTORE="$DIR/nugetRestore" echo "Creating nugetRestore directory: $NUGET_RESTORE" From 5e40ec77b7cfc20969f4310a7fe25a79af65d6f3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 14:39:31 -0800 Subject: [PATCH 097/121] Use full path for templates directories --- src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs b/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs index 6d1cc7457426..9399433be966 100644 --- a/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs +++ b/src/ProjectTemplates/test/Helpers/ProjectFactoryFixture.cs @@ -61,11 +61,11 @@ public async Task GetOrCreateProject(string projectKey, ITestOutputHelp } private static string GetTemplateFolderBasePath(Assembly assembly) => - (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HELIX_DIR"))) ? assembly.GetCustomAttributes() .Single(a => a.Key == "TestTemplateCreationFolder") .Value - : Path.Combine("Templates", "BaseFolder"); + : Path.Combine(Environment.GetEnvironmentVariable("HELIX_DIR"), "Templates", "BaseFolder"); public void Dispose() { From c215cb3326d5f322a3f34cb15a7b234e9d057256 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 18:07:46 -0800 Subject: [PATCH 098/121] create logs dir --- eng/helix/content/runtests.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index ede848230003..9eb377f6eed9 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -31,6 +31,7 @@ set HELIX_DIR=%cd% set NUGET_RESTORE=%cd%\nugetRestore echo Creating nuget restore directory: %NUGET_RESTORE% mkdir %NUGET_RESTORE% +mkdir logs dir From d42e3e44093c37a8a2c2fcd7c8825ca35794370f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 18:08:03 -0800 Subject: [PATCH 099/121] Update runtests.sh --- eng/helix/content/runtests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index e2beb6178172..f0f3b499905e 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -36,6 +36,7 @@ export HELIX_DIR="$DIR" export NUGET_RESTORE="$DIR/nugetRestore" echo "Creating nugetRestore directory: $NUGET_RESTORE" mkdir $NUGET_RESTORE +mkdir logs RESET="\033[0m" RED="\033[0;31m" From e33eb8c99a9da1f751ddec8714bd9d9165196a8c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 14 Feb 2020 18:09:04 -0800 Subject: [PATCH 100/121] Update Project.cs --- src/ProjectTemplates/test/Helpers/Project.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index 569d7768c909..4dd02d20592f 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -24,9 +24,9 @@ public class Project public static bool IsCIEnvironment => typeof(Project).Assembly.GetCustomAttributes() .Any(a => a.Key == "ContinuousIntegrationBuild"); - public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) + public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HELIX_DIR"))) ? GetAssemblyMetadata("ArtifactsLogDir") - : Path.Combine("artifacts", "log"); + : Path.Combine(Environment.GetEnvironmentVariable("HELIX_DIR"), "logs"); // FIGURE OUT EF PATH public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))) From 364493526d4144799e03c9e9c4adb5a79a0d86f4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 09:28:42 -0800 Subject: [PATCH 101/121] Add skip on helix ref --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index d5c0b6240853..34b3f9c00a75 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -27,6 +27,7 @@ + From 7d05178b328bd9e037dad126aeb3641cbafa7490 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 09:29:56 -0800 Subject: [PATCH 102/121] Skip EF tests for now --- src/ProjectTemplates/test/RazorPagesTemplateTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs index ad7c967d48d6..64cf2f8f13b7 100644 --- a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs @@ -93,9 +93,10 @@ public async Task RazorPagesTemplate_NoAuth() } } - [Theory] + [ConditionalTheory] [InlineData(false)] [InlineData(true)] + [SkipOnHelix("ef restore no worky")] public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB) { Project = await ProjectFactory.GetOrCreateProject("razorpagesindividual" + (useLocalDB ? "uld" : ""), Output); From 581dbe9d500f896703eb66480788ecbd1f971b60 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 09:31:08 -0800 Subject: [PATCH 103/121] Skip EF tests --- src/ProjectTemplates/test/MvcTemplateTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs index c810a45b6842..33a4b84044a3 100644 --- a/src/ProjectTemplates/test/MvcTemplateTest.cs +++ b/src/ProjectTemplates/test/MvcTemplateTest.cs @@ -103,9 +103,10 @@ private async Task MvcTemplateCore(string languageOverride) } } - [Theory] + [ConditionalTheory] [InlineData(true)] [InlineData(false)] + [SkipOnHelix("ef restore no worky")] public async Task MvcTemplate_IndividualAuth(bool useLocalDB) { Project = await ProjectFactory.GetOrCreateProject("mvcindividual" + (useLocalDB ? "uld" : ""), Output); From 34b8d05ad182a0130af7c73ba235b99d0fd0c708 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 09:32:11 -0800 Subject: [PATCH 104/121] Skip EF tests --- src/ProjectTemplates/test/IdentityUIPackageTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/IdentityUIPackageTest.cs b/src/ProjectTemplates/test/IdentityUIPackageTest.cs index deede64521a5..74c587273d1a 100644 --- a/src/ProjectTemplates/test/IdentityUIPackageTest.cs +++ b/src/ProjectTemplates/test/IdentityUIPackageTest.cs @@ -117,8 +117,9 @@ public static TheoryData, string, string[]> MSBuildI "Identity/lib/jquery-validation-unobtrusive/LICENSE.txt", }; - [Theory] + [ConditionalTheory] [MemberData(nameof(MSBuildIdentityUIPackageOptions))] + [SkipOnHelix("ef restore no worky")] public async Task IdentityUIPackage_WorksWithDifferentOptions(IDictionary packageOptions, string versionValidator, string[] expectedFiles) { Project = await ProjectFactory.GetOrCreateProject("identityuipackage" + string.Concat(packageOptions.Values), Output); From c4128d44457d10ec29fc775134136a6c642acde5 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 09:33:21 -0800 Subject: [PATCH 105/121] Skip EF tests --- src/ProjectTemplates/test/BlazorServerTemplateTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs index 463b710ac35b..88464918569e 100644 --- a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs +++ b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs @@ -79,9 +79,10 @@ public async Task BlazorServerTemplateWorks_NoAuth() } } - [Theory] + [ConditionalTheory] [InlineData(true)] [InlineData(false)] + [SkipOnHelix("ef restore no worky")] public async Task BlazorServerTemplateWorks_IndividualAuth(bool useLocalDB) { Project = await ProjectFactory.GetOrCreateProject("blazorserverindividual" + (useLocalDB ? "uld" : ""), Output); From 4b937869a57d2e308479301ccfbdecfbae232677 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 09:38:03 -0800 Subject: [PATCH 106/121] Include all shipping packages for restore --- eng/targets/Helix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index bb038752f5f2..5c12eba304ce 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -58,7 +58,7 @@ - + From c28b82f17a85e76cab1f6cb168a541ad51ffac96 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 11:20:11 -0800 Subject: [PATCH 107/121] Update IdentityUIPackageTest.cs --- src/ProjectTemplates/test/IdentityUIPackageTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/IdentityUIPackageTest.cs b/src/ProjectTemplates/test/IdentityUIPackageTest.cs index 74c587273d1a..fe794a3629bb 100644 --- a/src/ProjectTemplates/test/IdentityUIPackageTest.cs +++ b/src/ProjectTemplates/test/IdentityUIPackageTest.cs @@ -5,6 +5,7 @@ using System.IO; using System.Net; using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing; using Templates.Test.Helpers; using Xunit; using Xunit.Abstractions; From 7f23917e3489702b8635d15b33b9a71c4047b36a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 11:22:03 -0800 Subject: [PATCH 108/121] Try to set nuget fallback packages dir --- eng/helix/content/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index f0f3b499905e..43c99b5d07e8 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -32,7 +32,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Used by SkipOnHelix attribute export helix="$helix_queue_name" export HELIX_DIR="$DIR" - +export NUGET_FALLBACK_PACKAGES="$DIR" export NUGET_RESTORE="$DIR/nugetRestore" echo "Creating nugetRestore directory: $NUGET_RESTORE" mkdir $NUGET_RESTORE From ccc53257257149988e33fca347d3e30ca4947557 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 11:22:33 -0800 Subject: [PATCH 109/121] Try to set nuget restore dir --- eng/helix/content/runtests.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 9eb377f6eed9..7bfb591062d4 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -28,6 +28,7 @@ if EXIST ".\Microsoft.AspNetCore.App" ( set HELIX=%helixQueue% set HELIX_DIR=%cd% +set NUGET_FALLBACK_PACKAGES=%HELIX_DIR% set NUGET_RESTORE=%cd%\nugetRestore echo Creating nuget restore directory: %NUGET_RESTORE% mkdir %NUGET_RESTORE% From 1dd3ed4eb32d0c6609b5a513809282fd50c3ae32 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 15:44:18 -0800 Subject: [PATCH 110/121] skip razor class lib --- src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs b/src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs index 0d02a56f8f84..f8d6bd65b590 100644 --- a/src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs @@ -5,6 +5,7 @@ using Templates.Test.Helpers; using Xunit; using Xunit.Abstractions; +using Microsoft.AspNetCore.Testing; namespace Templates.Test { @@ -40,7 +41,8 @@ public async Task RazorClassLibraryTemplate_WithViews_Async() Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult)); } - [Fact] + [ConditionalFact] + [SkipOnHelix("restore no worky")] public async Task RazorClassLibraryTemplateAsync() { Project = await ProjectFactory.GetOrCreateProject("razorclasslib", Output); From 90f9629fe2eb9bc77231964c81e7dd5501006858 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 15:46:12 -0800 Subject: [PATCH 111/121] Update WorkerTemplateTest.cs --- src/ProjectTemplates/test/WorkerTemplateTest.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/WorkerTemplateTest.cs b/src/ProjectTemplates/test/WorkerTemplateTest.cs index 738eafc61d6a..0299f17a1187 100644 --- a/src/ProjectTemplates/test/WorkerTemplateTest.cs +++ b/src/ProjectTemplates/test/WorkerTemplateTest.cs @@ -5,6 +5,7 @@ using Templates.Test.Helpers; using Xunit; using Xunit.Abstractions; +using Microsoft.AspNetCore.Testing; namespace Templates.Test { @@ -20,7 +21,8 @@ public WorkerTemplateTest(ProjectFactoryFixture projectFactory, ITestOutputHelpe public ProjectFactoryFixture ProjectFactory { get; } public ITestOutputHelper Output { get; } - [Fact] + [ConditionalFact] + [SkipOnHelix("restore no worky")] public async Task WorkerTemplateAsync() { Project = await ProjectFactory.GetOrCreateProject("worker", Output); From f3cc4ba72344cecc9aa79a788e73e8d3ae395543 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 15:46:46 -0800 Subject: [PATCH 112/121] Update runtests.sh --- eng/helix/content/runtests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 43c99b5d07e8..07c9396444f3 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -38,6 +38,8 @@ echo "Creating nugetRestore directory: $NUGET_RESTORE" mkdir $NUGET_RESTORE mkdir logs +ls -la + RESET="\033[0m" RED="\033[0;31m" YELLOW="\033[0;33m" From 99921d705dfdd78ed1b55abcc3e88a85af83266c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 16:57:14 -0800 Subject: [PATCH 113/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 7bfb591062d4..ba8a03fd94bc 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -30,6 +30,7 @@ set HELIX=%helixQueue% set HELIX_DIR=%cd% set NUGET_FALLBACK_PACKAGES=%HELIX_DIR% set NUGET_RESTORE=%cd%\nugetRestore +echo "Setting HELIX_DIR: %HELIX_DIR%" echo Creating nuget restore directory: %NUGET_RESTORE% mkdir %NUGET_RESTORE% mkdir logs From c2df878b59646581d8eaa3a1d27ad1c447104259 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 18 Feb 2020 16:59:27 -0800 Subject: [PATCH 114/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index ba8a03fd94bc..541afc9922fd 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -26,8 +26,9 @@ if EXIST ".\Microsoft.AspNetCore.App" ( xcopy /i /y ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\ ) +echo "Current Directory: %CD" set HELIX=%helixQueue% -set HELIX_DIR=%cd% +set HELIX_DIR=%CD% set NUGET_FALLBACK_PACKAGES=%HELIX_DIR% set NUGET_RESTORE=%cd%\nugetRestore echo "Setting HELIX_DIR: %HELIX_DIR%" From 5fe430e89e651500c03635db8cee396ff5eef1f5 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 10:04:05 -0800 Subject: [PATCH 115/121] Try helix workitem root --- eng/helix/content/runtests.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 541afc9922fd..b3ba077ed721 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -26,9 +26,9 @@ if EXIST ".\Microsoft.AspNetCore.App" ( xcopy /i /y ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\ ) -echo "Current Directory: %CD" +echo "Current Directory: %HELIX_WORKITEM_ROOT%" set HELIX=%helixQueue% -set HELIX_DIR=%CD% +set HELIX_DIR=%HELIX_WORKITEM_ROOT% set NUGET_FALLBACK_PACKAGES=%HELIX_DIR% set NUGET_RESTORE=%cd%\nugetRestore echo "Setting HELIX_DIR: %HELIX_DIR%" From 647fa7d5ddf0b5ed70ebdfc24c2c68c2d400a13f Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 12:55:19 -0800 Subject: [PATCH 116/121] Update runtests.cmd --- eng/helix/content/runtests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index b3ba077ed721..7c2c88b7f129 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -30,7 +30,7 @@ echo "Current Directory: %HELIX_WORKITEM_ROOT%" set HELIX=%helixQueue% set HELIX_DIR=%HELIX_WORKITEM_ROOT% set NUGET_FALLBACK_PACKAGES=%HELIX_DIR% -set NUGET_RESTORE=%cd%\nugetRestore +set NUGET_RESTORE=%HELIX_DIR%\nugetRestore echo "Setting HELIX_DIR: %HELIX_DIR%" echo Creating nuget restore directory: %NUGET_RESTORE% mkdir %NUGET_RESTORE% From 6bed900dd4aab0d224199982174ce43c9e0ba2d6 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 12:57:47 -0800 Subject: [PATCH 117/121] Update AngularTemplateTest.cs --- .../test/SpaTemplateTest/AngularTemplateTest.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs b/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs index e1d5db13388e..fc7877518925 100644 --- a/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs +++ b/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs @@ -15,15 +15,18 @@ public class AngularTemplateTest : SpaTemplateTestBase public AngularTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixture browserFixture, ITestOutputHelper output) : base(projectFactory, browserFixture, output) { } - [Fact] + [ConditionalFact] + [SkipOnHelix("selenium")] public Task AngularTemplate_Works() => SpaTemplateImplAsync("angularnoauth", "angular", useLocalDb: false, usesAuth: false); - [Fact] + [ConditionalFact] + [SkipOnHelix("selenium")] public Task AngularTemplate_IndividualAuth_Works() => SpaTemplateImplAsync("angularindividual", "angular", useLocalDb: false, usesAuth: true); - [Fact] + [ConditionalFact] + [SkipOnHelix("selenium")] public Task AngularTemplate_IndividualAuth_Works_LocalDb() => SpaTemplateImplAsync("angularindividualuld", "angular", useLocalDb: true, usesAuth: true); } From 8133a27015950b675e7ff41dcd4b10bde7ea77f0 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 12:58:08 -0800 Subject: [PATCH 118/121] Update ReactTemplateTest.cs --- .../test/SpaTemplateTest/ReactTemplateTest.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs index 469e87acd560..a2e1c1c36859 100644 --- a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs +++ b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs @@ -17,15 +17,18 @@ public ReactTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixture br { } - [Fact] + [ConditionalFact] + [SkipOnHelix("selenium")] public Task ReactTemplate_Works_NetCore() => SpaTemplateImplAsync("reactnoauth", "react", useLocalDb: false, usesAuth: false); - [Fact] + [ConditionalFact] + [SkipOnHelix("selenium")] public Task ReactTemplate_IndividualAuth_NetCore() => SpaTemplateImplAsync("reactindividual", "react", useLocalDb: false, usesAuth: true); - [Fact] + [ConditionalFact] + [SkipOnHelix("selenium")] public Task ReactTemplate_IndividualAuth_NetCore_LocalDb() => SpaTemplateImplAsync("reactindividualuld", "react", useLocalDb: true, usesAuth: true); } From dcdf5b07931d7e096e998995bfe5dfd3e6cec7b8 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 12:59:28 -0800 Subject: [PATCH 119/121] Update BlazorWasmTemplateTest.cs --- src/ProjectTemplates/test/BlazorWasmTemplateTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs index 0a6ea40f834c..c2662c78c6e8 100644 --- a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs +++ b/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs @@ -54,7 +54,8 @@ public async Task BlazorWasmStandaloneTemplate_Works() TestBasicNavigation(project.ProjectName); } - [Fact] + [ConditionalFact] + [SkipOnHelix("npm")] public async Task BlazorWasmHostedTemplate_Works() { var project = await ProjectFactory.GetOrCreateProject("blazorhosted", Output); From 0523a296c306dc6f23fde05802fa5580acc5d515 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 13:01:49 -0800 Subject: [PATCH 120/121] Update ByteOrderMarkTest.cs --- src/ProjectTemplates/test/ByteOrderMarkTest.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/ByteOrderMarkTest.cs b/src/ProjectTemplates/test/ByteOrderMarkTest.cs index df7acd2f4ddd..76600bf9e287 100644 --- a/src/ProjectTemplates/test/ByteOrderMarkTest.cs +++ b/src/ProjectTemplates/test/ByteOrderMarkTest.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Text; +using Microsoft.AspNetCore.Testing; using Xunit; using Xunit.Abstractions; @@ -19,7 +20,8 @@ public ByteOrderMarkTest(ITestOutputHelper output) _output = output; } - [Theory] + [ConditionalTheory] + [SkipOnHelix("missing files")] [InlineData("Web.ProjectTemplates")] [InlineData("Web.Spa.ProjectTemplates")] public void JSAndJSONInAllTemplates_ShouldNotContainBOM(string projectName) @@ -60,7 +62,8 @@ public void JSAndJSONInAllTemplates_ShouldNotContainBOM(string projectName) Assert.False(filesWithBOMCharactersPresent); } - [Fact] + [ConditionalFact] + [SkipOnHelix("missing files")] public void RazorFilesInWebProjects_ShouldContainBOM() { var projectName = "Web.ProjectTemplates"; From acda40bfae9b44b2aab5d61036fbbc7ecc9434ce Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 19 Feb 2020 15:03:33 -0800 Subject: [PATCH 121/121] Update BlazorWasmTemplateTest.cs --- src/ProjectTemplates/test/BlazorWasmTemplateTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs index c2662c78c6e8..a9df43a935f9 100644 --- a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs +++ b/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.E2ETesting; using Microsoft.Extensions.CommandLineUtils; +using Microsoft.AspNetCore.Testing; using OpenQA.Selenium; using Templates.Test.Helpers; using Xunit;