Merge branch 'release/2.2.0'

.config/dotnet-tools.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-format": {
+      "version": "3.1.37601",
+      "commands": [
+        "dotnet-format"
+      ]
+    },
+    "cake.tool": {
+      "version": "0.35.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}

.editorconfig

@@ -0,0 +1,168 @@
+###############################
+# Core EditorConfig Options   #
+###############################
+
+root = true
+
+# All files
+[*]
+indent_style = space
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+
+###############################
+# .NET Coding Conventions     #
+###############################
+
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+
+###############################
+# Naming Conventions          #
+###############################
+
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+
+# Use PascalCase for constant fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+
+###############################
+# C# Code Style Rules         #
+###############################
+
+# IDE0060: Remove unused parameter
+dotnet_code_quality_unused_parameters = all:warning
+
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+
+# Pattern-matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+###############################
+# C# Formatting Rules         #
+###############################
+
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+
+##################################
+# Visual Basic Code Style Rules  #
+##################################
+
+# CA1032: Implement standard exception constructors
+dotnet_diagnostic.CA1032.severity = none
+
+# CA1034: Nested types should not be visible
+dotnet_diagnostic.CA1034.severity = none
+
+# CA1813: Avoid unsealed attributes
+dotnet_diagnostic.CA1813.severity = silent
+
+# CA1012: Abstract types should not have constructors
+dotnet_diagnostic.CA1012.severity = none
+
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

.gitignore

@@ -275,7 +275,7 @@ __pycache__/
 *.pyc
 
 # Cake - Uncomment if you are using it
-# tools/**
+tools/**
 # !tools/packages.config
 
 # Telerik's JustMock configuration file

README.md

@@ -19,10 +19,6 @@ Install-Package SAHB.GraphQL.Client
 - .NET Standard 1.2
 - .NET Framework 4.5.2
 
-[SAHB.GraphQL.Client.Introspection](https://www.nuget.org/packages/SAHB.GraphQL.Client.Introspection/):
-- .NET Standard 1.2
-- .NET Framework 4.5.2
-
 [SAHB.GraphQL.Client.Subscription](https://www.nuget.org/packages/SAHB.GraphQL.Client.Subscription/):
 - .NET Standard 2.0
 - .NET Framework 4.5.2
@@ -189,4 +185,4 @@ The GraphQLclient has a package which contains a introspection query to inspect
 Documentation can be found in [Documentation.md](Documentation.md) file.
 
 ## Example projects
-Example projects can be found in the path examples
+Example projects can be found in the path examples

Version.props.template

@@ -0,0 +1,6 @@
+<!-- Do not edit this file, this will be overwritten automatically -->
+<Project>
+	<PropertyGroup>
+		<Version>1.0.0</Version>
+	</PropertyGroup>
+</Project>

appveyor.yml

@@ -1,9 +1,7 @@
 version: '{build}'
-image: Visual Studio 2017
+image: Visual Studio 2019
 build_script:
-  - cmd: git submodule update --init --recursive
-  - ps: cd Build
-  - ps: .\build.ps1 -Target "Test"
+  - ps: .\build.ps1
 artifacts:
 - path: src\**\*.nupkg
   name: NuGet

build.cake

@@ -0,0 +1,123 @@
+#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
+
+//////////////////////////////////////////////////////////////////////
+// CONFIGURATIONS
+//////////////////////////////////////////////////////////////////////
+
+var versionPropsTemplate = "./Version.props.template";
+var versionProps = "./Version.props";
+var sln = "SAHB.GraphQL.Client.sln";
+
+//////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+//////////////////////////////////////////////////////////////////////
+
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Release");
+
+//////////////////////////////////////////////////////////////////////
+// TASKS
+//////////////////////////////////////////////////////////////////////
+
+Task("Clean")
+    .Does(() =>
+{
+    CleanDirectories("./src/**/bin");
+	CleanDirectories("./src/**/obj");
+	CleanDirectories("./tests/**/bin");
+	CleanDirectories("./tests/**/obj");
+});
+
+GitVersion versionInfo = null;
+Task("Version")
+    .Does(() => 
+{
+	GitVersion(new GitVersionSettings{
+		UpdateAssemblyInfo = false,
+		OutputType = GitVersionOutput.BuildServer,
+		WorkingDirectory = "."
+	});
+	versionInfo = GitVersion(new GitVersionSettings{
+		UpdateAssemblyInfo = false,
+		OutputType = GitVersionOutput.Json,
+		WorkingDirectory = "."
+	});
+		
+	// Update version
+	var updatedVersionProps = System.IO.File.ReadAllText(versionPropsTemplate)
+		.Replace("1.0.0", versionInfo.NuGetVersion);
+
+	System.IO.File.WriteAllText(versionProps, updatedVersionProps);
+});
+
+Task("Restore-NuGet-Packages")
+    .Does(() =>
+{
+    DotNetCoreRestore(sln);
+});
+
+Task("Build")
+	.IsDependentOn("Clean")
+	.IsDependentOn("Version")
+	.IsDependentOn("Restore-NuGet-Packages")
+    .Does(() =>
+{
+	var settings = new DotNetCoreBuildSettings
+    {
+		Configuration = configuration
+    };
+
+	DotNetCoreBuild(sln, settings);
+});
+
+Task("Publish")
+	.IsDependentOn("Build")
+	.Does(() =>
+{
+	var settings = new DotNetCorePublishSettings
+    {
+		Configuration = configuration
+    };
+
+	DotNetCorePublish(sln, settings);
+});
+
+Task("Test-CI")
+    .Does(() =>
+{
+	foreach (var test in System.IO.Directory.GetFiles("./tests/", "*.Tests.csproj", SearchOption.AllDirectories))
+	{
+		var settings = new DotNetCoreTestSettings
+		{
+			Configuration = configuration,
+			NoBuild = true,
+			ArgumentCustomization = args=>args.Append("--logger \"trx;LogFileName=TestResults.trx\""),
+		};
+	
+		DotNetCoreTest(test, settings);
+	}
+});
+
+Task("Test-Format")
+	.Does(() =>
+{
+	DotNetCoreTool(sln, "dotnet-format", "--check --dry-run");
+});
+
+Task("Test")
+	.IsDependentOn("Build")
+	.IsDependentOn("Test-Format")
+    .IsDependentOn("Test-CI");
+
+//////////////////////////////////////////////////////////////////////
+// TASK TARGETS
+//////////////////////////////////////////////////////////////////////
+
+Task("Default")
+    .IsDependentOn("Test");
+
+//////////////////////////////////////////////////////////////////////
+// EXECUTION
+//////////////////////////////////////////////////////////////////////
+
+RunTarget(target);

build.ps1

@@ -0,0 +1,8 @@
+# Ensure build error would be reported
+$ErrorActionPreference = "Stop";
+
+# Restore tools
+dotnet tool restore
+
+# Run cake build
+dotnet tool run dotnet-cake build.cake

examples/SAHB.GraphQLClient.Examples/Program.cs

@@ -21,15 +21,15 @@ static async Task Main(string[] args)
             // Get response from url using the HeroQuery object
             var response = await client.Query<HeroQuery>("https://mpjk0plp9.lp.gql.zone/graphql");
             Console.WriteLine(response.Hero.Name);
-            
+
             // Get response from url using a generated object
-            var query = client.CreateQuery(builder => 
-                builder.Field("hero", 
-                    hero => 
+            var query = client.CreateQuery(builder =>
+                builder.Field("hero",
+                    hero =>
                         hero
                             .Field("name")
-                            .Field("friends", 
-                                friends => 
+                            .Field("friends",
+                                friends =>
                                     friends.Alias("MyFriends").Field("name"))),
                 "https://mpjk0plp9.lp.gql.zone/graphql");
             var builderResponse = await query.Execute();