Skip to content

Commit ed1fef6

Browse files
MpdreamzMpdreamz
committed
ported csproj/sln changes over from 5.x branch
1 parent 38750ad commit ed1fef6

File tree

3 files changed

+29
-57
lines changed

3 files changed

+29
-57
lines changed

‎build/Clients.Common.targets‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@
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>
17+
<!-- 'dotnet xunit' does a build but has no way to pass properties or prevent build so we snoop for TRAVIS here
18+
Ideally we handle this in the FAKE script (which we do for 'dotnet build')
19+
TODO too lazy to write and test a <CHOOSE>
20+
-->
21+
<DotNetCoreOnly Condition="'$(TRAVIS)'=='true'">1</DotNetCoreOnly>
22+
<DotNetCoreOnly Condition="'$(TRAVIS)'==''"></DotNetCoreOnly>
23+
<DoSourceLink></DoSourceLink>
2324
<SignAssembly>true</SignAssembly>
2425
<AssemblyOriginatorKeyFile Condition="'$(DotNetCoreOnly)'==''">..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
2526
<GenerateDocumentationFile Condition="'$(DotNetCoreOnly)'==''">true</GenerateDocumentationFile>
2627
<NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
2728
<Prefer32Bit>false</Prefer32Bit>
2829
<DefineConstants Condition="'$(TargetFramework)'=='netstandard1.3' OR '$(DotNetCoreOnly)'=='1'">$(DefineConstants);DOTNETCORE</DefineConstants>
29-
<DebugType Condition="'$(DotNetCoreOnly)'==''">embedded</DebugType>
30+
<DebugType>embedded</DebugType>
3031
<SourceLink Condition="'$(DoSourceLink)'!=''">$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json</SourceLink>
3132
<RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri>
3233
</PropertyGroup>

‎build/scripts/Releasing.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ module Release =
6060
let PublishCanaryBuild accessKey feed =
6161
!! "build/output/_packages/*-ci*.nupkg"
6262
|> Seq.iter(fun f ->
63-
let source = "https://www.myget.org/F/"+ feed + "/api/v2/package"
64-
let success = Tooling.Nuget.Exec ["push"; f; accessKey; "-source"; source; "-verbosity"; "detailed"; "-noninteractive"]
63+
let source = "https://www.myget.org/F/" + feed + "/api/v2/package"
64+
let success = Tooling.Nuget.Exec ["push"; f; accessKey; "-source"; source]
6565
match success with
6666
| 0 -> traceFAKE "publish to myget succeeded" |> ignore
6767
| _ -> failwith "publish to myget failed" |> ignore

‎src/Elasticsearch.DotNetCoreOnly.sln‎

Lines changed: 19 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,33 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26124.0
5-
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest\Nest.csproj", "{9DE47FF2-26DC-440E-9477-6520A19766E1}"
3+
VisualStudioVersion = 15.0.26403.7
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nest", "Nest\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
76
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net\Elasticsearch.Net.csproj", "{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elasticsearch.Net", "Elasticsearch.Net\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
98
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{309A043F-8C57-4019-A1E0-F140AA414D44}"
9+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
1110
EndProject
1211
Global
1312
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1413
Debug|Any CPU = Debug|Any CPU
15-
Debug|x64 = Debug|x64
16-
Debug|x86 = Debug|x86
1714
Release|Any CPU = Release|Any CPU
18-
Release|x64 = Release|x64
19-
Release|x86 = Release|x86
15+
EndGlobalSection
16+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Debug|Any CPU.Build.0 = Debug|Any CPU
19+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Release|Any CPU.ActiveCfg = Release|Any CPU
20+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Release|Any CPU.Build.0 = Release|Any CPU
21+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Debug|Any CPU.Build.0 = Debug|Any CPU
23+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Release|Any CPU.ActiveCfg = Release|Any CPU
24+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Release|Any CPU.Build.0 = Release|Any CPU
25+
{37164C11-88EF-4428-803A-9AA24FB8B44D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{37164C11-88EF-4428-803A-9AA24FB8B44D}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{37164C11-88EF-4428-803A-9AA24FB8B44D}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{37164C11-88EF-4428-803A-9AA24FB8B44D}.Release|Any CPU.Build.0 = Release|Any CPU
2029
EndGlobalSection
2130
GlobalSection(SolutionProperties) = preSolution
2231
HideSolutionNode = FALSE
2332
EndGlobalSection
24-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Debug|x64.ActiveCfg = Debug|x64
28-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Debug|x64.Build.0 = Debug|x64
29-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Debug|x86.ActiveCfg = Debug|x86
30-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Debug|x86.Build.0 = Debug|x86
31-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Release|x64.ActiveCfg = Release|x64
34-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Release|x64.Build.0 = Release|x64
35-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Release|x86.ActiveCfg = Release|x86
36-
{9DE47FF2-26DC-440E-9477-6520A19766E1}.Release|x86.Build.0 = Release|x86
37-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Debug|x64.ActiveCfg = Debug|x64
40-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Debug|x64.Build.0 = Debug|x64
41-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Debug|x86.ActiveCfg = Debug|x86
42-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Debug|x86.Build.0 = Debug|x86
43-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Release|x64.ActiveCfg = Release|x64
46-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Release|x64.Build.0 = Release|x64
47-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Release|x86.ActiveCfg = Release|x86
48-
{07BC7529-C147-44E5-B7CE-ABC60F46E6FC}.Release|x86.Build.0 = Release|x86
49-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Debug|x64.ActiveCfg = Debug|x64
52-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Debug|x64.Build.0 = Debug|x64
53-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Debug|x86.ActiveCfg = Debug|x86
54-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Debug|x86.Build.0 = Debug|x86
55-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Release|x64.ActiveCfg = Release|x64
58-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Release|x64.Build.0 = Release|x64
59-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Release|x86.ActiveCfg = Release|x86
60-
{309A043F-8C57-4019-A1E0-F140AA414D44}.Release|x86.Build.0 = Release|x86
61-
EndGlobalSection
6233
EndGlobal

0 commit comments

Comments
 (0)