Merge branch 'dotnet:master' into master-plus-models-update

Author: ACoderLife

Directory.Build.props

@@ -0,0 +1,11 @@
+<Project>
+  <!-- Strong-naming  -->
+  <PropertyGroup Label="Signing">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\Key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Defines the StrongNamePublicKeys class with constant which contains the repo identity public key formatted for use in InternalsVisibleTo attributes. -->
+    <Compile Include="$(MSBuildThisFileDirectory)\StrongNamePublicKeys.cs" Visible="false" />
+  </ItemGroup>
+</Project>

Key.snk

@@ -247,16 +247,16 @@ Here are typical exceptions thrown from the client library:
 
 ## .NET Foundation
 
-Docker.DotNet is a [.NET Foundation](https://www.dotnetfoundation.org/projects) project.
+Docker.DotNet is a [.NET Foundation](https://www.dotnetfoundation.org) project.
 
 There are many .NET related projects on GitHub.
 
 - [.NET home repo](https://github.com/Microsoft/dotnet) - links to 100s of .NET projects, from Microsoft and the community.
-- [ASP.NET Core home](https://docs.microsoft.com/aspnet/core/?view=aspnetcore-3.1) - the best place to start learning about ASP.NET Core.
+- [ASP.NET Core home](https://docs.microsoft.com/aspnet/core) - the best place to start learning about ASP.NET Core.
 
 This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).
 
-General .NET OSS discussions: [.NET Foundation forums](https://forums.dotnetfoundation.org)
+General .NET OSS discussions: [.NET Foundation Discord](https://dotnetfoundation.org/socialize/discord)
 
 ## Contributing
 

README.md

@@ -0,0 +1,10 @@
+/// <summary>
+/// Contains the repo identity public key when strong naming the assembly.
+/// </summary>
+internal static class StrongNamePublicKeys
+{
+  /// <summary>
+  /// The public key used for assemblies in this repo (Key.snk).
+  /// </summary>
+  public const string DockerDotNetPublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010013a6d952388480a1ce272e8c8ac11d710668c8723e696a421190445a1e6198288112f5e04eb99a626f8bb1454cdf30ebfb0a09cb7fc7b299cb03aa6fea1ae9a58f05f9fb92a85ce82ad4490bb2f0074822d8b0a786684f26a6eb1765f9026dae4857925b4e077d04b6311bec7dacf8e8a031dcc9f7e0384bca914256abee25d9";
+}

StrongNamePublicKeys.cs

@@ -1,4 +1,7 @@
 <Project>
+
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
     <PropertyGroup>
         <IsPackable>true</IsPackable>
         <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>

src/Directory.Build.props

@@ -286,15 +286,18 @@ await HandleIfErrorResponseAsync(response.StatusCode, response, errorHandlers)
                 .ConfigureAwait(false);
         }
 
-        internal Task<HttpResponseMessage> MakeRequestForRawResponseAsync(
+        internal async Task<HttpResponseMessage> MakeRequestForRawResponseAsync(
             HttpMethod method,
             string path,
             IQueryString queryString,
             IRequestContent body,
             IDictionary<string, string> headers,
             CancellationToken token)
         {
-            return PrivateMakeRequestAsync(SInfiniteTimeout, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, headers, body, token);
+            var response = await  PrivateMakeRequestAsync(SInfiniteTimeout, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, headers, body, token).ConfigureAwait(false);
+            await HandleIfErrorResponseAsync(response.StatusCode, response)
+                .ConfigureAwait(false);
+            return response;
         }
 
         internal async Task<DockerApiStreamedResponse> MakeRequestForStreamedResponseAsync(

src/Docker.DotNet/DockerClient.cs

@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Docker.DotNet.Tests")]
+[assembly: InternalsVisibleTo("Docker.DotNet.Tests" + StrongNamePublicKeys.DockerDotNetPublicKey)]

src/Docker.DotNet/Properties/InternalVisibleTo.cs

@@ -69,6 +69,17 @@ await _dockerClient.Images.TagImageAsync(
             Assert.True(createImageTask.IsCanceled);
         }
 
+        [Fact]
+        public Task CreateImageAsync_ErrorResponse_ThrowsDockerApiException()
+        {
+            return Assert.ThrowsAsync<DockerApiException>(() => _dockerClient.Images.CreateImageAsync(
+                new ImagesCreateParameters()
+                {
+                    FromImage = "1.2.3.Apparently&this$is+not-a_valid%repository//name",
+                    Tag = "ancient-one"
+                }, null, null));
+        }
+
         [Fact]
         public async Task DeleteImageAsync_RemovesImage()
         {