Merge remote-tracking branch 'upstream/master' into ssh-transport

Author: mdarocha

.gitattributes

@@ -0,0 +1,5 @@
+# Autodetect text files
+* text=auto
+
+# Definitively text files
+*.cs text

.github/workflows/ci.yml

@@ -7,16 +7,16 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.412
-    - name: Build
-      run: dotnet build -c Release
-    - name: Test
-      run: dotnet test -c Release --no-build
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 6.0.x
+      - name: Build
+        run: dotnet build -c Release
+      - name: Test
+        run: dotnet test -c Release --no-build

.github/workflows/publish.yml

@@ -12,18 +12,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 3.1.412
+          dotnet-version: 6.0.x
       - name: Install SignClient tool
         run: dotnet tool install --tool-path . SignClient
       - name: Install NBGV tool
         run: dotnet tool install --tool-path . nbgv
       - name: Set Version
         run: ./nbgv cloud
-      - name: Create Packages 
+      - name: Create Packages
         run: dotnet pack -c Release -o packages
       - name: Sign Packages
         run: |
@@ -35,16 +37,15 @@ jobs:
           DNF_CODESIGN_USER: ${{secrets.DNF_CODESIGN_USER}}
           DNF_CODESIGN_SECRET: ${{secrets.DNF_CODESIGN_SECRET}}
       - name: Push packages to NuGet.org
-        run: |
-          dotnet nuget push ./packages/Docker.DotNet.*.nupkg --skip-duplicate -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json
+        run: dotnet nuget push ./packages/Docker.DotNet.*.nupkg --skip-duplicate -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json
       - name: Create Release
         uses: actions/github-script@v5
         with:
           script: |
             github.rest.repos.createRelease({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              tag_name: context.ref,              
+              tag_name: context.ref,
               name: context.ref,
               draft: false,
               prerelease: false,

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

@@ -200,7 +200,6 @@ The `CertFile` in the example above should be a .pfx file (PKCS12 format), if yo
 //
 
 // You can do this globally for all certificates:
-// (Note: This is not available on netstandard1.6)
 ServicePointManager.ServerCertificateValidationCallback += (o, c, ch, er) => true;
 
 // Or you can do this on a credential by credential basis:
@@ -248,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,12 +1,15 @@
 <Project>
+
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
     <PropertyGroup>
         <IsPackable>true</IsPackable>
-        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
         <PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
         <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
         <PackageTags>Docker Container C# .NET</PackageTags>
         <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet</RepositoryUrl>
+        <RepositoryUrl>https://github.com/dotnet/Docker.DotNet/</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <IncludeSymbols>true</IncludeSymbols>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -29,10 +32,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.108">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
     </ItemGroup>
-</Project>
+</Project>

src/Directory.Build.props

@@ -1,7 +1,5 @@
 using System.Net.Http;
-#if !NETSTANDARD1_6
 using System.Security;
-#endif
 
 namespace Docker.DotNet.BasicAuth
 {
@@ -17,12 +15,10 @@ public override HttpMessageHandler GetHandler(HttpMessageHandler innerHandler)
             return new BasicAuthHandler(_username, _password, innerHandler);
         }
 
-#if !NETSTANDARD1_6
         public BasicAuthCredentials(SecureString username, SecureString password, bool isTls = false)
             : this(new MaybeSecureString(username), new MaybeSecureString(password), isTls)
         {
         }
-#endif
 
         public BasicAuthCredentials(string username, string password, bool isTls = false)
             : this(new MaybeSecureString(username), new MaybeSecureString(password), isTls)

src/Docker.DotNet.BasicAuth/BasicAuthCredentials.cs

@@ -1,15 +1,11 @@
 using System;
-#if !NETSTANDARD1_6
 using System.Security;
 using System.Runtime.InteropServices;
-#endif
 
 namespace Docker.DotNet.BasicAuth
 {
     internal class MaybeSecureString : IDisposable
     {
-#if !NETSTANDARD1_6
-
         public SecureString Value { get; }
 
         public MaybeSecureString(string str)
@@ -66,34 +62,5 @@ public override string ToString()
                 Marshal.ZeroFreeGlobalAllocUnicode(unmanagedString);
             }
         }
-
-#else
-
-        public string Value { get; }
-
-        public MaybeSecureString(string str)
-        {
-            if (string.IsNullOrEmpty(str))
-            {
-                throw new ArgumentNullException(nameof(str));
-            }
-
-            Value = str;
-        }
-
-        public void Dispose()
-        {
-        }
-
-        public MaybeSecureString Copy()
-        {
-            return this;
-        }
-
-        public override string ToString()
-        {
-            return Value;
-        }
-#endif
     }
 }