Skip to content

Commit f898243

Browse files
russcamrusscam
committed
Merge branch 'master' into fix/3378
# Conflicts: # src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs # src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs # src/Elasticsearch.Net/Responses/Special/BytesResponse.cs # src/Elasticsearch.Net/Responses/Special/StringResponse.cs # src/Tests/Tests.Reproduce/BytesResponseTests.cs
2 parents 2ef5f46 + 0e662d8 commit f898243

File tree

2,596 files changed

+48975
-46135
lines changed

Some content is hidden

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

2,596 files changed

+48975
-46135
lines changed

‎.editorconfig‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,20 @@ indent_size = 2
2828
# currently not supported in Rider/Resharper so not using these for now
2929
# ---
3030

31-
3231
# ---
3332
# langugage conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#language-conventions
3433

3534
# Sort using and Import directives with System.* appearing first
3635
dotnet_sort_system_directives_first = true
3736

3837
# Prefer this.X except for _fields
39-
dotnet_style_qualification_for_field = false:none
40-
dotnet_style_qualification_for_property = true:warning
41-
dotnet_style_qualification_for_method = true:warning
42-
dotnet_style_qualification_for_event = true:warning
38+
# TODO can we force _ for private fields?
39+
# TODO elevate severity after code cleanup to warning minimum
40+
# TODO use language latest
41+
dotnet_style_qualification_for_field = false:error
42+
dotnet_style_qualification_for_property = false:error
43+
dotnet_style_qualification_for_method = false:error
44+
dotnet_style_qualification_for_event = false:error
4345

4446
# Use language keywords instead of framework type names for type references
4547
dotnet_style_predefined_type_for_locals_parameters_members = true:error
@@ -49,13 +51,13 @@ dotnet_style_predefined_type_for_member_access = true:error
4951
dotnet_style_object_initializer = true:error
5052
dotnet_style_collection_initializer = true:error
5153
dotnet_style_explicit_tuple_names = true:error
52-
dotnet_style_prefer_inferred_anonymous_type_member_names = true
53-
dotnet_style_prefer_inferred_tuple_names = true
54+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:error
55+
dotnet_style_prefer_inferred_tuple_names = true:error
5456
dotnet_style_coalesce_expression = true:error
5557
dotnet_style_null_propagation = true:error
5658

5759
dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
58-
dotnet_style_readonly_field = true
60+
dotnet_style_readonly_field = true:error
5961

6062
# CSharp code style settings:
6163
[*.cs]
@@ -64,7 +66,6 @@ csharp_style_var_for_built_in_types = true:error
6466
csharp_style_var_when_type_is_apparent = true:error
6567
csharp_style_var_elsewhere = true:error
6668

67-
6869
csharp_style_expression_bodied_methods = true:error
6970
csharp_style_expression_bodied_constructors = true:error
7071
csharp_style_expression_bodied_operators = true:error
@@ -82,7 +83,7 @@ csharp_style_throw_expression = true:error
8283
csharp_style_conditional_delegate_call = true:error
8384

8485
csharp_prefer_braces = false:warning
85-
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
86+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:error
8687

8788
# ---
8889
# formatting conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions
@@ -93,6 +94,8 @@ csharp_new_line_before_else = true:error
9394
csharp_new_line_before_catch = true:error
9495
csharp_new_line_before_finally = true:error
9596
csharp_new_line_before_members_in_object_initializers = true
97+
# just a suggestion do to our JSON tests that use anonymous types to
98+
# represent json quite a bit (makes copy paste easier).
9699
csharp_new_line_before_members_in_anonymous_types = true:suggestion
97100
csharp_new_line_between_query_expression_clauses = true:error
98101

@@ -105,9 +108,21 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false:error
105108
csharp_space_between_method_call_parameter_list_parentheses = false:error
106109

107110
#Wrap
108-
csharp_preserve_single_line_statements = true
111+
csharp_preserve_single_line_statements = false:error
109112
csharp_preserve_single_line_blocks = true:error
110113

114+
# Resharper
115+
resharper_csharp_braces_for_lock=required_for_complex
116+
resharper_csharp_braces_for_using=required_for_complex
117+
resharper_csharp_braces_for_while=required_for_complex
118+
resharper_csharp_braces_for_foreach=required_for_complex
119+
resharper_csharp_braces_for_for=required_for_complex
120+
resharper_csharp_braces_for_fixed=required_for_complex
121+
resharper_csharp_braces_for_ifelse=required_for_complex
122+
123+
resharper_csharp_accessor_owner_body=expression_body
124+
125+
# Override source included files
111126
[{SimpleJson|SynchronizedCollection}.cs]
112127
csharp_style_var_for_built_in_types = false:none
113128
csharp_style_var_when_type_is_apparent = false:none

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test-results
2828
test-results/*
2929
*.lib
3030
*.sbr
31-
*.DotSettings
31+
*.DotSettings.user
3232
obj/
3333
[Rr]elease*/
3434
_ReSharper*/

‎.paket/Paket.Restore.targets‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,26 @@
1111
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
1212
<PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
1313
<PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
14+
<PaketBootstrapperStyle>classic</PaketBootstrapperStyle>
15+
<PaketBootstrapperStyle Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">proj</PaketBootstrapperStyle>
16+
<PaketExeImage>assembly</PaketExeImage>
17+
<PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
1418
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
1519
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
1620
<!-- Paket command -->
21+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
1722
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
18-
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
19-
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
20-
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
2123

22-
<!-- .net core fdd -->
23-
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
24-
<PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
24+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
25+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
26+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
2527

26-
<!-- no extension is a shell script -->
27-
<PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
28+
<!-- Paket command -->
29+
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
30+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
31+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
32+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
33+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
2834

2935
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
3036
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
@@ -38,7 +44,11 @@
3844
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
3945
</PropertyGroup>
4046

41-
<Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
47+
<Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
48+
<MSBuild Projects="$(PaketToolsPath)paket.bootstrapper.proj" Targets="Restore" />
49+
</Target>
50+
51+
<Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" DependsOnTargets="PaketBootstrapping">
4252

4353
<!-- Step 1 Check if lockfile is properly restored -->
4454
<PropertyGroup>
@@ -72,9 +82,12 @@
7282
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
7383
</PropertyGroup>
7484

85+
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
86+
<PaketRestoreRequired>true</PaketRestoreRequired>
87+
</PropertyGroup>
7588

7689
<!-- Do a global restore if required -->
77-
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
90+
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
7891
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
7992

8093
<!-- Step 2 Detect project specific changes -->
@@ -93,7 +106,7 @@
93106
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
94107
<!-- paket.references -->
95108
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
96-
109+
97110
<DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
98111
<DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
99112
<PaketRestoreRequired>true</PaketRestoreRequired>
@@ -132,11 +145,11 @@
132145
<Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
133146

134147
<!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
135-
<ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
148+
<ReadLinesFromFile Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" >
136149
<Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
137150
</ReadLinesFromFile>
138151

139-
<ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
152+
<ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " >
140153
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
141154
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
142155
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>

0 commit comments

Comments
 (0)