From fa43422dc7e510a02a04a273474ae01bd9e87e9b Mon Sep 17 00:00:00 2001 From: "David R. Williamson" Date: Fri, 14 Oct 2022 13:35:45 -0700 Subject: [PATCH] Update E2E test version references --- e2e/test/E2ETests.csproj | 13 +++++-------- vsts/build-test-nuget.yml | 7 ------- vsts/releaseTest.ps1 | 30 +++++++++++++++--------------- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/e2e/test/E2ETests.csproj b/e2e/test/E2ETests.csproj index bccdcf6eb8..78c65d48d7 100644 --- a/e2e/test/E2ETests.csproj +++ b/e2e/test/E2ETests.csproj @@ -42,13 +42,10 @@ - - - - - - - - + + + + + diff --git a/vsts/build-test-nuget.yml b/vsts/build-test-nuget.yml index 10b558bcf6..7938790f27 100644 --- a/vsts/build-test-nuget.yml +++ b/vsts/build-test-nuget.yml @@ -62,8 +62,6 @@ jobs: FRAMEWORK: netcoreapp2.1.30 .Net Framwork 4.7.2: FRAMEWORK: net472 - .Net Framework 4.5.1: - FRAMEWORK: net451 condition: and(succeeded(), ne(variables.runTests, 'false')) dependsOn: Build_Packages @@ -122,11 +120,6 @@ jobs: version: 2.1.x performMultiLevelLookup: true installationPath: $(Agent.ToolsDirectory)/net - -# - script: | -# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -# sn -Vr *,31bf3856ad364e35 -# displayName: 'Disable strong name validation' - script: | choco install -y squid diff --git a/vsts/releaseTest.ps1 b/vsts/releaseTest.ps1 index a8ff1f6afa..70868cf3ee 100644 --- a/vsts/releaseTest.ps1 +++ b/vsts/releaseTest.ps1 @@ -2,14 +2,14 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. Function IsWindows() { - return ([Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT) + return ([Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT) } if (isWindows) { - Write-Host Start ETL logging - logman create trace IotTrace -o iot.etl -pf tools/CaptureLogs/iot_providers.txt - logman start IotTrace + Write-Host Start ETL logging + logman create trace IotTrace -o iot.etl -pf tools/CaptureLogs/iot_providers.txt + logman start IotTrace } Write-Host List active docker containers @@ -26,20 +26,20 @@ Invoke-Expression $runTestCmd $gateFailed = $LASTEXITCODE -if (isWindows) +if (isWindows) { - Write-Host Stop ETL logging - logman stop IotTrace - logman delete IotTrace + Write-Host Stop ETL logging + logman stop IotTrace + logman delete IotTrace } -if ($gateFailed) +if ($gateFailed) { - Write-Error "Testing was not successful, exiting..." - exit 1 + Write-Error "Testing was not successful, exiting..." + exit 1 } -else +else { - Write-Host "Testing was successful!" - exit 0 -} \ No newline at end of file + Write-Host "Testing was successful!" + exit 0 +}