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
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ test: off
environment:
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
install:
- cmd: choco install dotnetcore-sdk --version 3.0.100
build_script:
- cmd: build.bat canary

Expand Down
12 changes: 12 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ jobs:
pool:
vmImage: 'ubuntu-16.04'
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100'
- script: ./build.sh test-one
displayName: 'build and unit test'
- task: PublishTestResults@2
Expand All @@ -15,6 +18,9 @@ jobs:
pool:
vmImage: 'vs2017-win2016'
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100'
- script: build.bat canary
displayName: 'build and unit test'
- task: PublishTestResults@2
Expand Down Expand Up @@ -49,6 +55,9 @@ jobs:
es601:
esVersion: '6.0.1'
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100'
- script: 'build.bat integrate-one $(esVersion) "readonly,writable,bool,xpack"'
displayName: '$(esVersion) windows integration tests'
- task: PublishTestResults@2
Expand Down Expand Up @@ -84,6 +93,9 @@ jobs:
es601:
esVersion: '6.0.1'
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100'
- script: './build.sh integrate-one $(esVersion) "readonly,writable"'
displayName: '$(esVersion) linux integration tests'
- task: PublishTestResults@2
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Benchmarking.fs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module Benchmarker =
let password = match args.CommandArguments with | Benchmark b -> b.Password | _ -> None
let runInteractive = not args.NonInteractive
let credentials = (username, password)
let runCommandPrefix = "run -f netcoreapp2.1 -c Release"
let runCommandPrefix = "run -f netcoreapp3.0 -c Release"
let runCommand =
match (runInteractive, url, credentials) with
| (false, Some url, (Some username, Some password)) -> sprintf "%s -- --all \"%s\" \"%s\" \"%s\"" runCommandPrefix url username password
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Cluster.fs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Cluster =
let clusterName = Option.defaultValue "" <| match args.CommandArguments with | Cluster c -> Some c.Name | _ -> None
let clusterVersion = Option.defaultValue "" <|match args.CommandArguments with | Cluster c -> c.Version | _ -> None

let testsProjectDirectory = Path.Combine(Path.GetFullPath(Paths.Output("Tests.ClusterLauncher")), "netcoreapp2.1")
let testsProjectDirectory = Path.Combine(Path.GetFullPath(Paths.Output("Tests.ClusterLauncher")), "netcoreapp3.0")
let tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());

let sourceDir = Paths.Source("Tests/Tests.Configuration");
Expand Down
2 changes: 2 additions & 0 deletions build/scripts/Differ.fs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ open Commandline
module Differ =

let Run args =
Tooling.DotNet.Exec ["tool"; "restore"]

let differ = "assembly-differ"
let args = args.RemainingArguments |> String.concat " "
let command = sprintf @"%s %s -o ../../%s" differ args Paths.BuildOutput
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Documentation.fs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Documentation =

let Generate args =
let docGenerator = PrivateProject(DocGenerator)
let path = Paths.ProjectOutputFolder docGenerator DotNetFramework.NetCoreApp2_1
let path = Paths.ProjectOutputFolder docGenerator DotNetFramework.NetCoreApp3_0
let generator = sprintf "%s.dll" docGenerator.Name

let (|NotNullOrEmpty|_|) (candidate:string) =
Expand Down
6 changes: 3 additions & 3 deletions build/scripts/Projects.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ module Projects =
type DotNetFramework =
| NetStandard2_0
| Net461
| NetCoreApp2_1
| NetCoreApp3_0
static member All = [NetStandard2_0; Net461]
static member AllTests = [NetCoreApp2_1; Net461]
static member AllTests = [NetCoreApp3_0; Net461]
member this.Identifier =
match this with
| NetStandard2_0 -> { MSBuild = "netstandard2.0"; Nuget = "netstandard2.0"; DefineConstants = ""; }
| NetCoreApp2_1 -> { MSBuild = "netcoreapp2.1"; Nuget = "netcoreapp2.1"; DefineConstants = ""; }
| NetCoreApp3_0 -> { MSBuild = "netcoreapp3.0"; Nuget = "netcoreapp3.0"; DefineConstants = ""; }
| Net461 -> { MSBuild = "net461"; Nuget = "net461"; DefineConstants = ""; }

type Project =
Expand Down
3 changes: 3 additions & 0 deletions build/scripts/ShadowDependencies.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ module ShadowDependencies =
let private assemblyRewriter = "assembly-rewriter"
let private keyFile = Paths.Keys "keypair.snk"
let Rewrite majorVersion framework projects =

Tooling.DotNet.Exec ["tool"; "restore"]

