Merge branch 'master' into feature/motz-cleanup

Author: jamesmontemagno

Xamarin.Essentials/SecureStorage/SecureStorage.uwp.cs

@@ -19,7 +19,7 @@ static async Task<string> PlatformGetAsync(string key)
                 return null;
 
             var provider = new DataProtectionProvider();
-            var buffer = await provider.UnprotectAsync(encBytes.AsBuffer()).AsTask().ConfigureAwait(false);
+            var buffer = await provider.UnprotectAsync(encBytes.AsBuffer());
 
             return Encoding.UTF8.GetString(buffer.ToArray());
         }
@@ -32,7 +32,7 @@ static async Task PlatformSetAsync(string key, string data)
 
             // LOCAL=user and LOCAL=machine do not require enterprise auth capability
             var provider = new DataProtectionProvider("LOCAL=user");
-            var buffer = await provider.ProtectAsync(bytes.AsBuffer()).AsTask().ConfigureAwait(false);
+            var buffer = await provider.ProtectAsync(bytes.AsBuffer());
             var encBytes = buffer.ToArray();
 
             settings.Values[key] = encBytes;

Xamarin.Essentials/mdoc.targets

@@ -88,13 +88,13 @@
       <BinConfigDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\</BinConfigDir>
       <TmpDir>$(MSBuildProjectDirectory)\tmp\</TmpDir>
     </PropertyGroup>
-    <ItemGroup>
-      <MDocAssembly Include="$(BinConfigDir)**\$(AssemblyName).dll" />
-    </ItemGroup>
     <RemoveDir Directories="$(TmpDir)" />
     <MakeDir Directories="$(TmpDir)" />
     <Copy SourceFiles="$(MDocDocumentationDirectory)\..\frameworks.xml" DestinationFolder="$(TmpDir)" />
-    <Copy SourceFiles="%(MDocAssembly.Identity)" DestinationFolder="$(TmpDir)$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(MDocAssembly.Identity)))))" />
+    <Copy SourceFiles="$(BinConfigDir)netstandard2.0\$(AssemblyName).dll" DestinationFolder="$(TmpDir)Xamarin.Essentials" />
+    <Copy SourceFiles="$(BinConfigDir)monoandroid71\$(AssemblyName).dll" DestinationFolder="$(TmpDir)Xamarin.Essentials.Android" />
+    <Copy SourceFiles="$(BinConfigDir)xamarin.ios10\$(AssemblyName).dll" DestinationFolder="$(TmpDir)Xamarin.Essentials.iOS" />
+    <Copy SourceFiles="$(BinConfigDir)uap10.0.16299\$(AssemblyName).dll" DestinationFolder="$(TmpDir)Xamarin.Essentials.UWP" />
     <Exec Command="$(_ManagedExeLauncher) &quot;$(MDocToolPath)&quot; update -lang=DocId --frameworks=&quot;$(TmpDir)frameworks.xml&quot; --out=&quot;$(MDocDocumentationDirectory)&quot; $(MDocReferenceAssemblies)" />
     <_FormatDocs DocsRoot="$(MDocDocumentationDirectory)" />
     <_VerifyAllDocsAreComplete DocsRoot="$(MDocDocumentationDirectory)" />

docs/en/FrameworksIndex/monoandroid71.xml renamed to docs/en/FrameworksIndex/Xamarin.Essentials.Android.xml

@@ -1,4 +1,4 @@
-<Framework Name="monoandroid71">
+<Framework Name="Xamarin.Essentials.Android">
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />

docs/en/FrameworksIndex/uap10.0.16299.xml renamed to docs/en/FrameworksIndex/Xamarin.Essentials.UWP.xml

@@ -1,4 +1,4 @@
-<Framework Name="uap10.0.16299">
+<Framework Name="Xamarin.Essentials.UWP">
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />

docs/en/FrameworksIndex/xamarin.ios10.xml renamed to docs/en/FrameworksIndex/Xamarin.Essentials.iOS.xml

@@ -1,4 +1,4 @@
-<Framework Name="xamarin.ios10">
+<Framework Name="Xamarin.Essentials.iOS">
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />

docs/en/FrameworksIndex/netstandard2.0.xml renamed to docs/en/FrameworksIndex/Xamarin.Essentials.xml

@@ -1,4 +1,4 @@
-<Framework Name="netstandard2.0">
+<Framework Name="Xamarin.Essentials">
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />

docs/en/Xamarin.Essentials/Browser.xml

@@ -77,7 +77,7 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.String" Index="0" />
-        <Parameter Name="launchType" Type="Xamarin.Essentials.BrowserLaunchType" Index="1" FrameworkAlternate="Empty;monoandroid71;netstandard1.0;netstandard2.0;uap10.0.16299;xamarin.ios10" />
+        <Parameter Name="launchType" Type="Xamarin.Essentials.BrowserLaunchType" Index="1" />
       </Parameters>
       <Docs>
         <param name="uri">Uri to launch.</param>

docs/en/Xamarin.Essentials/PermissionException.xml

@@ -27,7 +27,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <Parameters>
-        <Parameter Name="message" Type="System.String" Index="0" FrameworkAlternate="Empty;monoandroid71;netstandard1.0;netstandard2.0;uap10.0.16299;xamarin.ios10" />
+        <Parameter Name="message" Type="System.String" Index="0" />
       </Parameters>
       <Docs>
         <param name="message">Permission that is required.</param>

docs/frameworks.xml

@@ -1,6 +1,6 @@
 <Frameworks>
-  <Framework Name="Xamarin.Essentials" Source="netstandard2.0" />
-  <Framework Name="Xamarin.Essentials.Android" Source="monoandroid71" />
-  <Framework Name="Xamarin.Essentials.iOS" Source="xamarin.ios10" />
-  <Framework Name="Xamarin.Essentials.UWP" Source="uap10.0.16299" />
+  <Framework Name="Xamarin.Essentials" Source="Xamarin.Essentials" />
+  <Framework Name="Xamarin.Essentials.Android" Source="Xamarin.Essentials.Android" />
+  <Framework Name="Xamarin.Essentials.iOS" Source="Xamarin.Essentials.iOS" />
+  <Framework Name="Xamarin.Essentials.UWP" Source="Xamarin.Essentials.UWP" />
 </Frameworks>