Skip to content

Commit

Permalink
Update E2E test version references
Browse files Browse the repository at this point in the history
  • Loading branch information
drwill-ms committed Oct 14, 2022
1 parent 16e31c5 commit fa43422
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 30 deletions.
13 changes: 5 additions & 8 deletions e2e/test/E2ETests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,10 @@
</ItemGroup>

<ItemGroup Condition=" '$(AZURE_IOT_LOCALPACKAGES)' != '' ">
<PackageReference Include="Microsoft.Azure.Devices" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Authentication" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Client" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Amqp" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Http" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Transport.Mqtt" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.*" />
<PackageReference Include="Microsoft.Azure.Devices" Version="2.*" />
<PackageReference Include="Microsoft.Azure.Devices.Authentication" Version="2.*" />
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="2.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Client" Version="2.*" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="2.*" />
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions vsts/build-test-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions vsts/releaseTest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Write-Host "Testing was successful!"
exit 0
}

0 comments on commit fa43422

Please sign in to comment.