Finalise for 0.3.0 by addressing some open issues (#41)

stevejgordon · web-flow · commit f558c5923cad · 2022-01-25T19:11:16.000Z
* Simplify namespace and add missing license headers
* Naming clarification
* Update CI SDK version
* Update gitignore
* Update to net 6.0
* Update tooling
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,9 @@ jobs:
         git tag --list
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.100'
+        dotnet-version: | 
+          5.0.x
+          6.0.x
         source-url: https://nuget.pkg.github.com/elastic/index.json
       env:
         NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,5 @@ project.lock.json
 /src/.vs/restore.dg
 src/packages/
 BenchmarkDotNet.Artifacts
+
+/.ionide/symbolCache.db
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+Location: https://www.elastic.co/community/codeofconduct
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,12 +16,11 @@
     
     <DefineConstants Condition="'$(TargetFramework)'=='net461'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
     <DefineConstants Condition="$(DefineConstants.Contains(FULLFRAMEWORK)) == False">$(DefineConstants);DOTNETCORE</DefineConstants>
-    <DefineConstants Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">$(DefineConstants);NET5_COMPATIBLE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="">
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.3.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0" PrivateAssets="all"/>
+    <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2" PrivateAssets="all"/>
   </ItemGroup>
 </Project>
diff --git a/benchmarks/Elastic.Transport.Benchmarks/Elastic.Transport.Benchmarks.csproj b/benchmarks/Elastic.Transport.Benchmarks/Elastic.Transport.Benchmarks.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
diff --git a/benchmarks/Elastic.Transport.Profiling/Elastic.Transport.Profiling.csproj b/benchmarks/Elastic.Transport.Profiling/Elastic.Transport.Profiling.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs
@@ -21,7 +21,7 @@ let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"])
 let private currentVersion =
     lazy(
         restoreTools.Value |> ignore
-        let r = Proc.Start("dotnet", "minver", "-d", "canary", "-m", "0.1")
+        let r = Proc.Start("dotnet", "minver", "--default-pre-release-phase", "canary", "-m", "0.1")
         let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith("MinVer:")))
         o.Line
     )
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "minver-cli": {
-      "version": "2.3.1",
+      "version": "2.5.0",
       "commands": [
         "minver"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "nupkg-validator": {
-      "version": "0.4.0",
+      "version": "0.5.0",
       "commands": [
         "nupkg-validator"
       ]
diff --git a/src/Elastic.Transport.VirtualizedCluster/Components/VirtualClusterConnection.cs b/src/Elastic.Transport.VirtualizedCluster/Components/VirtualClusterConnection.cs
@@ -187,7 +187,7 @@ Func<TRule, byte[]> successResponse
 				if (always)
 					return Always<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);
 
-				if (rule.Executed > times) continue;
+				if (rule.ExecuteCount > times) continue;
 
 				return Sometimes<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);
 			}
@@ -198,7 +198,7 @@ Func<TRule, byte[]> successResponse
 				if (always)
 					return Always<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);
 
-				if (rule.Executed > times) continue;
+				if (rule.ExecuteCount > times) continue;
 
 				return Sometimes<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);
 			}
diff --git a/src/Elastic.Transport.VirtualizedCluster/Rules/RuleBase.cs b/src/Elastic.Transport.VirtualizedCluster/Rules/RuleBase.cs
@@ -34,7 +34,7 @@ public interface IRule
 		RuleOption<TimesHelper.AllTimes, int> Times { get; set; }
 
 		/// <summary> The amount of times this rule has been executed</summary>
-		int Executed { get; }
+		int ExecuteCount { get; }
 
 		/// <summary> Mark a rule as executed </summary>
 		void RecordExecuted();
