added AssemblyInformationalVersion so we can use semver;

made a breaking change, now exposing the underlying HttpClient rather than a wrapped abstraction;
wis3guy · Jan 14, 2016 · b87b5ff · b87b5ff
1 parent 7f273d6
commit b87b5ff
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 71 deletions.
diff --git a/HalClient.Net/HalClient.Net.csproj b/HalClient.Net/HalClient.Net.csproj
@@ -59,8 +59,6 @@
     <Compile Include="HalHttpClientFactory.cs" />
     <Compile Include="HalHttpClientConfiguration.cs" />
     <Compile Include="HalHttpRequestException.cs" />
-    <Compile Include="INonParsingHttpClient.cs" />
-    <Compile Include="NonParsingHttpClient.cs" />
     <Compile Include="Parser\EmbeddedResourceObject.cs" />
     <Compile Include="Parser\HalJsonParseResult.cs" />
     <Compile Include="Parser\IEmbeddedResourceObject.cs" />

diff --git a/HalClient.Net/HalHttpClient.cs b/HalClient.Net/HalHttpClient.cs
@@ -26,7 +26,6 @@ internal HalHttpClient(IHalJsonParser parser, HttpClient httpClient)
 			_parser = parser;
 			_httpClient = httpClient;
 
-			HttpClient = new NonParsingHttpClient(httpClient);
 			Configuration = new HalHttpClientConfiguration(httpClient);
 		}
 
@@ -35,7 +34,7 @@ internal HalHttpClient(IHalJsonParser parser, HttpClient httpClient)
 		public async Task<IRootResourceObject> PostAsync<T>(Uri uri, T data)
 		{
 			var backup = OverrideAcceptHeaders();
-			var response = await HttpClient.PostAsJsonAsync(uri, data);
+			var response = await _httpClient.PostAsJsonAsync(uri, data);
 
 			RestoreAcceptHeaders(backup);
 
@@ -45,7 +44,7 @@ public async Task<IRootResourceObject> PostAsync<T>(Uri uri, T data)
 		public async Task<IRootResourceObject> PutAsync<T>(Uri uri, T data)
 		{
 			var backup = OverrideAcceptHeaders();
-			var response = await HttpClient.PutAsJsonAsync(uri, data);
+			var response = await _httpClient.PutAsJsonAsync(uri, data);
 
 			RestoreAcceptHeaders(backup);
 
@@ -55,7 +54,7 @@ public async Task<IRootResourceObject> PutAsync<T>(Uri uri, T data)
 		public async Task<IRootResourceObject> GetAsync(Uri uri)
 		{
 			var backup = OverrideAcceptHeaders();
-			var response = await HttpClient.GetAsync(uri);
+			var response = await _httpClient.GetAsync(uri);
 
 			RestoreAcceptHeaders(backup);
 
@@ -65,7 +64,7 @@ public async Task<IRootResourceObject> GetAsync(Uri uri)
 		public async Task<IRootResourceObject> DeleteAsync(Uri uri)
 		{
 			var backup = OverrideAcceptHeaders();
-			var response = await HttpClient.DeleteAsync(uri);
+			var response = await _httpClient.DeleteAsync(uri);
 
 			RestoreAcceptHeaders(backup);
 
@@ -75,7 +74,7 @@ public async Task<IRootResourceObject> DeleteAsync(Uri uri)
 		public async Task<IRootResourceObject> SendAsync(HttpRequestMessage request)
 		{
 			var backup = OverrideAcceptHeaders();
-			var response = await HttpClient.SendAsync(request);
+			var response = await _httpClient.SendAsync(request);
 
 			RestoreAcceptHeaders(backup);
 
@@ -84,7 +83,7 @@ public async Task<IRootResourceObject> SendAsync(HttpRequestMessage request)
 
 		public IRootResourceObject CachedApiRootResource { get; set; }
 
-		public INonParsingHttpClient HttpClient { get; }
+		public HttpClient HttpClient => _httpClient;
 
 		private void RestoreAcceptHeaders(IEnumerable<MediaTypeWithQualityHeaderValue> backup)
 		{

diff --git a/HalClient.Net/IHalHttpClient.cs b/HalClient.Net/IHalHttpClient.cs
@@ -13,6 +13,6 @@ public interface IHalHttpClient : IDisposable
 		Task<IRootResourceObject> DeleteAsync(Uri uri);
 		Task<IRootResourceObject> SendAsync(HttpRequestMessage request);
 		IRootResourceObject CachedApiRootResource { get; }
-		INonParsingHttpClient HttpClient { get; }
+		HttpClient HttpClient { get; }
 	}
 }
diff --git a/HalClient.Net/INonParsingHttpClient.cs b/HalClient.Net/INonParsingHttpClient.cs
diff --git a/HalClient.Net/NonParsingHttpClient.cs b/HalClient.Net/NonParsingHttpClient.cs
diff --git a/HalClient.Net/Properties/AssemblyInfo.cs b/HalClient.Net/Properties/AssemblyInfo.cs
@@ -8,4 +8,5 @@
 [assembly: AssemblyCopyright("Copyright (C) Geoffrey Braaf, WIS3GUY.NET")]
 [assembly: ComVisible(false)]
 [assembly: Guid("cca82297-341f-4b5f-a0fe-e650b25b72eb")]
-[assembly: AssemblyVersion("1.2.*")]
+[assembly: AssemblyVersion("1.3.0.*")]
+[assembly: AssemblyInformationalVersion("1.3.0")]