let project = projects |> Seq.head
let folder = Paths.ProjectOutputFolder project framework

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Testing.fs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module Tests =
let p = ["test"; "."; "-c"; "RELEASE"]
//make sure we only test netcoreapp on linux or requested on the command line to only test-one
match (target, Environment.isLinux) with
| (_, true) -> ["--framework"; "netcoreapp2.1"] |> List.append p
| (_, true) -> ["--framework"; "netcoreapp3.0"] |> List.append p
| (Commandline.MultiTarget.One, _) ->
let random = new Random()
let fw = DotNetFramework.AllTests |> List.sortBy (fun _ -> random.Next()) |> List.head
Expand Down
4 changes: 2 additions & 2 deletions build/scripts/Tooling.fs
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ module Tooling =
member this.ExecIn workingDirectory arguments = this.ExecInWithTimeout workingDirectory arguments timeout
member this.Exec arguments = this.ExecWithTimeout arguments timeout

let nugetFile = Path.GetFullPath "build/scripts/bin/Release/netcoreapp2.2/NuGet.exe"
let nugetFile = Path.GetFullPath "build/scripts/bin/Release/netcoreapp3.0/NuGet.exe"
let Nuget = BuildTooling(None, nugetFile)
let ILRepack = BuildTooling(None, "build/scripts/bin/Release/netcoreapp2.2/ILRepack.exe")
let ILRepack = BuildTooling(None, "build/scripts/bin/Release/netcoreapp3.0/ILRepack.exe")
let DotNet = BuildTooling(Some <| TimeSpan.FromMinutes(5.), "dotnet")


46 changes: 2 additions & 44 deletions build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType>
<!-- Type Providers are restored using net461, fine for netcoreapp2.2 so we kill the warning -->
<NoWarn>$(NoWarn);NU1701</NoWarn>
Expand All @@ -27,47 +27,9 @@
<Content Include="..\..\build.sh"><Link>build.sh</Link></Content>
<Content Include="..\..\build.bat"><Link>build.bat</Link></Content>
</ItemGroup>
<!-- Type providers currently can't run inside the .NET Core 2.0 hosted compiler, see https://github.com/Microsoft/visualfsharp/pull/3658#issuecomment-334773415 -->
<PropertyGroup>
<IsWindows Condition="'$(OS)' == 'Windows_NT'">true</IsWindows>
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
</PropertyGroup>
<PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft SDKs\F#\4.1\Framework\v4.0\fsc.exe')">
<FscToolPath>C:\Program Files (x86)\Microsoft SDKs\F#\4.1\Framework\v4.0</FscToolPath>
<FscToolExe>fsc.exe</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
<FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
<FscToolExe>fsc.exe</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
<FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
<FscToolExe>fsc.exe</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
<FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
<FscToolExe>fsc.exe</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
<FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
<FscToolExe>fsc.exe</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft SDKs\F#\10.1\Framework\v4.0\fsc.exe')">
<FscToolPath>C:\Program Files (x86)\Microsoft SDKs\F#\10.1\Framework\v4.0</FscToolPath>
<FscToolExe>fsc.exe</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsOSX)' == 'true' AND Exists('/Library/Frameworks/Mono.framework/Versions/Current/Commands/fsharpc')">
<FscToolPath>/Library/Frameworks/Mono.framework/Versions/Current/Commands</FscToolPath>
<FscToolExe>fsharpc</FscToolExe>
</PropertyGroup>
<PropertyGroup Condition="'$(IsLinux)' == 'true' AND Exists('/usr/bin/fsharpc')">
<FscToolPath>/usr/bin</FscToolPath>
<FscToolExe>fsharpc</FscToolExe>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bullseye" Version="3.0.0-rc.1" />
<PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190724T022011" />
<PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190927T121631" />
<PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
<PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />
<PackageReference Include="Fake.IO.FileSystem" Version="5.15.0" />
Expand All @@ -78,10 +40,6 @@
<PackageReference Include="NuGet.CommandLine" Version="4.9.4" />
<PackageReference Include="Octokit" Version="0.32.0" />
<PackageReference Include="Proc" Version="0.6.1" />

<DotNetCliToolReference Include="dotnet-assembly-rewriter" Version="1.0.0-alpha20190401T093210" />
<DotNetCliToolReference Include="dotnet-assembly-differ" Version="1.0.0-alpha20190403T095656" />