@@ -43,7 +43,7 @@ public interface IRule
 	public abstract class RuleBase<TRule> : IRule
 		where TRule : RuleBase<TRule>, IRule
 	{
-		private int _executed;
+		private int _executeCount;
 		RuleOption<Exception, int> IRule.AfterSucceeds { get; set; }
 		int? IRule.OnPort { get; set; }
 		RuleOption<Exception, int> IRule.Return { get; set; }
@@ -54,9 +54,9 @@ public abstract class RuleBase<TRule> : IRule
 		TimeSpan? IRule.Takes { get; set; }
 		RuleOption<TimesHelper.AllTimes, int> IRule.Times { get; set; }
 
-		int IRule.Executed => _executed;
+		int IRule.ExecuteCount => _executeCount;
 
-		void IRule.RecordExecuted() => Interlocked.Increment(ref _executed);
+		void IRule.RecordExecuted() => Interlocked.Increment(ref _executeCount);
 
 		public TRule OnPort(int port)
 		{
diff --git a/src/Elastic.Transport/Components/Pipeline/DefaultResponseBuilder.cs b/src/Elastic.Transport/Components/Pipeline/DefaultResponseBuilder.cs
@@ -1,3 +1,7 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/src/Elastic.Transport/Components/Serialization/Converters/ErrorCauseConverter.cs b/src/Elastic.Transport/Components/Serialization/Converters/ErrorCauseConverter.cs
@@ -8,7 +8,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Elastic.Transport.Extensions;
-using Elastic.Transport.Products.Elasticsearch.Failures;
+using Elastic.Transport.Products.Elasticsearch;
 
 namespace Elastic.Transport
 {
diff --git a/src/Elastic.Transport/Components/Serialization/SerializerRegistrationInformation.cs b/src/Elastic.Transport/Components/Serialization/SerializerRegistrationInformation.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to Elasticsearch B.V under one or more agreements.
+// Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
diff --git a/src/Elastic.Transport/Components/TransportClient/Content/RequestDataContent.cs b/src/Elastic.Transport/Components/TransportClient/Content/RequestDataContent.cs
@@ -73,7 +73,7 @@ private static async Task OnStreamAvailableAsync(RequestData data, Stream stream
 		{
 			if (data.HttpCompression) stream = new GZipStream(stream, CompressionMode.Compress, false);
 
-#if NET5_COMPATIBLE
+#if NET5_0_OR_GREATER
 			await
 #endif
 				using (stream)
@@ -93,7 +93,7 @@ protected override Task SerializeToStreamAsync(Stream stream, TransportContext c
 			SerializeToStreamAsync(stream, context, default);
 
 		protected
-#if NET5_COMPATIBLE
+#if NET5_0_OR_GREATER
 			override
 #endif
 			async Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken)
@@ -105,7 +105,7 @@ async Task SerializeToStreamAsync(Stream stream, TransportContext context, Cance
 			await serializeToStreamTask.Task.ConfigureAwait(false);
 		}
 
-#if NET5_COMPATIBLE
+#if NET5_0_OR_GREATER
 		protected override void SerializeToStream(Stream stream, TransportContext context, CancellationToken _)
 		{
 			var serializeToStreamTask = new TaskCompletionSource<bool>();
diff --git a/src/Elastic.Transport/Components/TransportClient/HandlerTracking/ActiveHandlerTrackingEntry.cs b/src/Elastic.Transport/Components/TransportClient/HandlerTracking/ActiveHandlerTrackingEntry.cs
@@ -4,7 +4,7 @@
 
  // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 
 #if DOTNETCORE
 using System;
diff --git a/src/Elastic.Transport/Components/TransportClient/HandlerTracking/ExpiredHandlerTrackingEntry.cs b/src/Elastic.Transport/Components/TransportClient/HandlerTracking/ExpiredHandlerTrackingEntry.cs
@@ -4,7 +4,7 @@
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 
 #if DOTNETCORE
 using System;
diff --git a/src/Elastic.Transport/Components/TransportClient/HandlerTracking/LifetimeTrackingHttpMessageHandler.cs b/src/Elastic.Transport/Components/TransportClient/HandlerTracking/LifetimeTrackingHttpMessageHandler.cs
@@ -4,7 +4,7 @@
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 
 #if DOTNETCORE
 using System.Net.Http;
diff --git a/src/Elastic.Transport/Components/TransportClient/HandlerTracking/RequestDataHttpClientFactory.cs b/src/Elastic.Transport/Components/TransportClient/HandlerTracking/RequestDataHttpClientFactory.cs
@@ -4,7 +4,7 @@
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 
 #if DOTNETCORE
 using System;
diff --git a/src/Elastic.Transport/Components/TransportClient/HandlerTracking/ValueStopWatch.cs b/src/Elastic.Transport/Components/TransportClient/HandlerTracking/ValueStopWatch.cs
@@ -4,7 +4,7 @@
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 
 #if DOTNETCORE
 using System;
diff --git a/src/Elastic.Transport/Configuration/ConnectionInfo.cs b/src/Elastic.Transport/Configuration/ConnectionInfo.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to Elasticsearch B.V under one or more agreements.
+// Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
diff --git a/src/Elastic.Transport/Configuration/Security/ApiKey.cs b/src/Elastic.Transport/Configuration/Security/ApiKey.cs
@@ -21,7 +21,7 @@ public class ApiKey : IAuthenticationHeader
 		private SecureString Value { get; }
 
 		/// <inheritdoc cref="IAuthenticationHeader.Header"/>
-		public virtual string Header { get; } = "Bearer";
+		public virtual string Header { get; } = "ApiKey";
 
 		/// <inheritdoc cref="IAuthenticationHeader.TryGetHeader"/>
 		public bool TryGetHeader(out string value)
diff --git a/src/Elastic.Transport/Extensions/NativeMethods.cs b/src/Elastic.Transport/Extensions/NativeMethods.cs
@@ -4,7 +4,7 @@
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 // https://raw.githubusercontent.com/dotnet/core-setup/master/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/NativeMethods.Windows.cs
 
 #if NET461
diff --git a/src/Elastic.Transport/Extensions/RuntimeInformation.cs b/src/Elastic.Transport/Extensions/RuntimeInformation.cs
@@ -4,7 +4,7 @@
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 // https://raw.githubusercontent.com/dotnet/core-setup/master/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/NativeMethods.Windows.cs
 
 #if NET461
diff --git a/src/Elastic.Transport/ITransport.cs b/src/Elastic.Transport/ITransport.cs
@@ -1,3 +1,7 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/src/Elastic.Transport/Products/Elasticsearch/ElasticsearchProductRegistration.cs b/src/Elastic.Transport/Products/Elasticsearch/ElasticsearchProductRegistration.cs
@@ -5,14 +5,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Elastic.Transport.Products.Elasticsearch.Failures;
-using Elastic.Transport.Products.Elasticsearch.Sniff;
 
 namespace Elastic.Transport.Products.Elasticsearch
 {
diff --git a/src/Elastic.Transport/Products/Elasticsearch/ElasticsearchResponse.cs b/src/Elastic.Transport/Products/Elasticsearch/ElasticsearchResponse.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Text;
-using Elastic.Transport.Products.Elasticsearch.Failures;
 
 namespace Elastic.Transport.Products.Elasticsearch
 {
diff --git a/src/Elastic.Transport/Products/Elasticsearch/ElasticsearchResponseBuilder.cs b/src/Elastic.Transport/Products/Elasticsearch/ElasticsearchResponseBuilder.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text.Json;
-using Elastic.Transport.Products.Elasticsearch.Failures;
 
 namespace Elastic.Transport.Products.Elasticsearch
 {
diff --git a/src/Elastic.Transport/Products/Elasticsearch/Failures/Error.cs b/src/Elastic.Transport/Products/Elasticsearch/Failures/Error.cs
@@ -10,7 +10,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Elastic.Transport.Products.Elasticsearch.Failures
+namespace Elastic.Transport.Products.Elasticsearch
 {
 	/// <summary> Represents the serialized Elasticsearch java exception that caused a request to fail </summary>
 	[DataContract]
diff --git a/src/Elastic.Transport/Products/Elasticsearch/Failures/ErrorCause.cs b/src/Elastic.Transport/Products/Elasticsearch/Failures/ErrorCause.cs
@@ -7,7 +7,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace Elastic.Transport.Products.Elasticsearch.Failures
+namespace Elastic.Transport.Products.Elasticsearch
 {
 	/// <summary> Represents an Elasticsearch server exception. </summary>
 	[DataContract]
diff --git a/src/Elastic.Transport/Products/Elasticsearch/Failures/ServerError.cs b/src/Elastic.Transport/Products/Elasticsearch/Failures/ServerError.cs
@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Elastic.Transport.Products.Elasticsearch.Failures
+namespace Elastic.Transport.Products.Elasticsearch
 {
 	/// <summary> Represents the error response as returned by Elasticsearch. </summary>
 	[DataContract]
diff --git a/src/Elastic.Transport/Products/Elasticsearch/Failures/ShardFailure.cs b/src/Elastic.Transport/Products/Elasticsearch/Failures/ShardFailure.cs
@@ -5,7 +5,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace Elastic.Transport.Products.Elasticsearch.Failures
+namespace Elastic.Transport.Products.Elasticsearch
 {
 	/// <summary> Represents a failure that occurred on a shard involved in the request </summary>
 	[DataContract]
diff --git a/src/Elastic.Transport/Products/Elasticsearch/IResponse.cs b/src/Elastic.Transport/Products/Elasticsearch/IResponse.cs
@@ -1,6 +1,9 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using System;
 using System.Text.Json.Serialization;
-using Elastic.Transport;
 
 namespace Elastic.Transport.Products.Elasticsearch
 {
diff --git a/src/Elastic.Transport/Products/Elasticsearch/ResponseBase.cs b/src/Elastic.Transport/Products/Elasticsearch/ResponseBase.cs
@@ -1,12 +1,11 @@
 // Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
+// See the LICENSE file in the project root for more information
 
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json.Serialization;
-using Elastic.Transport.Products.Elasticsearch.Failures;
 
 namespace Elastic.Transport.Products.Elasticsearch
 {
diff --git a/src/Elastic.Transport/Products/Elasticsearch/Sniff/SniffResponse.cs b/src/Elastic.Transport/Products/Elasticsearch/Sniff/SniffResponse.cs
@@ -11,7 +11,7 @@
 using Elastic.Transport.Extensions;
 using static Elastic.Transport.Products.Elasticsearch.ElasticsearchNodeFeatures;
 
-namespace Elastic.Transport.Products.Elasticsearch.Sniff
+namespace Elastic.Transport.Products.Elasticsearch
 {
 	/// <summary>
 	/// Elasticsearch returns addresses in the form of
diff --git a/src/Elastic.Transport/Requests/MetaData/RequestConfigurationExtensions.cs b/src/Elastic.Transport/Requests/MetaData/RequestConfigurationExtensions.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to Elasticsearch B.V under one or more agreements.
+// Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
diff --git a/src/Elastic.Transport/Requests/MetaData/RequestMetaDataExtensions.cs b/src/Elastic.Transport/Requests/MetaData/RequestMetaDataExtensions.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to Elasticsearch B.V under one or more agreements.
+// Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
diff --git a/src/Elastic.Transport/Requests/MetaData/VersionInfo.cs b/src/Elastic.Transport/Requests/MetaData/VersionInfo.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to Elasticsearch B.V under one or more agreements.
+// Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
diff --git a/src/Elastic.Transport/Responses/IErrorResponse.cs b/src/Elastic.Transport/Responses/IErrorResponse.cs
@@ -1,3 +1,7 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 namespace Elastic.Transport;
 
 /// <summary>
diff --git a/src/Elastic.Transport/StringExtensions.cs b/src/Elastic.Transport/StringExtensions.cs
diff --git a/src/Elastic.Transport/Transport.cs b/src/Elastic.Transport/Transport.cs
diff --git a/src/Elastic.Transport/TransportExtensions.cs b/src/Elastic.Transport/TransportExtensions.cs
diff --git a/tests/Elastic.Transport.IntegrationTests/Elastic.Transport.IntegrationTests.csproj b/tests/Elastic.Transport.IntegrationTests/Elastic.Transport.IntegrationTests.csproj
diff --git a/tests/Elastic.Transport.Tests/AddressParsing.cs b/tests/Elastic.Transport.Tests/AddressParsing.cs
diff --git a/tests/Elastic.Transport.Tests/Elastic.Transport.Tests.csproj b/tests/Elastic.Transport.Tests/Elastic.Transport.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Location: https://www.elastic.co/community/codeofconduct`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"])`
`21`	`21`	`let private currentVersion =`
`22`	`22`	`lazy(`
`23`	`23`	`restoreTools.Value \|> ignore`
`24`		`- let r = Proc.Start("dotnet", "minver", "-d", "canary", "-m", "0.1")`
	`24`	`+ let r = Proc.Start("dotnet", "minver", "--default-pre-release-phase", "canary", "-m", "0.1")`
`25`	`25`	`let o = r.ConsoleOut \|> Seq.find (fun l -> not(l.Line.StartsWith("MinVer:")))`
`26`	`26`	`o.Line`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"minver-cli": {`
`6`		`- "version": "2.3.1",`
	`6`	`+ "version": "2.5.0",`
`7`	`7`	`"commands": [`
`8`	`8`	`"minver"`
`9`	`9`	`]`
`@@ -21,7 +21,7 @@`
`21`	`21`	`]`
`22`	`22`	`},`
`23`	`23`	`"nupkg-validator": {`
`24`		`- "version": "0.4.0",`
	`24`	`+ "version": "0.5.0",`
`25`	`25`	`"commands": [`
`26`	`26`	`"nupkg-validator"`
`27`	`27`	`]`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ Func<TRule, byte[]> successResponse`
`187`	`187`	`if (always)`
`188`	`188`	`return Always<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);`
`189`	`189`
`190`		`- if (rule.Executed > times) continue;`
	`190`	`+ if (rule.ExecuteCount > times) continue;`
`191`	`191`
`192`	`192`	`return Sometimes<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);`
`193`	`193`	`}`
`@@ -198,7 +198,7 @@ Func<TRule, byte[]> successResponse`
`198`	`198`	`if (always)`
`199`	`199`	`return Always<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);`
`200`	`200`
`201`		`- if (rule.Executed > times) continue;`
	`201`	`+ if (rule.ExecuteCount > times) continue;`
`202`	`202`
`203`	`203`	`return Sometimes<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, rule);`
`204`	`204`	`}`