To de-dupe, we must remove

- part of aspnet/Common#93
- use `WebEncoders` from Common repo

Also let VS have its way w/ test `.xproj` files

src/Microsoft.AspNetCore.DataProtection.Abstractions/DataProtectionCommonExtensions.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.DataProtection.Abstractions;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.DataProtection
 {

src/Microsoft.AspNetCore.DataProtection.Abstractions/WebEncoders.cs

@@ -1,133 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Diagnostics;
-
-namespace Microsoft.AspNetCore.DataProtection
-{
-    // Internal copy of HttpAbstractions functionality.
-    internal static class WebEncoders
-    {
-        /// <summary>
-        /// Decodes a base64url-encoded string.
-        /// </summary>
-        /// <param name="input">The base64url-encoded input to decode.</param>
-        /// <returns>The base64url-decoded form of the input.</returns>
-        /// <remarks>
-        /// The input must not contain any whitespace or padding characters.
-        /// Throws FormatException if the input is malformed.
-        /// </remarks>
-        public static byte[] Base64UrlDecode(string input)
-        {
-            // Assumption: input is base64url encoded without padding and contains no whitespace.
-
-            // First, we need to add the padding characters back.
-            int numPaddingCharsToAdd = GetNumBase64PaddingCharsToAddForDecode(input.Length);
-            char[] completeBase64Array = new char[checked(input.Length + numPaddingCharsToAdd)];
-            Debug.Assert(completeBase64Array.Length % 4 == 0, "Invariant: Array length must be a multiple of 4.");
-            input.CopyTo(0, completeBase64Array, 0, input.Length);
-            for (int i = 1; i <= numPaddingCharsToAdd; i++)
-            {
-                completeBase64Array[completeBase64Array.Length - i] = '=';
-            }
-
-            // Next, fix up '-' -> '+' and '_' -> '/'
-            for (int i = 0; i < completeBase64Array.Length; i++)
-            {
-                char c = completeBase64Array[i];
-                if (c == '-')
-                {
-                    completeBase64Array[i] = '+';
-                }
-                else if (c == '_')
-                {
-                    completeBase64Array[i] = '/';
-                }
-            }
-
-            // Finally, decode.
-            // If the caller provided invalid base64 chars, they'll be caught here.
-            return Convert.FromBase64CharArray(completeBase64Array, 0, completeBase64Array.Length);
-        }
-
-        /// <summary>
-        /// Encodes an input using base64url encoding.
-        /// </summary>
-        /// <param name="input">The binary input to encode.</param>
-        /// <returns>The base64url-encoded form of the input.</returns>
-        public static string Base64UrlEncode(byte[] input)
-        {
-            // Special-case empty input
-            if (input.Length == 0)
-            {
-                return String.Empty;
-            }
-
-            // We're going to use base64url encoding with no padding characters.
-            // See RFC 4648, Sec. 5.
-            char[] buffer = new char[GetNumBase64CharsRequiredForInput(input.Length)];
-            int numBase64Chars = Convert.ToBase64CharArray(input, 0, input.Length, buffer, 0);
-
-            // Fix up '+' -> '-' and '/' -> '_'
-            for (int i = 0; i < numBase64Chars; i++)
-            {
-                char ch = buffer[i];
-                if (ch == '+')
-                {
-                    buffer[i] = '-';
-                }
-                else if (ch == '/')
-                {
-                    buffer[i] = '_';
-                }
-                else if (ch == '=')
-                {
-                    // We've reached a padding character: truncate the string from this point
-                    return new String(buffer, 0, i);
-                }
-            }
-
-            // If we got this far, the buffer didn't contain any padding chars, so turn
-            // it directly into a string.
-            return new String(buffer, 0, numBase64Chars);
-        }
-
-        private static int GetNumBase64CharsRequiredForInput(int inputLength)
-        {
-            int numWholeOrPartialInputBlocks = checked(inputLength + 2) / 3;
-            return checked(numWholeOrPartialInputBlocks * 4);
-        }
-
-        private static int GetNumBase64PaddingCharsInString(string str)
-        {
-            // Assumption: input contains a well-formed base64 string with no whitespace.
-
-            // base64 guaranteed have 0 - 2 padding characters.
-            if (str[str.Length - 1] == '=')
-            {
-                if (str[str.Length - 2] == '=')
-                {
-                    return 2;
-                }
-                return 1;
-            }
-            return 0;
-        }
-
-        private static int GetNumBase64PaddingCharsToAddForDecode(int inputLength)
-        {
-            switch (inputLength % 4)
-            {
-                case 0:
-                    return 0;
-                case 2:
-                    return 2;
-                case 3:
-                    return 1;
-                default:
-                    throw Error.CryptCommon_PayloadInvalid(); // not valid base64
-            }
-        }
-    }
-}

src/Microsoft.AspNetCore.DataProtection.Abstractions/project.json

@@ -15,6 +15,10 @@
     "Microsoft.AspNetCore.DataProtection.Sources": {
       "type": "build",
       "version": "1.1.0-*"
+    },
+    "Microsoft.Extensions.WebEncoders.Sources": {
+      "type": "build",
+      "version": "1.1.0-*"
     }
   },
   "frameworks": {

test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.xproj

@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.xproj

@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.xproj

@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.xproj

@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.xproj

@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>