Skip to content

Commit 410930b

Browse files
MpdreamzMpdreamz
committed
Use targetting pack and made sure canary works under linux too
1 parent a190e4a commit 410930b

File tree

10 files changed

+16
-18
lines changed

10 files changed

+16
-18
lines changed

‎build/scripts/Releasing.fs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ module Release =
145145

146146
let private nugetPackVersioned (p:DotNetProject) nugetId nuspec properties version =
147147
match p with
148-
| Project ElasticsearchNetVirtual
149148
| Project NestUpgradeAssistant ->
150149
printfn "Skipping %s from building a versioned nightly" p.Name
151150
ignore()

‎build/scripts/Targets.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ module Main =
6666
target "inherit-doc" <| InheritDoc.PatchInheritDocs
6767

6868
target "test-nuget-package" <| fun _ ->
69-
//run release unit tests puts packages in the system cache prevent this from happening locally
69+
// run release unit tests puts packages in the system cache prevent this from happening locally
7070
if not Commandline.runningOnCi then ignore ()
7171
else Tests.RunReleaseUnitTests artifactsVersion |> ignore
7272

7373
target "nuget-pack" <| fun _ -> Release.NugetPack artifactsVersion
7474

75-
conditional (parsed.Target = "canary") "nuget-pack-versioned" <| fun _ -> Release.NugetPackVersioned artifactsVersion
75+
conditional (parsed.Target = "canary" && not isMono) "nuget-pack-versioned" <| fun _ -> Release.NugetPackVersioned artifactsVersion
7676

7777
conditional (parsed.Target <> "canary") "generate-release-notes" <| fun _ -> ReleaseNotes.GenerateNotes buildVersions
7878

‎src/Auxiliary/Elasticsearch.Net.Virtual/Elasticsearch.Net.Virtual.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
<PropertyGroup>
55
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
66
</PropertyGroup>
7-
<ItemGroup Condition="'$(TestPackageVersion)'!=''">
8-
<PackageReference Include="Elasticsearch.Net" Version="$(TestPackageVersion)" />
9-
</ItemGroup>
10-
<ItemGroup Condition="'$(TestPackageVersion)'==''">
7+
<ItemGroup>
118
<ProjectReference Include="..\..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
129
</ItemGroup>
13-
1410
</Project>

‎src/Auxiliary/Nest.JsonNetSerializer/Nest.JsonNetSerializer.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<ItemGroup>
88
<ProjectReference Include="..\..\Nest\Nest.csproj" />
99
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" />
10-
<PackageReference Condition="'$(OS)' != 'Windows_NT'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
1110
</ItemGroup>
1211
<ItemGroup>
1312
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

‎src/Elasticsearch.Net/Elasticsearch.Net.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" />
13-
<PackageReference Condition="'$(OS)' != 'Windows_NT'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
1413
<PackageReference Include="Microsoft.CSharp" Version="4.6.0-preview3.19128.7" />
1514

1615
</ItemGroup>

‎src/Library.build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@
2929

3030
<LangVersion>latest</LangVersion>
3131
</PropertyGroup>
32+
<ItemGroup>
33+
<PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net461'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
34+
<PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net472'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
35+
</ItemGroup>
3236
</Project>

‎src/Nest.7xUpgradeAssistant/Nest.7xUpgradeAssistant.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\PublishArtifacts.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netstandard2.0;net461</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
65
<LangVersion>latest</LangVersion>
76
<RootNamespace>Nest.UpgradeAssistant</RootNamespace>
87
</PropertyGroup>

‎src/Nest/Nest.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<ItemGroup>
99
<ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
1010
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" />
11-
<PackageReference Condition="'$(OS)' != 'Windows_NT'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
1211
</ItemGroup>
1312
<ItemGroup>
1413
<Compile Update="Requests.*.cs">

‎src/Tests/Tests.Benchmarking/Tests.Benchmarking.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net461</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
65
<OutputType>Exe</OutputType>
76
</PropertyGroup>
87
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

‎src/Tests/Tests/Tests.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
44
<PropertyGroup>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net461</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
76
<NoWarn>$(NoWarn);xUnit1013</NoWarn>
87
<DebugSymbols>True</DebugSymbols>
98
<LangVersion>latest</LangVersion>
109
<IsTestProject>True</IsTestProject>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\Tests.Core\Tests.Core.csproj" />
14-
<ProjectReference Include="..\..\Auxiliary\Elasticsearch.Net.Virtual\Elasticsearch.Net.Virtual.csproj" />
1513

1614
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
1715
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
@@ -28,6 +26,12 @@
2826
<PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
2927
<PackageReference Include="Ben.Demystifier" Version="0.1.4" />
3028
</ItemGroup>
29+
<ItemGroup Condition="'$(TestPackageVersion)'!=''">
30+
<PackageReference Include="Elasticsearch.Net.Virtual" Version="$(TestPackageVersion)" />
31+
</ItemGroup>
32+
<ItemGroup Condition="'$(TestPackageVersion)'==''">
33+
<ProjectReference Include="..\..\Auxiliary\Elasticsearch.Net.Virtual\Elasticsearch.Net.Virtual.csproj" />
34+
</ItemGroup>
3135
<ItemGroup>
3236
<EmbeddedResource Include="Document\Single\Index\Attachment_Test_Document.pdf" />
3337
</ItemGroup>

0 commit comments

Comments
 (0)