Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Tests/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ static Program()
private static string SdkPath { get; }
private static string OutputPath { get; }

public static void Main(string[] args)
// TODO: Renamed this from Main to TestMain because of a bug with Resharper and running unit tests
// in Visual Studio with .NET Core: https://youtrack.jetbrains.com/issue/RSRP-464233
// Once this is fixed, look at renaming back and removing additional packages. See https://github.com/elastic/elasticsearch-net/pull/2793
public static void TestMain(string[] args)
{
if (args.Length == 0)
Console.WriteLine("Must specify at least one argument: TestAssemblyPath, Profile or Benchmark ");
Expand Down
5 changes: 4 additions & 1 deletion src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@
<PackageReference Include="BenchMarkDotNet" Version="0.10.0" />
<PackageReference Include="DiffPlex" Version="1.4.1" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<!-- TODO only for Desktop CLR? -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:Sad: 😢

<PackageReference Include="System.Buffers" Version="4.3.0" />
<!-- TODO update -->
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netcoreapp1.1'">
<PackageReference Include="JetBrains.Profiler.Kernel.Windows.Api" Version="108.0.20170209.151431-eap01" />
<Reference Include="..\..\build\profiling\JetBrains.Profiler.Windows.SelfApi.dll" />
<PackageReference Include="JetBrains.Profiler.Kernel.Windows.Api" Version="108.0.20170209.151431-eap01" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net45'">
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
<PackageReference Include="System.Net.Http" Version="4.3.0" />
Expand Down