From c41abd9fd63f388bec8783f20b9f9fbb33c06984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Habinshuti?= Date: Thu, 20 May 2021 22:08:46 +0300 Subject: [PATCH] Setup crank for performance tests (#2091) * Configure crank benchmarks * Add benchmark instructions to docs * Update docs * Update project and solution to fix builds in crank agent * Run benchmarks against other branches * Fix PerformanceBuild.ps1 * Fix issues * Remove obsolete log statement * Address review comments * Fix whitespace --- PerformanceBuild.ps1 | 24 +- README.md | 86 ++++ benchmarks.yml | 82 ++++ sln/OData.Tests.Performance.sln | 251 ++++-------- .../Common/Models/ExchangeAttachment.csdl | 20 +- ...ft.OData.Performance.ComponentTests.csproj | 377 ++---------------- .../ODataReader/ODataReaderFeedTests.cs | 4 +- .../ODataReader/PayloadGenerator.cs | 2 +- .../Scenario/BatchRoundTripPerfTest.cs | 4 +- .../Scenario/BinaryDataScaleTests.cs | 4 +- .../UriParser/UriParserTests.cs | 4 +- .../ComponentTests/app.config | 23 -- .../ComponentTests/packages.config | 81 ---- .../ServiceTests/AssemblyInfo.cs | 3 - .../Common/HttpWebRequestMessage.cs | 2 +- .../ServiceTests/Common/TestServiceFixture.cs | 33 +- ...soft.OData.Performance.ServiceTests.csproj | 339 +--------------- .../ServiceTests/SimpleQueryTests.cs | 2 +- .../ServiceTests/UpdateTests.cs | 2 - test/PerformanceTests/ServiceTests/app.config | 23 -- .../ServiceTests/packages.config | 79 ---- 21 files changed, 338 insertions(+), 1107 deletions(-) create mode 100644 benchmarks.yml delete mode 100644 test/PerformanceTests/ComponentTests/app.config delete mode 100644 test/PerformanceTests/ComponentTests/packages.config delete mode 100644 test/PerformanceTests/ServiceTests/AssemblyInfo.cs delete mode 100644 test/PerformanceTests/ServiceTests/app.config delete mode 100644 test/PerformanceTests/ServiceTests/packages.config diff --git a/PerformanceBuild.ps1 b/PerformanceBuild.ps1 index 3b81d36568..bfb6ce38ad 100644 --- a/PerformanceBuild.ps1 +++ b/PerformanceBuild.ps1 @@ -14,33 +14,25 @@ If("Debug","Release" -notcontains $Config) Function ExecuteTests { Param( - [string]$projectRoot, + [string]$projectPath, [string]$config, - [string]$servicePath, - [string]$baseName + [string]$servicePath ) - - $exeName = "$baseName.exe" - $exePath = "$projectRoot\bin\$config\$exeName"; - - Write-Host "*** Building tests project $projectRoot***" - dotnet build -c $config $projectRoot + Write-Host "*** Running tests project $projectPath***" + dotnet run -c $config --project $projectPath -- --filter * if($LASTEXITCODE -eq 0) { - Write-Host "Build $projectRoot SUCCESS" -ForegroundColor Green + Write-Host "$projectPath SUCCESS" -ForegroundColor Green write-host "`n" } else { - Write-Host "Build FAILED" -ForegroundColor Red + Write-Host "FAILED" -ForegroundColor Red exit } - Write-Host "Running $exePath tests..."; - &$exePath --filter * --envVars ServicePath:"$servicePath" - } @@ -48,5 +40,5 @@ $location = Get-Location $testServicePath = "$location\test\PerformanceTests\Framework\TestService" $perfTestsRoot = "$location\test\PerformanceTests" -ExecuteTests "$perfTestsRoot\ComponentTests" $Config $testServicePath "Microsoft.OData.Performance.Component.Tests" -ExecuteTests "$perfTestsRoot\ServiceTests" $Config $testServicePath "Microsoft.OData.Performance.Service.Tests" +ExecuteTests "$perfTestsRoot\ComponentTests\Microsoft.OData.Performance.ComponentTests.csproj" $Config $testServicePath +ExecuteTests "$perfTestsRoot\ServiceTests\Microsoft.OData.Performance.ServiceTests.csproj" $Config $testServicePath diff --git a/README.md b/README.md index 194e5143ff..07f081fbe5 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,92 @@ You can query the latest nightly NuGet packages using this query: [MAGIC OData q The release of the component binaries is carried out regularly through [Nuget](http://www.nuget.org/). +### 3.6 Performance benchmarks + +#### Installation + +The easiest way to run the perf benchmarks is to use the [Microsoft.Crank](https://github.com/dotnet/crank) toolset. + +- Install the [Crank controller](https://www.nuget.org/packages/Microsoft.Crank.Controller), the CLI used to run benchmarks: + + ```text + dotnet tool install -g Microsoft.Crank.Controller --version "0.2.0-*" + ``` +- Install the [Crank agent](https://www.nuget.org/packages/Microsoft.Crank.Agent), service that executes benchmark jobs. This should be installed on the server(s) where the benchmarks will run. Install locally if you intend to run benchmarks locally. + + ```text + dotnet tool install -g Microsoft.Crank.Agent --version "0.2.0-*" + ``` +- Verify installation was complete by running: + + ```text + crank + ``` + +#### Start the agent + +- Start the agent by running the following command.: + + ```text + crank-agent + ``` + + Once the agent has started, you should see output like: + + ```text + Now listening on: http://[::]:5010 + ... + Agent ready, waiting for jobs... + ``` + +#### Run benchmarks locally + +- Run benchmarks for different components (reader, writer, batch, URI parser, etc.) using in-memory payloads: + + ```text + crank --config benchmarks.yml --scenario Components --profile local + ``` + +- Run benchmarks for end-to-end scenarios against a local OData service: + + ```text + crank --config benchmarks.yml --scenario Service --profile local + ``` + +- Run only ODataReader tests: + + ```text + crank --config benchmarks.yml --scenario Reader --profile local + ``` +- Run only ODataWriter tests: + + ```text + crank --config benchmarks.yml --scenario Writer --profile local + ``` + +- Run only UriParser tests: + + ```text + crank --config benchmarks.yml --scenario UriParser --profile local + ``` + +#### Run benchmarks against the official repo + +To run benchmarks against the official repo instead of your local repo, pass +the `base=true` variable to the command, e.g.: + +```text +crank --config benchmarks.yml --scenario Service --profile local --variable base=true +``` + +This will cause the crank agent to clone the official repo and run the tests against the `master` branch. + +You can specify a different branch, commit or tag using the `baseBranch` variable: + +```text +crank --config benchmarks.yml --scenario Service --profile local --variable base=true --variable baseBranch=v7.6.4 +``` + ## 4. Documentation Please visit the [ODataLib docs](https://docs.microsoft.com/en-us/odata/) on docs.microsoft.com. It has detailed descriptions on each feature provided by OData lib, how to use the OData .Net Client to consume OData service etc. diff --git a/benchmarks.yml b/benchmarks.yml new file mode 100644 index 0000000000..7e3ec57577 --- /dev/null +++ b/benchmarks.yml @@ -0,0 +1,82 @@ + +variables: + # set to true to run benchmarks against master branch of main/official repo + base: false + # the branch of the official repo against which to run the benchmarks + baseBranch: master + # this script sets the source for the benchmarks to either the official repo + # or the local directory based on the base variable + setSourceScript: | + if (job.variables && job.variables.base && job.variables.base.toString() === 'true') { + const branch = (job.variables && job.variables.baseBranch && job.variables.baseBranch.toString()) || 'master'; + console.log('Run benchmarks against official repository branch', branch); + job.source.repository = 'https://github.com/OData/odata.net'; + job.source.branchOrCommit = branch; + } + else { + console.log('Run benchmarks against local repository'); + job.source.localFolder = '.'; + } + +jobs: + components: + source: + project: test/PerformanceTests/ComponentTests/Microsoft.OData.Performance.ComponentTests.csproj + variables: + filter: "*" + jobType: short + base: "{{base}}" + baseBranch: "{{baseBranch}}" + arguments: "--job {{jobType}} --filter {{filter}} --memory" + options: + benchmarkDotNet: true + onConfigure: + - "{{setSourceScript}}" + service: + source: + project: test/PerformanceTests/ServiceTests/Microsoft.OData.Performance.ServiceTests.csproj + variables: + filter: "*" + jobType: short + base: "{{base}}" + baseBranch: "{{baseBranch}}" + framework: netcoreapp3.1 + arguments: "--job {{jobType}} --filter {{filter}} --memory" + options: + benchmarkDotNet: true + onConfigure: + - "{{setSourceScript}}" + +scenarios: + Reader: + application: + job: components + variables: + filter: "*ODataReader*" + Writer: + application: + job: components + variables: + filter: "*ODataWriter*" + UriParser: + application: + job: component + variables: + filter: "*UriParser*" + Components: + application: + job: components + variables: + filter: "*" + Service: + application: + job: service + variables: + filter: "*" + +profiles: + local: + jobs: + application: + endpoints: + - http://localhost:5010 diff --git a/sln/OData.Tests.Performance.sln b/sln/OData.Tests.Performance.sln index df40fa1f2a..0f085adb36 100644 --- a/sln/OData.Tests.Performance.sln +++ b/sln/OData.Tests.Performance.sln @@ -1,214 +1,113 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.30225.117 +VisualStudioVersion = 16.0.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Performance.ComponentTests", "..\test\PerformanceTests\ComponentTests\Microsoft.OData.Performance.ComponentTests.csproj", "{7D98AD3B-6685-498A-834C-F18F7FAE9138}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Performance.ComponentTests", "..\test\PerformanceTests\ComponentTests\Microsoft.OData.Performance.ComponentTests.csproj", "{C6597816-0F99-43A5-9CC7-65E50424E19C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core", "..\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj", "{989A83CC-B864-4A75-8BF3-5EDA99203A86}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core", "..\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj", "{36474603-9759-4C07-891D-B95783834543}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm", "..\src\Microsoft.OData.Edm\Microsoft.OData.Edm.csproj", "{7D921888-FE03-4C3F-80FE-2F624505461C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm", "..\src\Microsoft.OData.Edm\Microsoft.OData.Edm.csproj", "{E0A278D2-6D04-4836-9051-B4F76298EBCC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial", "..\src\Microsoft.Spatial\Microsoft.Spatial.csproj", "{5D921888-FE03-4C3F-40FE-2F624505461D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial", "..\src\Microsoft.Spatial\Microsoft.Spatial.csproj", "{146EBB21-DCEB-426B-8FB3-5A0EE02005C7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{178B9566-29C6-4CB9-B761-C99386E32D4C}" - ProjectSection(SolutionItems) = preProject - .nuget\packages.config = .nuget\packages.config - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Performance.ServiceTests", "..\test\PerformanceTests\ServiceTests\Microsoft.OData.Performance.ServiceTests.csproj", "{8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ODataSamples.Services.Core", "..\test\EndToEndTests\Services\ODataWCFLibrary\ODataSamples.Services.Core.csproj", "{DF028E55-CE75-4F32-822E-F9EC9C756AE2}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BDF3F6A-05CE-4B19-B6C5-1C24BB289E05}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Performance.ServiceTests", "..\test\PerformanceTests\ServiceTests\Microsoft.OData.Performance.ServiceTests.csproj", "{1277D018-9DFD-45B4-B9AA-9A6D7229B02C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{0756E39A-F23F-45BE-816E-E94667E291DB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Test.OData.Services.PerfService", "..\test\PerformanceTests\Framework\PerfServiceCore\Microsoft.Test.OData.Services.PerfService.csproj", "{6DA1260D-FE35-424B-ADFA-158368AD02DC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{68E90C52-6A40-42D8-9CE6-73D05802910C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Test.OData.TestService", "..\test\PerformanceTests\Framework\TestService\Microsoft.Test.OData.TestService.csproj", "{7FC34D8C-EB95-4C16-81BF-5CDC8E221536}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7FEDC028-14C8-4438-9EF0-9633057E4826}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2CCDC07F-FAFD-4D00-AA73-991CD2AB9DC7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Test.OData.Services.PerfService", "..\test\PerformanceTests\Framework\PerfServiceCore\Microsoft.Test.OData.Services.PerfService.csproj", "{6DA1260D-FE35-424B-ADFA-158368AD02DC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{6120E0DE-DE46-49C7-B517-15E449D17BAC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{4B172A97-E47E-48D1-9857-1B19D216C6B2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perfTests", "perfTests", "{90DC3112-A209-499B-8A43-FFFF83A216C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ODataSamples.Services.Core", "..\test\EndToEndTests\Services\ODataWCFLibrary\ODataSamples.Services.Core.csproj", "{E4B9ABAE-2BCD-401E-A472-6EDA76692C79}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{50AA23B2-56EF-4C51-A270-8D5BD0C899B6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perfTests", "perfTests", "{E9D2C863-053E-4D06-A07F-AAF7F10F7F83}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Cover|Any CPU = Cover|Any CPU - Cover|x64 = Cover|x64 - Cover|x86 = Cover|x86 Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Cover|Any CPU.ActiveCfg = Cover|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Cover|Any CPU.Build.0 = Cover|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Cover|x64.ActiveCfg = Cover|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Cover|x64.Build.0 = Cover|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Cover|x86.ActiveCfg = Cover|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Cover|x86.Build.0 = Cover|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Debug|Any CPU.Build.0 = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Debug|x64.Build.0 = Debug|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Debug|x86.Build.0 = Debug|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Release|Any CPU.Build.0 = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Release|x64.ActiveCfg = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Release|x64.Build.0 = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Release|x86.ActiveCfg = Release|Any CPU - {7D98AD3B-6685-498A-834C-F18F7FAE9138}.Release|x86.Build.0 = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Cover|Any CPU.Build.0 = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Cover|x64.ActiveCfg = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Cover|x64.Build.0 = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Cover|x86.ActiveCfg = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Cover|x86.Build.0 = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Debug|x64.ActiveCfg = Debug|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Debug|x64.Build.0 = Debug|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Debug|x86.ActiveCfg = Debug|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Debug|x86.Build.0 = Debug|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Release|Any CPU.Build.0 = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Release|x64.ActiveCfg = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Release|x64.Build.0 = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Release|x86.ActiveCfg = Release|Any CPU - {989A83CC-B864-4A75-8BF3-5EDA99203A86}.Release|x86.Build.0 = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Cover|Any CPU.Build.0 = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Cover|x64.ActiveCfg = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Cover|x64.Build.0 = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Cover|x86.ActiveCfg = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Cover|x86.Build.0 = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Debug|x64.Build.0 = Debug|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Debug|x86.Build.0 = Debug|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Release|Any CPU.Build.0 = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Release|x64.ActiveCfg = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Release|x64.Build.0 = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Release|x86.ActiveCfg = Release|Any CPU - {7D921888-FE03-4C3F-80FE-2F624505461C}.Release|x86.Build.0 = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Cover|Any CPU.Build.0 = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Cover|x64.ActiveCfg = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Cover|x64.Build.0 = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Cover|x86.ActiveCfg = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Cover|x86.Build.0 = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Debug|x64.ActiveCfg = Debug|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Debug|x64.Build.0 = Debug|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Debug|x86.ActiveCfg = Debug|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Debug|x86.Build.0 = Debug|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Release|Any CPU.Build.0 = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Release|x64.ActiveCfg = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Release|x64.Build.0 = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Release|x86.ActiveCfg = Release|Any CPU - {5D921888-FE03-4C3F-40FE-2F624505461D}.Release|x86.Build.0 = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Cover|Any CPU.Build.0 = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Cover|x64.ActiveCfg = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Cover|x64.Build.0 = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Cover|x86.ActiveCfg = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Cover|x86.Build.0 = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Debug|x64.ActiveCfg = Debug|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Debug|x64.Build.0 = Debug|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Debug|x86.Build.0 = Debug|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Release|Any CPU.Build.0 = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Release|x64.ActiveCfg = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Release|x64.Build.0 = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Release|x86.ActiveCfg = Release|Any CPU - {DF028E55-CE75-4F32-822E-F9EC9C756AE2}.Release|x86.Build.0 = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Cover|Any CPU.Build.0 = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Cover|x64.ActiveCfg = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Cover|x86.ActiveCfg = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Debug|x64.ActiveCfg = Debug|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Debug|x86.ActiveCfg = Debug|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Release|Any CPU.Build.0 = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Release|x64.ActiveCfg = Release|Any CPU - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C}.Release|x86.ActiveCfg = Release|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Cover|Any CPU.Build.0 = Release|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Cover|x64.ActiveCfg = Release|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Cover|x86.ActiveCfg = Release|Any CPU + {C6597816-0F99-43A5-9CC7-65E50424E19C}.Cover|Any CPU.ActiveCfg = Release|Any CPU + {C6597816-0F99-43A5-9CC7-65E50424E19C}.Cover|Any CPU.Build.0 = Release|Any CPU + {C6597816-0F99-43A5-9CC7-65E50424E19C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6597816-0F99-43A5-9CC7-65E50424E19C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6597816-0F99-43A5-9CC7-65E50424E19C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6597816-0F99-43A5-9CC7-65E50424E19C}.Release|Any CPU.Build.0 = Release|Any CPU + {36474603-9759-4C07-891D-B95783834543}.Cover|Any CPU.ActiveCfg = Release|Any CPU + {36474603-9759-4C07-891D-B95783834543}.Cover|Any CPU.Build.0 = Release|Any CPU + {36474603-9759-4C07-891D-B95783834543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36474603-9759-4C07-891D-B95783834543}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36474603-9759-4C07-891D-B95783834543}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36474603-9759-4C07-891D-B95783834543}.Release|Any CPU.Build.0 = Release|Any CPU + {E0A278D2-6D04-4836-9051-B4F76298EBCC}.Cover|Any CPU.ActiveCfg = Release|Any CPU + {E0A278D2-6D04-4836-9051-B4F76298EBCC}.Cover|Any CPU.Build.0 = Release|Any CPU + {E0A278D2-6D04-4836-9051-B4F76298EBCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0A278D2-6D04-4836-9051-B4F76298EBCC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0A278D2-6D04-4836-9051-B4F76298EBCC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0A278D2-6D04-4836-9051-B4F76298EBCC}.Release|Any CPU.Build.0 = Release|Any CPU + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7}.Cover|Any CPU.ActiveCfg = Release|Any CPU + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7}.Cover|Any CPU.Build.0 = Release|Any CPU + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7}.Release|Any CPU.Build.0 = Release|Any CPU + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}.Cover|Any CPU.ActiveCfg = Debug|Any CPU + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}.Cover|Any CPU.Build.0 = Debug|Any CPU + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1}.Release|Any CPU.Build.0 = Release|Any CPU + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Cover|Any CPU.ActiveCfg = Debug|Any CPU + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Cover|Any CPU.Build.0 = Debug|Any CPU + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Release|Any CPU.Build.0 = Release|Any CPU + {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Cover|Any CPU.ActiveCfg = Cover|Any CPU + {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Cover|Any CPU.Build.0 = Cover|Any CPU {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Debug|x64.ActiveCfg = Debug|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Debug|x86.ActiveCfg = Debug|Any CPU {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Release|Any CPU.ActiveCfg = Release|Any CPU {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Release|Any CPU.Build.0 = Release|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Release|x64.ActiveCfg = Release|Any CPU - {6DA1260D-FE35-424B-ADFA-158368AD02DC}.Release|x86.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Cover|Any CPU.Build.0 = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Cover|x64.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Cover|x86.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Debug|Any CPU.Build.0 = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Debug|x64.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Debug|x86.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Release|Any CPU.Build.0 = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Release|x64.ActiveCfg = Release|Any CPU - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536}.Release|x86.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Cover|Any CPU.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Cover|Any CPU.Build.0 = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Cover|x64.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Cover|x64.Build.0 = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Cover|x86.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Cover|x86.Build.0 = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Debug|x64.ActiveCfg = Debug|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Debug|x64.Build.0 = Debug|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Debug|x86.ActiveCfg = Debug|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Debug|x86.Build.0 = Debug|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Release|Any CPU.Build.0 = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Release|x64.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Release|x64.Build.0 = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Release|x86.ActiveCfg = Release|Any CPU - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6}.Release|x86.Build.0 = Release|Any CPU + {4B172A97-E47E-48D1-9857-1B19D216C6B2}.Cover|Any CPU.ActiveCfg = Debug|Any CPU + {4B172A97-E47E-48D1-9857-1B19D216C6B2}.Cover|Any CPU.Build.0 = Debug|Any CPU + {4B172A97-E47E-48D1-9857-1B19D216C6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B172A97-E47E-48D1-9857-1B19D216C6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B172A97-E47E-48D1-9857-1B19D216C6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B172A97-E47E-48D1-9857-1B19D216C6B2}.Release|Any CPU.Build.0 = Release|Any CPU + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79}.Cover|Any CPU.ActiveCfg = Debug|Any CPU + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79}.Cover|Any CPU.Build.0 = Debug|Any CPU + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {7D98AD3B-6685-498A-834C-F18F7FAE9138} = {90DC3112-A209-499B-8A43-FFFF83A216C3} - {989A83CC-B864-4A75-8BF3-5EDA99203A86} = {7FEDC028-14C8-4438-9EF0-9633057E4826} - {7D921888-FE03-4C3F-80FE-2F624505461C} = {7FEDC028-14C8-4438-9EF0-9633057E4826} - {5D921888-FE03-4C3F-40FE-2F624505461D} = {7FEDC028-14C8-4438-9EF0-9633057E4826} - {DF028E55-CE75-4F32-822E-F9EC9C756AE2} = {6120E0DE-DE46-49C7-B517-15E449D17BAC} - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C} = {90DC3112-A209-499B-8A43-FFFF83A216C3} - {6DA1260D-FE35-424B-ADFA-158368AD02DC} = {6120E0DE-DE46-49C7-B517-15E449D17BAC} - {7FC34D8C-EB95-4C16-81BF-5CDC8E221536} = {6120E0DE-DE46-49C7-B517-15E449D17BAC} - {6120E0DE-DE46-49C7-B517-15E449D17BAC} = {2CCDC07F-FAFD-4D00-AA73-991CD2AB9DC7} - {90DC3112-A209-499B-8A43-FFFF83A216C3} = {2CCDC07F-FAFD-4D00-AA73-991CD2AB9DC7} - {50AA23B2-56EF-4C51-A270-8D5BD0C899B6} = {6120E0DE-DE46-49C7-B517-15E449D17BAC} + {C6597816-0F99-43A5-9CC7-65E50424E19C} = {E9D2C863-053E-4D06-A07F-AAF7F10F7F83} + {36474603-9759-4C07-891D-B95783834543} = {68E90C52-6A40-42D8-9CE6-73D05802910C} + {E0A278D2-6D04-4836-9051-B4F76298EBCC} = {68E90C52-6A40-42D8-9CE6-73D05802910C} + {146EBB21-DCEB-426B-8FB3-5A0EE02005C7} = {68E90C52-6A40-42D8-9CE6-73D05802910C} + {8EDCDD9A-2A07-49A7-BE5B-6351E7D85EC1} = {E9D2C863-053E-4D06-A07F-AAF7F10F7F83} + {0756E39A-F23F-45BE-816E-E94667E291DB} = {3BDF3F6A-05CE-4B19-B6C5-1C24BB289E05} + {7FC34D8C-EB95-4C16-81BF-5CDC8E221536} = {0756E39A-F23F-45BE-816E-E94667E291DB} + {6DA1260D-FE35-424B-ADFA-158368AD02DC} = {0756E39A-F23F-45BE-816E-E94667E291DB} + {4B172A97-E47E-48D1-9857-1B19D216C6B2} = {0756E39A-F23F-45BE-816E-E94667E291DB} + {E4B9ABAE-2BCD-401E-A472-6EDA76692C79} = {0756E39A-F23F-45BE-816E-E94667E291DB} + {E9D2C863-053E-4D06-A07F-AAF7F10F7F83} = {3BDF3F6A-05CE-4B19-B6C5-1C24BB289E05} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {52B8FEDE-C36A-443A-B076-C4BDFCB01BFC} + SolutionGuid = {FDDD8B0D-0F8B-42B5-BA7E-52508F2437B7} EndGlobalSection EndGlobal diff --git a/test/PerformanceTests/ComponentTests/Common/Models/ExchangeAttachment.csdl b/test/PerformanceTests/ComponentTests/Common/Models/ExchangeAttachment.csdl index baf7aa0dbc..967effafcb 100644 --- a/test/PerformanceTests/ComponentTests/Common/Models/ExchangeAttachment.csdl +++ b/test/PerformanceTests/ComponentTests/Common/Models/ExchangeAttachment.csdl @@ -1,15 +1,15 @@  - - - - - - - - - - + + + + + + + + + + diff --git a/test/PerformanceTests/ComponentTests/Microsoft.OData.Performance.ComponentTests.csproj b/test/PerformanceTests/ComponentTests/Microsoft.OData.Performance.ComponentTests.csproj index cf768e4527..53a535148a 100644 --- a/test/PerformanceTests/ComponentTests/Microsoft.OData.Performance.ComponentTests.csproj +++ b/test/PerformanceTests/ComponentTests/Microsoft.OData.Performance.ComponentTests.csproj @@ -1,369 +1,40 @@ - - - - - + + - Debug - AnyCPU - Private - {7D98AD3B-6685-498A-834C-F18F7FAE9138} Exe - Properties - Microsoft.OData.Performance - Microsoft.OData.Performance.Component.Tests - v4.7.2 - $(RelativeOutputPath)\Performance\bin - bin\$(Configuration) - 512 - ..\..\..\sln\ - true - - - + netcoreapp3.1 - + - - ..\..\..\sln\packages\BenchmarkDotNet.0.12.1\lib\netstandard2.0\BenchmarkDotNet.dll - - - ..\..\..\sln\packages\BenchmarkDotNet.Annotations.0.12.1\lib\netstandard2.0\BenchmarkDotNet.Annotations.dll - - - ..\..\..\sln\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\Dia2Lib.dll - True - - - ..\..\..\sln\packages\Iced.1.4.0\lib\net45\Iced.dll - - - ..\..\..\sln\packages\Microsoft.CodeAnalysis.Common.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - ..\..\..\sln\packages\Microsoft.CodeAnalysis.CSharp.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\Microsoft.Diagnostics.FastSerialization.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.NETCore.Client.0.2.61701\lib\netstandard2.0\Microsoft.Diagnostics.NETCore.Client.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Runtime.1.1.57604\lib\net45\Microsoft.Diagnostics.Runtime.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\Microsoft.Diagnostics.Tracing.TraceEvent.dll - - - ..\..\..\sln\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - - ..\..\..\sln\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - True - - - ..\..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - - ..\..\..\sln\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\OSExtensions.dll - - - ..\..\..\sln\packages\Perfolizer.0.2.1\lib\netstandard2.0\Perfolizer.dll - - - - ..\..\..\sln\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll - True - True - - - ..\..\..\sln\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - - - ..\..\..\sln\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll - - - - - ..\..\..\sln\packages\System.Console.4.3.0\lib\net46\System.Console.dll - True - True - - - - ..\..\..\sln\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - True - - - ..\..\..\sln\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - True - True - - - ..\..\..\sln\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\..\..\sln\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - ..\..\..\sln\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\..\..\sln\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\..\..\sln\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll - True - True - - - ..\..\..\sln\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - True - True - - - - ..\..\..\sln\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\..\..\sln\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\..\sln\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\..\..\sln\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - - ..\..\..\sln\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\..\..\sln\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\..\sln\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\..\..\sln\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll - True - True - - - ..\..\..\sln\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - ..\..\..\sln\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll - - - ..\..\..\sln\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\..\..\sln\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\..\..\sln\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\..\..\sln\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\..\..\sln\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll - - - - - - ..\..\..\sln\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - ..\..\..\sln\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\..\..\sln\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - True - True - - - ..\..\..\sln\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - ..\..\..\sln\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - True - True - - - ..\..\..\sln\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - True - True - - - ..\..\..\sln\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - True - True - - - ..\..\..\sln\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - True - True - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\TraceReloggerLib.dll - True - - - $(NugetPack)\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - $(NugetPack)\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll - True - - - $(NugetPack)\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll - True - - - $(NugetPack)\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - - - ..\..\..\sln\packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0029\lib\net46\xunit.performance.core.dll - True - - - ..\..\..\sln\packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0029\lib\net46\xunit.performance.execution.desktop.dll - True - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - Designer - + + - - - - - - - {989a83cc-b864-4a75-8bf3-5eda99203a86} - Microsoft.OData.Core - - - {7d921888-fe03-4c3f-80fe-2f624505461c} - Microsoft.OData.Edm - - - {5d921888-fe03-4c3f-40fe-2f624505461d} - Microsoft.Spatial - - - - - - - $(NugetPack)\Microsoft.OData.Core.$(OdlVersion).0\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll - True - - - $(NugetPack)\Microsoft.OData.Edm.$(OdlVersion).0\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll - True - - - $(NugetPack)\Microsoft.Spatial.$(OdlVersion).0\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll - True - - - - - - - - - - - - - - + - - + + + + - - + + + - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file + + diff --git a/test/PerformanceTests/ComponentTests/ODataReader/ODataReaderFeedTests.cs b/test/PerformanceTests/ComponentTests/ODataReader/ODataReaderFeedTests.cs index 392319bbb4..c925f2df45 100644 --- a/test/PerformanceTests/ComponentTests/ODataReader/ODataReaderFeedTests.cs +++ b/test/PerformanceTests/ComponentTests/ODataReader/ODataReaderFeedTests.cs @@ -80,8 +80,8 @@ public void ReadFeedIncludeSpatialWithExpansions() { RunReadFeedTest(_isFullValidation); } - - + + public void SetupDataStream(string templateFile, int entryCount) { _stream = new MemoryStream(PayloadGenerator.GenerateFeed(templateFile, entryCount)); diff --git a/test/PerformanceTests/ComponentTests/ODataReader/PayloadGenerator.cs b/test/PerformanceTests/ComponentTests/ODataReader/PayloadGenerator.cs index f8be6fd31b..51eb2fa26a 100644 --- a/test/PerformanceTests/ComponentTests/ODataReader/PayloadGenerator.cs +++ b/test/PerformanceTests/ComponentTests/ODataReader/PayloadGenerator.cs @@ -39,7 +39,7 @@ private static string ReadTemplate(string payloadTemplate) public static byte[] GenerateFeed(string payloadTemplate, int entryCount) { var sb = new StringBuilder(prologueOfPayload); - string entry = ReadTemplate(payloadTemplate); + string entry = ReadTemplate(payloadTemplate); for (int i = 0; i < entryCount - 1; i++) { diff --git a/test/PerformanceTests/ComponentTests/Scenario/BatchRoundTripPerfTest.cs b/test/PerformanceTests/ComponentTests/Scenario/BatchRoundTripPerfTest.cs index a44cc90482..7eb0002218 100644 --- a/test/PerformanceTests/ComponentTests/Scenario/BatchRoundTripPerfTest.cs +++ b/test/PerformanceTests/ComponentTests/Scenario/BatchRoundTripPerfTest.cs @@ -94,7 +94,7 @@ private void BatchNCreationsTest(string batchContentType) { // Create a batch which has memory foot print of about 10kB. // Repeat N times. - const int N = 1 << 10;for (int i = 0; i < N; i++) + const int N = 1 << 10; for (int i = 0; i < N; i++) { // TODO: does printing progress affect results? //PrintProgress(i); @@ -141,7 +141,7 @@ private void DoOneRoundTrip() private void PrintProgress(int i) { // TODO: check whether printing progress impacts the results. Is there BDN-specific alternative? - if (i%100 == 0) + if (i % 100 == 0) { Console.WriteLine("iteration: " + i); } diff --git a/test/PerformanceTests/ComponentTests/Scenario/BinaryDataScaleTests.cs b/test/PerformanceTests/ComponentTests/Scenario/BinaryDataScaleTests.cs index c4a21605f0..9896bc8a63 100644 --- a/test/PerformanceTests/ComponentTests/Scenario/BinaryDataScaleTests.cs +++ b/test/PerformanceTests/ComponentTests/Scenario/BinaryDataScaleTests.cs @@ -70,7 +70,7 @@ private void WriteEntry(ODataWriter odataWriter, int dataSizeKb) } }; - var attachmentsP = new ODataNestedResourceInfo(){Name = "Attachments", IsCollection = true}; + var attachmentsP = new ODataNestedResourceInfo() { Name = "Attachments", IsCollection = true }; var attachmentsResourceSet = new ODataResourceSet() { @@ -86,7 +86,7 @@ private void WriteEntry(ODataWriter odataWriter, int dataSizeKb) new ODataProperty { Name = "Name", Value = "attachment" }, new ODataProperty { Name = "IsInline", Value = false }, new ODataProperty { Name = "LastModifiedTime", Value = new DateTimeOffset(1987, 6, 5, 4, 3, 21, 0, new TimeSpan(0, 0, 3, 0)) }, - new ODataProperty { Name = "Content", Value = new byte[dataSizeKb * 1024]}, + new ODataProperty { Name = "Content", Value = new byte[dataSizeKb * 1024]}, } }; diff --git a/test/PerformanceTests/ComponentTests/UriParser/UriParserTests.cs b/test/PerformanceTests/ComponentTests/UriParser/UriParserTests.cs index a73cb47bf0..241e89d63d 100644 --- a/test/PerformanceTests/ComponentTests/UriParser/UriParserTests.cs +++ b/test/PerformanceTests/ComponentTests/UriParser/UriParserTests.cs @@ -44,7 +44,7 @@ public void ParseUri() public void ParsePath() { string query = "Employee(1)/PurchaseOrderHeader/Vendor/ProductVendor/Product/ProductInventory(ProductID = 1,LocationID = 1)/Location/WorkOrderRouting/WorkOrder/Product/BillOfMaterials(1)/UnitMeasure/ModifiedDate"; - + int roundPerIteration = 5000; TestExecution(query, roundPerIteration, parser => parser.ParsePath()); @@ -56,7 +56,7 @@ public void ParseFilter() string query = "Product?$filter=contains(Name, 'aaaa') and startswith(ProductNumber, '000') " + "and MakeFlag and concat(Color, SizeUnitMeasureCode) gt 'lll' and fractionalseconds(SellStartDate) eq 0 " + "and round(StandardCost) mod ListPrice lt 10 and TimeZones/any(a: a/Offset eq maxdatetime())"; - + int roundPerIteration = 5000; TestExecution(query, roundPerIteration, parser => parser.ParseFilter()); diff --git a/test/PerformanceTests/ComponentTests/app.config b/test/PerformanceTests/ComponentTests/app.config deleted file mode 100644 index a6a77b427c..0000000000 --- a/test/PerformanceTests/ComponentTests/app.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/PerformanceTests/ComponentTests/packages.config b/test/PerformanceTests/ComponentTests/packages.config deleted file mode 100644 index b86ade28b0..0000000000 --- a/test/PerformanceTests/ComponentTests/packages.config +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/PerformanceTests/ServiceTests/AssemblyInfo.cs b/test/PerformanceTests/ServiceTests/AssemblyInfo.cs deleted file mode 100644 index 83577565d8..0000000000 --- a/test/PerformanceTests/ServiceTests/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using Xunit; - -[assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file diff --git a/test/PerformanceTests/ServiceTests/Common/HttpWebRequestMessage.cs b/test/PerformanceTests/ServiceTests/Common/HttpWebRequestMessage.cs index ab68989e24..5ff24e0d71 100644 --- a/test/PerformanceTests/ServiceTests/Common/HttpWebRequestMessage.cs +++ b/test/PerformanceTests/ServiceTests/Common/HttpWebRequestMessage.cs @@ -73,7 +73,7 @@ public long ContentLength { get { - return this.request.ContentLength; + return this.request.ContentLength; } set diff --git a/test/PerformanceTests/ServiceTests/Common/TestServiceFixture.cs b/test/PerformanceTests/ServiceTests/Common/TestServiceFixture.cs index f63c69e177..4657777312 100644 --- a/test/PerformanceTests/ServiceTests/Common/TestServiceFixture.cs +++ b/test/PerformanceTests/ServiceTests/Common/TestServiceFixture.cs @@ -24,12 +24,14 @@ public class TestServiceFixture : IDisposable public TestServiceFixture() { KillServices(); + string servicePath = GetServicePath(); + Console.WriteLine("SERVICE PATH {0}", servicePath); var startInfo = new ProcessStartInfo { CreateNoWindow = true, UseShellExecute = false, FileName = IISExpressPath, - Arguments = string.Format("/path:{0} /port:{1}", GetServicePath(), ServicePort) + Arguments = string.Format("/path:{0} /port:{1}", servicePath, ServicePort) }; var process = Process.Start(startInfo); @@ -58,6 +60,10 @@ private void KillServices() } } + /// + /// Returns the directory that contains the test service + /// + /// private string GetServicePath() { // try to get it from cli args -ServicePath "path" @@ -78,8 +84,31 @@ private string GetServicePath() } + // if the service path is not provided in env vars or CLI args, then + // let's try to find it + + // the test service is located in odata.net/test/PerformanceTests/Framework/TestService + // the code being executed (if it was built using dotnet run or dotnet published) + // will be located in a nested subfolder under odata.net/test/PerformanceTests/ServiceTests/... + + // so let's walk the directory tree backwards until we find the PerformanceTests directory + var dllPath = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath); - return Directory.GetParent(dllPath).FullName; + var dir = Directory.GetParent(dllPath); + while (dir.Name != "PerformanceTests" && dir.FullName != dir.Root.FullName) + { + dir = dir.Parent; + } + + if (dir.Name == "PerformanceTests") + { + var servicePath = Path.Combine(dir.FullName, "Framework", "TestService"); + return servicePath; + } + + throw new Exception("Service path not specified." + + " Please specify the path of the test service directory" + + " using the -ServicePath CLI arg or ServicePath environment variable."); } } } diff --git a/test/PerformanceTests/ServiceTests/Microsoft.OData.Performance.ServiceTests.csproj b/test/PerformanceTests/ServiceTests/Microsoft.OData.Performance.ServiceTests.csproj index f5238e7158..d8e6bdf86c 100644 --- a/test/PerformanceTests/ServiceTests/Microsoft.OData.Performance.ServiceTests.csproj +++ b/test/PerformanceTests/ServiceTests/Microsoft.OData.Performance.ServiceTests.csproj @@ -1,335 +1,18 @@ - - - - - + + - Debug - AnyCPU - Private - {1277D018-9DFD-45B4-B9AA-9A6D7229B02C} Exe - Properties - Microsoft.OData.Performance - Microsoft.OData.Performance.Service.Tests - v4.7.2 - $(RelativeOutputPath)\Performance\bin - bin\$(Configuration) - 512 - ..\ - true - - - + netcoreapp3.1 - - Microsoft.OData.Performance.Program - - - - - ..\..\..\sln\packages\BenchmarkDotNet.0.12.1\lib\netstandard2.0\BenchmarkDotNet.dll - - - ..\..\..\sln\packages\BenchmarkDotNet.Annotations.0.12.1\lib\netstandard2.0\BenchmarkDotNet.Annotations.dll - - - ..\..\..\sln\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\Dia2Lib.dll - True - - - ..\..\..\sln\packages\Iced.1.4.0\lib\net45\Iced.dll - - - ..\..\..\sln\packages\Microsoft.CodeAnalysis.Common.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - ..\..\..\sln\packages\Microsoft.CodeAnalysis.CSharp.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\Microsoft.Diagnostics.FastSerialization.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.NETCore.Client.0.2.61701\lib\netstandard2.0\Microsoft.Diagnostics.NETCore.Client.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Runtime.1.1.57604\lib\net45\Microsoft.Diagnostics.Runtime.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\Microsoft.Diagnostics.Tracing.TraceEvent.dll - - - ..\..\..\sln\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - - ..\..\..\sln\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\OSExtensions.dll - - - ..\..\..\sln\packages\Perfolizer.0.2.1\lib\netstandard2.0\Perfolizer.dll - - - - ..\..\..\sln\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll - True - True - - - ..\..\..\sln\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - - - ..\..\..\sln\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll - - - - ..\..\..\sln\packages\System.Console.4.3.0\lib\net46\System.Console.dll - True - True - - - - ..\..\..\sln\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - True - - - ..\..\..\sln\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - True - True - - - ..\..\..\sln\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\..\..\sln\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - ..\..\..\sln\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\..\..\sln\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\..\..\sln\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll - True - True - - - ..\..\..\sln\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - True - True - - - - ..\..\..\sln\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\..\..\sln\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\..\sln\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\..\..\sln\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - - ..\..\..\sln\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\..\..\sln\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\..\sln\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\..\..\sln\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll - True - True - - - ..\..\..\sln\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - ..\..\..\sln\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll - - - ..\..\..\sln\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\..\..\sln\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\..\..\sln\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\..\..\sln\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\..\..\sln\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll - - - - - - ..\..\..\sln\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - ..\..\..\sln\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\..\..\sln\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - True - True - - - ..\..\..\sln\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - ..\..\..\sln\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - True - True - - - ..\..\..\sln\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - True - True - - - ..\..\..\sln\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - True - True - - - ..\..\..\sln\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - True - True - - - ..\..\..\sln\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.49\lib\net45\TraceReloggerLib.dll - True - - - $(NugetPack)\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - $(NugetPack)\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll - True - - - $(NugetPack)\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll - True - - - $(NugetPack)\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - - - ..\..\..\sln\packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0029\lib\net46\xunit.performance.core.dll - True - - - ..\..\..\sln\packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0029\lib\net46\xunit.performance.execution.desktop.dll - True - - - - - - - - - - - - - - - - - {989a83cc-b864-4a75-8bf3-5eda99203a86} - Microsoft.OData.Core - - - - - - - $(NugetPack)\Microsoft.OData.Core.$(OdlVersion).0\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll - True - - - - - - - {df028e55-ce75-4f32-822e-f9ec9c756ae2} - ODataSamples.Services.Core - - - {6da1260d-fe35-424b-adfa-158368ad02dc} - Microsoft.Test.OData.Services.PerfService - - - {7fc34d8c-eb95-4c16-81bf-5cdc8e221536} - Microsoft.Test.OData.TestService - - - - - + - - + + + + - - + - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file + + diff --git a/test/PerformanceTests/ServiceTests/SimpleQueryTests.cs b/test/PerformanceTests/ServiceTests/SimpleQueryTests.cs index 86910791b3..92d04fab42 100644 --- a/test/PerformanceTests/ServiceTests/SimpleQueryTests.cs +++ b/test/PerformanceTests/ServiceTests/SimpleQueryTests.cs @@ -67,7 +67,7 @@ private void QueryAndVerify(string query, string preferHeader) var requestMessage = new HttpWebRequestMessage(new Uri(serviceFixture.ServiceBaseUri.AbsoluteUri + query, UriKind.Absolute)); if (!String.IsNullOrEmpty(preferHeader)) { - requestMessage.SetHeader("Prefer", preferHeader); + requestMessage.SetHeader("Prefer", preferHeader); } var responseMessage = requestMessage.GetResponse(); Assert.Equal(200, responseMessage.StatusCode); diff --git a/test/PerformanceTests/ServiceTests/UpdateTests.cs b/test/PerformanceTests/ServiceTests/UpdateTests.cs index 71bb4b1d1c..b21cdac91e 100644 --- a/test/PerformanceTests/ServiceTests/UpdateTests.cs +++ b/test/PerformanceTests/ServiceTests/UpdateTests.cs @@ -176,7 +176,5 @@ public void PatchEntity() Assert.Equal(204, responseMessage.StatusCode); } } - - } } diff --git a/test/PerformanceTests/ServiceTests/app.config b/test/PerformanceTests/ServiceTests/app.config deleted file mode 100644 index a6a77b427c..0000000000 --- a/test/PerformanceTests/ServiceTests/app.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/PerformanceTests/ServiceTests/packages.config b/test/PerformanceTests/ServiceTests/packages.config deleted file mode 100644 index ae137174cc..0000000000 --- a/test/PerformanceTests/ServiceTests/packages.config +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file