</ItemGroup>
<Target Name="CopyToolPackages" AfterTargets="Build">
<Copy SourceFiles="$(PkgILRepack)\tools\ILRepack.exe" DestinationFolder="$(OutDir)" />
Expand Down
18 changes: 18 additions & 0 deletions dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-assembly-rewriter": {
"version": "1.0.0-ci20190926102235",
"commands": [
"assembly-rewriter"
]
},
"dotnet-assembly-differ": {
"version": "1.0.0-ci20190926135713",
"commands": [
"assembly-differ"
]
}
}
}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "2.2.103"
"version": "3.0.100"
},
"version": "6.8.2"
}
File renamed without changes.
2 changes: 1 addition & 1 deletion src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<VersionPrefix>6.0.0</VersionPrefix>
<VersionSuffix>alpha</VersionSuffix>
<NoWarn>NU1701</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
string configuration = null;
if (Program.BuildOutputPath.Contains("src"))
{
//bin/Debug|Release/netcoreapp2.1
//bin/Debug|Release/netcoreapp3.0
configuration = new DirectoryInfo(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)).Parent?.Name;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/CodeGeneration/DocGenerator/DocGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<VersionPrefix>6.0.0</VersionPrefix>
<VersionSuffix>alpha</VersionSuffix>
<NoWarn>NU1701,NU1605</NoWarn>
Expand Down
5 changes: 3 additions & 2 deletions src/CodeGeneration/DocGenerator/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ string P(string path)
}

var globalJsonVersion = string.Join(".", Regex.Matches(File.ReadAllText(globalJson), "\"version\": \"(.*)\"")
.Last().Groups
.Last().Value
.Last()
.Groups[^1]
.Value
.Split(".")
.Take(2));

Expand Down
4 changes: 3 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<LangVersion>8.0</LangVersion>
<!-- We'll work on a project by project approach to enable this -->
<!-- <Nullable>enable</Nullable>-->
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Elasticsearch.Net/ElasticLowLevelClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private TRequestParams _params<TRequestParams>(TRequestParams requestParams, str
{
if (contentType.IsNullOrEmpty()) return requestParams;

requestParams = requestParams ?? new TRequestParams();
requestParams ??= new TRequestParams();
//The properties are set here on RequestConfiguration here because they are not nullable (fixed in master).
if (requestParams.RequestConfiguration == null)
requestParams.RequestConfiguration = new RequestConfiguration
Expand Down
3 changes: 1 addition & 2 deletions src/Elasticsearch.Net/Elasticsearch.Net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\PublishArtifacts.build.props" />
<PropertyGroup>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
Expand Down
10 changes: 9 additions & 1 deletion src/Library.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@
<!-- File version reflects actual version number without prelease since that not allowed in its struct -->
<FileVersion>$(CurrentAssemblyFileVersion)</FileVersion>

<DefineConstants Condition="'$(TargetFramework)'=='net461'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='net472'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.1'">$(DefineConstants);DOTNETCORE</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.1'">$(DefineConstants);DOTNETCORE</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.2'">$(DefineConstants);DOTNETCORE</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp3.0'">$(DefineConstants);DOTNETCORE</DefineConstants>

<RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri>
<Authors>Elasticsearch BV</Authors>
Expand All @@ -25,6 +30,9 @@
<ReleaseNotes>See https://github.com/elastic/elasticsearch-net/releases</ReleaseNotes>
<PackageIconUrl>https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png</PackageIconUrl>

<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net461'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
<PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net472'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
</ItemGroup>
</Project>
4 changes: 1 addition & 3 deletions src/Nest/Nest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\PublishArtifacts.build.props" />
<PropertyGroup>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/PublishArtifacts.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<Prefer32Bit>false</Prefer32Bit>
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<LangVersion>latest</LangVersion>

<DoSourceLink></DoSourceLink>
<SourceLink Condition="'$(DoSourceLink)'!=''">$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json</SourceLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\PublishArtifacts.build.props" />
<PropertyGroup>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Nest\Nest.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/Tests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup Condition="'$(TestPackageVersion)'!=''">
<RestoreSources>../../../build/output/_packages;https://api.nuget.org/v3/index.json</RestoreSources>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down
5 changes: 2 additions & 3 deletions src/Tests/Tests.Benchmarking/Tests.Benchmarking.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
<PropertyGroup>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net461</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand All @@ -13,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="Elastic.BenchmarkDotNetExporter" Version="0.1.0-ci20190724T022011" />
<PackageReference Include="Elastic.BenchmarkDotNetExporter" Version="0.1.0-ci20190927T121631" />
<PackageReference Include="LibGit2Sharp" Version="0.26.0-preview-0062" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Tests.Core\Tests.Core.csproj" />
Expand Down
Loading