Skip to content

Commit 3de4831

Browse files
committed
check for in build script because dotnet-xunit always does a build with no way to set props or ommit building alltogether
Conflicts: build/Clients.Common.targets
1 parent c37d93a commit 3de4831

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

build/Clients.Common.targets

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,28 @@
1414
<!-- File version reflects actual version number without prelease since that not allowed in its struct -->
1515
<FileVersion>$(CurrentAssemblyFileVersion)</FileVersion>
1616

17-
<Authors></Authors>
18-
<Company></Company>
19-
<NeutralLanguage></NeutralLanguage>
20-
<AssemblyTitle></AssemblyTitle>
21-
<Description></Description>
22-
<Copyright></Copyright>
2317
<DotNetCoreOnly></DotNetCoreOnly>
24-
<DoSourceLink></DoSourceLink>
2518

2619

2720

2821

2922

23+
<!-- 'dotnet xunit' does a build but has no way to pass properties or prevent build so we snoop for TRAVIS here
24+
Ideally we handle this in the FAKE script (which we do for 'dotnet build')
25+
TODO too lazy to write and test a <CHOOSE>
26+
-->
27+
<DotNetCoreOnly Condition="'$(TRAVIS)'=='true'">1</DotNetCoreOnly>
28+
<DotNetCoreOnly Condition="'$(TRAVIS)'==''"></DotNetCoreOnly>
29+
30+
<DoSourceLink></DoSourceLink>
3031
<SignAssembly>true</SignAssembly>
3132
<AssemblyOriginatorKeyFile Condition="'$(DotNetCoreOnly)'==''">..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
3233
<GenerateDocumentationFile Condition="'$(DotNetCoreOnly)'==''">true</GenerateDocumentationFile>
3334
<NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
3435
<Prefer32Bit>false</Prefer32Bit>
3536
<DefineConstants Condition="'$(TargetFramework)'=='netstandard1.3' OR '$(DotNetCoreOnly)'=='1'">$(DefineConstants);DOTNETCORE</DefineConstants>
3637
<DebugType Condition="'$(DotNetCoreOnly)'==''">embedded</DebugType>
38+
<DebugType>embedded</DebugType>
3739
<SourceLink Condition="'$(DoSourceLink)'!=''">$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json</SourceLink>
3840
<RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri>
3941
</PropertyGroup>

0 commit comments

Comments
 (0)