From 3d827a6413bfd5bc0bd0bc94b7ef7c0bcf55113d Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 25 Jun 2021 11:37:23 +0200 Subject: [PATCH 1/2] Added SDK intall script --- scripts/Install-WindowsSDK.ps1 | 34 +++++++++++++++++++ scripts/PortableToFullPdb.ps1 | 4 ++- scripts/verify-sign.ps1 | 4 ++- scripts/write-release-notes.ps1 | 3 ++ .../Automation.CLI/CLITestBase.common.cs | 2 +- 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 scripts/Install-WindowsSDK.ps1 diff --git a/scripts/Install-WindowsSDK.ps1 b/scripts/Install-WindowsSDK.ps1 new file mode 100644 index 000000000..9241f6bf3 --- /dev/null +++ b/scripts/Install-WindowsSDK.ps1 @@ -0,0 +1,34 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + +function Write-Log ([string] $message, $messageColor = "Green") { + $currentColor = $Host.UI.RawUI.ForegroundColor + $Host.UI.RawUI.ForegroundColor = $messageColor + if ($message) { + Write-Output "... $message" + } + $Host.UI.RawUI.ForegroundColor = $currentColor +} + +Push-Location +try { + Write-Log "Downloading the Windows SDK 10.0.14393.795..." + Invoke-WebRequest -Method Get -Uri https://go.microsoft.com/fwlink/p/?LinkId=838916 -OutFile sdksetup.exe -UseBasicParsing + + Write-Log "Installing the Windows SDK, setup might request elevation please approve." + $process = Start-Process -Wait sdksetup.exe -ArgumentList "/quiet", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit" -PassThru + Remove-Item sdksetup.exe -Force + + if($process.ExitCode -eq 0) + { + Write-Log "Done" + } + else + { + Write-Log "Failed (Exit code: $($process.ExitCode))" -messageColor "Red" + } +} +finally { + Pop-Location +} + diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1 index d9b1f5fbe..ce9de1725 100644 --- a/scripts/PortableToFullPdb.ps1 +++ b/scripts/PortableToFullPdb.ps1 @@ -1,4 +1,6 @@ -# Copyright (c) Microsoft. All rights reserved. +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + # Portable to Full PDB conversion script for Test Platform. [CmdletBinding()] diff --git a/scripts/verify-sign.ps1 b/scripts/verify-sign.ps1 index 8da29e137..5f34d6731 100644 --- a/scripts/verify-sign.ps1 +++ b/scripts/verify-sign.ps1 @@ -1,4 +1,6 @@ -# Copyright (c) Microsoft. All rights reserved. +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + # Build script for Test Platform. [CmdletBinding()] diff --git a/scripts/write-release-notes.ps1 b/scripts/write-release-notes.ps1 index 81c33004d..a2332a986 100644 --- a/scripts/write-release-notes.ps1 +++ b/scripts/write-release-notes.ps1 @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + [CmdletBinding()] param ( diff --git a/test/E2ETests/Automation.CLI/CLITestBase.common.cs b/test/E2ETests/Automation.CLI/CLITestBase.common.cs index 3754d3c1d..e00555ca8 100644 --- a/test/E2ETests/Automation.CLI/CLITestBase.common.cs +++ b/test/E2ETests/Automation.CLI/CLITestBase.common.cs @@ -17,7 +17,7 @@ public partial class CLITestBase private const string PackagesFolder = "packages"; // This value is automatically updated by "build.ps1" script. - private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\17.0.0-preview-20210520-02"; + private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\17.0.0-preview-20210624-09"; private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe"; /// From 6e0160fd7656d614337e4d94518ba44ace671347 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 25 Jun 2021 12:18:55 +0200 Subject: [PATCH 2/2] Add missing framework references for WinUI. * Added missing framework references * Updated license headers on PowerShell files * Included a script to install required Windows SDK --- scripts/Install-WindowsSDK.ps1 | 40 ++++++------------- .../Extension.WinUI/Extension.WinUI.csproj | 5 +++ 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/scripts/Install-WindowsSDK.ps1 b/scripts/Install-WindowsSDK.ps1 index 9241f6bf3..ceed45282 100644 --- a/scripts/Install-WindowsSDK.ps1 +++ b/scripts/Install-WindowsSDK.ps1 @@ -1,34 +1,18 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT license. See LICENSE file in the project root for full license information. -function Write-Log ([string] $message, $messageColor = "Green") { - $currentColor = $Host.UI.RawUI.ForegroundColor - $Host.UI.RawUI.ForegroundColor = $messageColor - if ($message) { - Write-Output "... $message" - } - $Host.UI.RawUI.ForegroundColor = $currentColor -} - -Push-Location -try { - Write-Log "Downloading the Windows SDK 10.0.14393.795..." - Invoke-WebRequest -Method Get -Uri https://go.microsoft.com/fwlink/p/?LinkId=838916 -OutFile sdksetup.exe -UseBasicParsing +Write-Host "Downloading Windows SDK 10.0.14393.795..." -ForegroundColor Green +Invoke-WebRequest -Method Get -Uri https://go.microsoft.com/fwlink/p/?LinkId=838916 -OutFile sdksetup.exe -UseBasicParsing - Write-Log "Installing the Windows SDK, setup might request elevation please approve." - $process = Start-Process -Wait sdksetup.exe -ArgumentList "/quiet", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit" -PassThru - Remove-Item sdksetup.exe -Force +Write-Host "Installing Windows SDK, if setup requests elevation please approve." -ForegroundColor Green +$process = Start-Process -Wait sdksetup.exe -ArgumentList "/quiet", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit" -PassThru +Remove-Item sdksetup.exe -Force - if($process.ExitCode -eq 0) - { - Write-Log "Done" - } - else - { - Write-Log "Failed (Exit code: $($process.ExitCode))" -messageColor "Red" - } +if($process.ExitCode -eq 0) +{ + Write-Host "Done" -ForegroundColor Green } -finally { - Pop-Location -} - +else +{ + Write-Error "Failed to install Windows SDK (Exit code: $($process.ExitCode))" +} \ No newline at end of file diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj index a5bbdfdf2..5ba1aef9a 100644 --- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj +++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj @@ -20,6 +20,11 @@ false win10-x86;win10-x64;win10-arm64 + + + + +