Skip to content

Commit 0b9255a

Browse files
committed
Order of conditional targetframeworks matters to VisualStudio because its dumb in how it resolves the TFMS's (works on commandline and straight up MsBuild)
1 parent 00a37cc commit 0b9255a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
.paket\paket.bootstrapper.exe
3+
.paket\paket.bootstrapper.exe
44
IF EXIST paket.lock (.paket\paket.exe restore)
55
IF NOT EXIST paket.lock (.paket\paket.exe install)
66
"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "cmdline=%*"

src/Elasticsearch.Net/Elasticsearch.Net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\Clients.Common.targets" />
33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(DotNetCoreOnly)'=='1'">netstandard1.3</TargetFrameworks>
54
<TargetFrameworks Condition="'$(DotNetCoreOnly)'==''">net45;net46;netstandard1.3</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetCoreOnly)'=='1'">netstandard1.3</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup Condition="'$(TargetFramework)'!='netstandard1.3'">
88
<Reference Include="Microsoft.CSharp" />

src/Nest/Nest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\Clients.Common.targets" />
33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(DotNetCoreOnly)'=='1'">netstandard1.3</TargetFrameworks>
54
<TargetFrameworks Condition="'$(DotNetCoreOnly)'==''">net45;net46;netstandard1.3</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetCoreOnly)'=='1'">netstandard1.3</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />

src/Tests/Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<DotNetCoreOnly Condition="'$(TRAVIS)'==''">
55
</DotNetCoreOnly>
66
<OutputType>Exe</OutputType>
7-
<TargetFrameworks Condition="'$(DotNetCoreOnly)'=='1'">netcoreapp1.1</TargetFrameworks>
87
<TargetFrameworks Condition="'$(DotNetCoreOnly)'==''">netcoreapp1.1;net45;net46</TargetFrameworks>
8+
<TargetFrameworks Condition="'$(DotNetCoreOnly)'=='1'">netcoreapp1.1</TargetFrameworks>
99
<VersionPrefix>6.0.0</VersionPrefix>
1010
<VersionSuffix>alpha</VersionSuffix>
1111
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp1.1' OR '$(DotNetCoreOnly)'=='1'">$(DefineConstants);DOTNETCORE</DefineConstants>
@@ -39,4 +39,4 @@
3939
<ItemGroup>
4040
<EmbeddedResource Include="Document\Single\Attachment\Attachment_Test_Document.pdf" />
4141
</ItemGroup>
42-
</Project>
42+
</Project>

0 commit comments

Comments
 (0)