Skip to content

Commit fa70031

Browse files
committed
Move shared to client project
1 parent 97da645 commit fa70031

File tree

266 files changed

+13
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+13
-16
lines changed

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<FileVersion>$(CurrentAssemblyFileVersion)</FileVersion>
1616
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1717
<MajorVersion>$(Version.Split('.')[0])</MajorVersion>
18-
<ArtifactsPath>.artifacts</ArtifactsPath>
18+
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.sh))</SolutionRoot>
19+
<ArtifactsPath>$(MSBuildThisFileDirectory).artifacts</ArtifactsPath>
1920
</PropertyGroup>
2021

2122
<!-- Common Nuget metadata-->

Elasticsearch.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsear
5555
EndProject
5656
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsearch.Serverless", "src\Elastic.Clients.Elasticsearch.Serverless\Elastic.Clients.Elasticsearch.Serverless.csproj", "{49D7F5A7-AA32-492B-B957-0E3325861F55}"
5757
EndProject
58-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsearch.Shared", "src\Elastic.Clients.Elasticsearch.Shared\Elastic.Clients.Elasticsearch.Shared.csproj", "{A90DD7B8-8AFB-4BE9-AA16-B159A880E79D}"
59-
EndProject
6058
Global
6159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6260
Debug|Any CPU = Debug|Any CPU
@@ -111,10 +109,6 @@ Global
111109
{49D7F5A7-AA32-492B-B957-0E3325861F55}.Debug|Any CPU.Build.0 = Debug|Any CPU
112110
{49D7F5A7-AA32-492B-B957-0E3325861F55}.Release|Any CPU.ActiveCfg = Release|Any CPU
113111
{49D7F5A7-AA32-492B-B957-0E3325861F55}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{A90DD7B8-8AFB-4BE9-AA16-B159A880E79D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{A90DD7B8-8AFB-4BE9-AA16-B159A880E79D}.Debug|Any CPU.Build.0 = Debug|Any CPU
116-
{A90DD7B8-8AFB-4BE9-AA16-B159A880E79D}.Release|Any CPU.ActiveCfg = Release|Any CPU
117-
{A90DD7B8-8AFB-4BE9-AA16-B159A880E79D}.Release|Any CPU.Build.0 = Release|Any CPU
118112
EndGlobalSection
119113
GlobalSection(SolutionProperties) = preSolution
120114
HideSolutionNode = FALSE
@@ -132,7 +126,6 @@ Global
132126
{F6162603-D134-4121-8106-2BA4DAD7350B} = {362B2776-4B29-46AB-B237-56776B5372B6}
133127
{8C9275D9-29CE-4A20-8FD5-6B26C6CAAADB} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
134128
{49D7F5A7-AA32-492B-B957-0E3325861F55} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
135-
{A90DD7B8-8AFB-4BE9-AA16-B159A880E79D} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
136129
EndGlobalSection
137130
GlobalSection(ExtensibilityGlobals) = postSolution
138131
SolutionGuid = {CE74F821-B001-4C69-A58D-CF81F8B0B632}

src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
4242
</ItemGroup>
4343
<ItemGroup>
44-
<Compile Include="..\Elastic.Clients.Elasticsearch.Shared\*.cs"/>
45-
<Compile Include="..\Elastic.Clients.Elasticsearch.Shared\**\*.cs"/>
44+
<Compile Include="..\Elastic.Clients.Elasticsearch\_Shared\**\*.cs" />
4645
</ItemGroup>
4746

4847
</Project>

src/Elastic.Clients.Elasticsearch/Elastic.Clients.Elasticsearch.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,4 @@
4343
<ItemGroup>
4444
<Folder Include="Api\IndexManagement\" />
4545
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="..\Elastic.Clients.Elasticsearch.Shared\*.cs"/>
48-
<Compile Include="..\Elastic.Clients.Elasticsearch.Shared\**\*.cs"/>
49-
</ItemGroup>
5046
</Project>

src/Elastic.Clients.Elasticsearch.Shared/Core/Request/ApiUrls.cs renamed to src/Elastic.Clients.Elasticsearch/_Shared/Core/Request/ApiUrls.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal ApiUrls(string[] routes)
5656
}
5757

5858
/// <summary>
59-
/// Creates a lookup for number of parts <=> list of routes with that number of parts.
59+
/// Creates a lookup for number of parts %lt;=&gt; list of routes with that number of parts.
6060
/// <see cref="UrlLookup.Matches" /> allows us to quickly find the right url to use in the list.
6161
/// </summary>
6262
public Dictionary<int, List<UrlLookup>> Routes { get; }

src/Elastic.Clients.Elasticsearch.Shared/Elastic.Clients.Elasticsearch.Shared.csproj renamed to src/Elastic.Clients.Elasticsearch/_Shared/Elastic.Clients.Elasticsearch.Shared.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,17 @@
1212
<PropertyGroup>
1313
<IsPackable>false</IsPackable>
1414
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15-
<TargetFrameworks>netstandard2.0;net462;netstandard2.1;net6.0;net8.0</TargetFrameworks>
15+
<TargetFramework>net8.0</TargetFramework>
1616
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
1717
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1818
<Nullable>annotations</Nullable>
1919
</PropertyGroup>
20+
21+
<ItemGroup>
22+
<PackageReference Include="Elastic.Transport" Version="0.4.22" />
23+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.44">
24+
<PrivateAssets>all</PrivateAssets>
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
26+
</PackageReference>
27+
</ItemGroup>
2028
</Project>

0 commit comments

Comments
 (0)