[All] Move to netstandard2.0 **Breaking change** (#1306)
authorRui Marinho <me@ruimarinho.net>
Wed, 29 Nov 2017 17:37:06 +0000 (17:37 +0000)
committerGitHub <noreply@github.com>
Wed, 29 Nov 2017 17:37:06 +0000 (17:37 +0000)
* Move to netstandard 2.0

* Fix docs

* Small fixes

121 files changed:
.nuget/NuGet.Config [deleted file]
.nuget/NuGet.exe [deleted file]
.nuget/NuGet.targets [deleted file]
.nuget/packages.config [deleted file]
.nuspec/Xamarin.Forms.Maps.nuspec
.nuspec/Xamarin.Forms.Pages.Azure.nuspec
.nuspec/Xamarin.Forms.Pages.nuspec
.nuspec/Xamarin.Forms.nuspec
EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
EmbeddingTestBeds/Embedding.UWP/project.json [deleted file]
EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
EmbeddingTestBeds/Embedding.XF/OpenUri.xaml
EmbeddingTestBeds/Embedding.XF/Properties/AssemblyInfo.cs [deleted file]
PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
PagesGallery/PagesGallery.Droid/app.config
PagesGallery/PagesGallery.Droid/packages.config
PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
PagesGallery/PagesGallery.UWP/project.json [deleted file]
PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
PagesGallery/PagesGallery.iOS/app.config
PagesGallery/PagesGallery.iOS/packages.config [new file with mode: 0644]
PagesGallery/PagesGallery/PagesGallery.csproj
PagesGallery/PagesGallery/Properties/AssemblyInfo.cs [deleted file]
PagesGallery/PagesGallery/packages.config [deleted file]
Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
Xamarin.Forms.Build
Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
Xamarin.Forms.Build.Tasks/packages.config
Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs
Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
Xamarin.Forms.ControlGallery.Android/app.config [deleted file]
Xamarin.Forms.ControlGallery.Android/packages.config
Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs
Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
Xamarin.Forms.ControlGallery.WindowsUniversal/project.json [deleted file]
Xamarin.Forms.ControlGallery.iOS/Main.cs
Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
Xamarin.Forms.ControlGallery.iOS/app.config [deleted file]
Xamarin.Forms.ControlGallery.iOS/packages.config
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml.cs
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml
Xamarin.Forms.Controls/App.cs
Xamarin.Forms.Controls/CoreGallery.cs
Xamarin.Forms.Controls/Properties/AssemblyInfo.cs
Xamarin.Forms.Controls/RootPages/TabbedNavPage.cs
Xamarin.Forms.Controls/TestCases.cs
Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
Xamarin.Forms.Controls/packages.config [deleted file]
Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
Xamarin.Forms.Core.UnitTests/MockPlatformServices.cs
Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj
Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
Xamarin.Forms.Core.Windows.UITests/app.config [moved from Xamarin.Forms.Controls/app.config with 52% similarity]
Xamarin.Forms.Core.Windows.UITests/packages.config
Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
Xamarin.Forms.Core/FileAccess.cs [deleted file]
Xamarin.Forms.Core/FileMode.cs [deleted file]
Xamarin.Forms.Core/FileShare.cs [deleted file]
Xamarin.Forms.Core/Properties/AssemblyInfo.cs
Xamarin.Forms.Core/Properties/GlobalAssemblyInfo.cs
Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
Xamarin.Forms.CustomAttributes/Properties/AssemblyInfo.cs [deleted file]
Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
Xamarin.Forms.Maps.Design/Xamarin.Forms.Maps.Design.csproj
Xamarin.Forms.Maps.MacOS/Xamarin.Forms.Maps.macOS.csproj
Xamarin.Forms.Maps.UWP/MapRenderer.cs
Xamarin.Forms.Maps.UWP/Properties/AssemblyInfo.cs
Xamarin.Forms.Maps.UWP/Properties/Xamarin.Forms.Maps.UWP.rd.xml
Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
Xamarin.Forms.Maps.UWP/project.json [deleted file]
Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
Xamarin.Forms.Maps/Properties/AssemblyInfo.cs
Xamarin.Forms.Maps/Xamarin.Forms.Maps.csproj
Xamarin.Forms.Pages.Azure/Properties/AssemblyInfo.cs [deleted file]
Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
Xamarin.Forms.Pages.Azure/packages.config [deleted file]
Xamarin.Forms.Pages.UnitTests/Xamarin.Forms.Pages.UnitTests.csproj
Xamarin.Forms.Pages.UnitTests/packages.config
Xamarin.Forms.Pages/Properties/AssemblyInfo.cs [deleted file]
Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
Xamarin.Forms.Pages/packages.config [deleted file]
Xamarin.Forms.Platform.Android/Forms.cs
Xamarin.Forms.Platform.GTK/GtkIsolatedStorageFile.cs
Xamarin.Forms.Platform.GTK/Xamarin.Forms.Platform.GTK.csproj
Xamarin.Forms.Platform.GTK/app.config
Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs
Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs
Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
Xamarin.Forms.Platform.UAP/project.json [deleted file]
Xamarin.Forms.Platform.iOS/Forms.cs
Xamarin.Forms.Platform/Properties/AssemblyInfo.cs
Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj
Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
Xamarin.Forms.Xaml.UnitTests/app.config
Xamarin.Forms.Xaml.UnitTests/packages.config
Xamarin.Forms.Xaml.Xamlc/Xamarin.Forms.Xaml.Xamlc.csproj
Xamarin.Forms.Xaml.Xamlc/app.config [new file with mode: 0644]
Xamarin.Forms.Xaml.Xamlc/packages.config
Xamarin.Forms.Xaml.Xamlg/Xamarin.Forms.Xaml.Xamlg.csproj
Xamarin.Forms.Xaml.Xamlg/app.config [new file with mode: 0644]
Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs
Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs
Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj
Xamarin.Forms.sln
docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileAccess.xml [deleted file]
docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileMode.xml [deleted file]
docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileShare.xml [deleted file]
docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/IIsolatedStorageFile.xml
docs/Xamarin.Forms.Core/index.xml
docs/Xamarin.Forms.Maps/index.xml
docs/Xamarin.Forms.Pages/index.xml
docs/Xamarin.Forms.Xaml/index.xml
global.json
update-docs-windows.bat

diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
deleted file mode 100644 (file)
index 6efc7f7..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
deleted file mode 100644 (file)
index 305300a..0000000
Binary files a/.nuget/NuGet.exe and /dev/null differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
deleted file mode 100644 (file)
index 5282410..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-        
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-        
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-    
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-        
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-        
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' "></RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-        
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir)\" </RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-    
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
diff --git a/.nuget/packages.config b/.nuget/packages.config
deleted file mode 100644 (file)
index 7025a72..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit.Runners" version="2.6.3" />
-</packages>
\ No newline at end of file
index 6a17054..48e50c5 100644 (file)
         <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/>
       </group>
     </dependencies>
-    <references>
-      <group targetFramework="portable-win+net45+wp80+win81+wpa81">
-        <reference file="Xamarin.Forms.Maps.dll" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <reference file="Xamarin.Forms.Maps.dll" />
-      </group>
-      <group targetFramework="Xamarin.iOS10">
-        <reference file="Xamarin.Forms.Maps.dll" />
-        <reference file="Xamarin.Forms.Maps.iOS.dll" />
-      </group>
-      <group targetFramework="MonoAndroid10">
-        <reference file="Xamarin.Forms.Maps.dll" />
-        <reference file="Xamarin.Forms.Maps.Android.dll" />
-      </group>
-      <group targetFramework="uap10.0">
-        <reference file="Xamarin.Forms.Maps.dll" />
-        <reference file="Xamarin.Forms.Maps.UWP.dll" />
-      </group>
-      <group targetFramework="Xamarin.Mac">
-        <reference file="Xamarin.Forms.Maps.dll" />
-        <reference file="Xamarin.Forms.Maps.macOS.dll" />
-      </group>
-    </references>
   </metadata>
   <files>
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\netstandard1.0" />
-    <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard1.0" />
+    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\netstandard2.0" />
+    <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard2.0" />
 
     <file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid10" />
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10" />
+    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10" />
     <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid10" />
 
     <file src="..\Xamarin.Forms.Maps.iOS\bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Maps.iOS.dll" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\Xamarin.iOS10" />
     <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\Xamarin.iOS10" />
 
-    <!--UWP-->
     <file src="..\Xamarin.Forms.Maps.UWP\bin\$Configuration$\Xamarin.Forms.Maps.UWP.dll" target="lib\uap10.0" />
     <file src="..\Xamarin.Forms.Maps.UWP\bin\$Configuration$\Xamarin.Forms.Maps.UWP.pri" target="lib\uap10.0" />
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\uap10.0" />
+    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\uap10.0" />
+       
+        <file src="..\Xamarin.Forms.Maps.MacOS\bin\$Configuration$\Xamarin.Forms.Maps.macOS.dll" target="lib\Xamarin.Mac" />
+    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\Xamarin.Mac" />
+    <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\Xamarin.Mac" />
 
-    <!-- Xaml Design-time Stuff -->
+    <!-- Xaml Design-time Stuff 
     <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81\Design" />
     <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\netstandard1.0" />
     <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\MonoAndroid10\Design" />
     <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\Xamarin.iOS10\Design" />
     <file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\uap10.0\Design" />
-
-    <file src="..\Xamarin.Forms.Maps.MacOS\bin\$Configuration$\Xamarin.Forms.Maps.macOS.dll" target="lib\Xamarin.Mac" />
-    <file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\Xamarin.Mac" />
-    <file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\Xamarin.Mac" />
+       -->
+   
   </files>
 </package>
index 0765d30..208435a 100644 (file)
     <dependencies>
       <group>
         <dependency id="Xamarin.Forms.Pages" version="$version$"/>
-        <dependency id="Newtonsoft.Json" version="6.0.4"/>
+        <dependency id="Newtonsoft.Json" version="10.0.3"/>
         <dependency id="modernhttpclient" version="2.4.2"/>
-        <dependency id="Microsoft.Net.Http" version="2.2.29" />
-        <dependency id="Microsoft.Azure.Mobile.Client" version="2.0.1" />
+        <dependency id="Microsoft.Azure.Mobile.Client" version="4.0.2" />
       </group>
     </dependencies>
-    <references>
-      <group targetFramework="portable-win+net45+wp80+win81+wpa81">
-        <reference file="Xamarin.Forms.Pages.Azure.dll" />
-      </group>
-      <group targetFramework="Xamarin.iOS10">
-        <reference file="Xamarin.Forms.Pages.Azure.dll" />
-      </group>
-      <group targetFramework="MonoAndroid10">
-        <reference file="Xamarin.Forms.Pages.Azure.dll" />
-      </group>
-      <group targetFramework="uap10.0">
-        <reference file="Xamarin.Forms.Pages.Azure.dll" />
-      </group>
-    </references>
   </metadata>
   <files>
-    <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\portable-win+net45+wp80+win81+wpa81" />
-
-    <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\MonoAndroid10" />
-
-    <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\Xamarin.iOS10" />
-
-    <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\Xamarin.Forms.Pages.Azure.dll" target="lib\uap10.0" />
-
+    <file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard2.0" />
   </files>
 </package>
index bce29a0..c5dd9c8 100644 (file)
     <dependencies>
       <group>
         <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/>
-        <dependency id="Newtonsoft.Json" version="6.0.4"/>
+        <dependency id="Newtonsoft.Json" version="10.0.3"/>
         <dependency id="modernhttpclient" version="2.4.2"/>
       </group>
     </dependencies>
-    <references>
-      <group targetFramework="portable-win+net45+wp80+win81+wpa81">
-        <reference file="Xamarin.Forms.Pages.dll" />
-      </group>
-                       <group targetFramework="netstandard1.0">
-                               <reference file="Xamarin.Forms.Pages.dll" />
-                       </group>
-      <group targetFramework="Xamarin.iOS10">
-        <reference file="Xamarin.Forms.Pages.dll" />
-      </group>
-      <group targetFramework="MonoAndroid10">
-        <reference file="Xamarin.Forms.Pages.dll" />
-      </group>
-      <group targetFramework="uap10.0">
-        <reference file="Xamarin.Forms.Pages.dll" />
-      </group>
-    </references>
   </metadata>
   <files>
-    <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\portable-win+net45+wp80+win81+wpa81" />
-
-    <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\netstandard1.0" />
-
-    <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\MonoAndroid10" />
-
-    <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\Xamarin.iOS10" />
-
-    <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\uap10.0" />
+    <file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.dll" target="lib\netstandard2.0" />
   </files>
 </package>
index 0fd1976..777cba7 100644 (file)
         <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="25.4.0.2"/>
       </group>
     </dependencies>
-    <references>
-      <group targetFramework="portable-win+net45+wp80+win81+wpa81">
-        <reference file="Xamarin.Forms.Core.dll" />
-        <reference file="Xamarin.Forms.Platform.dll" />
-        <reference file="Xamarin.Forms.Xaml.dll" />
-      </group>
-      <group targetFramework="netstandard1.0">
-        <reference file="Xamarin.Forms.Core.dll" />
-        <reference file="Xamarin.Forms.Platform.dll" />
-        <reference file="Xamarin.Forms.Xaml.dll" />
-      </group>
-      <group targetFramework="Xamarin.iOS10">
-        <reference file="Xamarin.Forms.Core.dll" />
-        <reference file="Xamarin.Forms.Platform.dll" />
-        <reference file="Xamarin.Forms.Xaml.dll" />
-        <reference file="Xamarin.Forms.Platform.iOS.dll" />
-      </group>
-      <group targetFramework="MonoAndroid10">
-        <reference file="Xamarin.Forms.Core.dll" />
-        <reference file="Xamarin.Forms.Platform.dll" />
-        <reference file="Xamarin.Forms.Xaml.dll" />
-        <reference file="FormsViewGroup.dll" />
-        <reference file="Xamarin.Forms.Platform.Android.dll" />
-      </group>
-      <group targetFramework="uap10.0">
-        <reference file="Xamarin.Forms.Core.dll" />
-        <reference file="Xamarin.Forms.Platform.dll" />
-        <reference file="Xamarin.Forms.Xaml.dll" />
-        <reference file="Xamarin.Forms.Platform.UAP.dll" />
-      </group>
-      <group targetFramework="Xamarin.Mac">
-        <reference file="Xamarin.Forms.Core.dll" />
-        <reference file="Xamarin.Forms.Platform.macOS.dll" />
-        <reference file="Xamarin.Forms.Platform.dll" />
-        <reference file="Xamarin.Forms.Xaml.dll" />
-      </group>
-    </references>
   </metadata>
   <files>
-    <!--PCL-->
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81" />
-
     <!--netstandard-->
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\netstandard1.0" />
-    <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\netstandard1.0" />
-    <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*pdb" target="lib\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*mdb" target="lib\netstandard1.0" />
-
-    <!--Xaml PCL Stuff-->
-    <file src="Xamarin.Forms.targets" target="build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms$IdAppend$.targets" />
-    <file src="Xamarin.Forms.DefaultItems.targets" target="build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.DefaultItems.targets" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*mdb" target="lib\netstandard2.0" />
+    <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*mdb" target="lib\netstandard2.0" />
+    <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\netstandar2.0" />
+    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.dll" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.*pdb" target="lib\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.*mdb" target="lib\netstandard2.0" />
 
     <!--Xaml netstandard Stuff-->
-    <file src="Xamarin.Forms.targets" target="build\netstandard1.0\Xamarin.Forms$IdAppend$.targets" />
-    <file src="Xamarin.Forms.DefaultItems.targets" target="build\netstandard1.0\Xamarin.Forms.DefaultItems.targets" />
-    <file src="Xamarin.Forms.props" target="build\netstandard1.0\Xamarin.Forms$IdAppend$.props" />
-    <file src="Xamarin.Forms.DefaultItems.props" target="build\netstandard1.0\Xamarin.Forms.DefaultItems.props" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\netstandard1.0" />
+    <file src="Xamarin.Forms.targets" target="build\netstandard2.0\Xamarin.Forms$IdAppend$.targets" />
+    <file src="Xamarin.Forms.DefaultItems.targets" target="build\netstandard2.0\Xamarin.Forms.DefaultItems.targets" />
+    <file src="Xamarin.Forms.props" target="build\netstandard2.0\Xamarin.Forms$IdAppend$.props" />
+    <file src="Xamarin.Forms.DefaultItems.props" target="build\netstandard2.0\Xamarin.Forms.DefaultItems.props" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\netstandard2.0" />
 
     <!-- Xaml Design-time Stuff -->
-    <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81\Design" />
+    <!--<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81\Design" />
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81\Design" />
 
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\netstandard1.0\Design" />
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\Xamarin.iOS10\Design" />
 
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\uap10.0\Design" />
-    <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\uap10.0\Design" />
+    <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\uap10.0\Design" />-->
 
     <!-- XamlC stuffs -->
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\portable-win+net45+wp80+win81+wpa81" />
-
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="build\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="build\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\netstandard1.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\netstandard1.0" />
+  
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\netstandard2.0" />
 
     <!--Android-->
     <file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10" />
     <file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid10" />
     <file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid10" />
     <file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid10" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\MonoAndroid10" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid10" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid10" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid10" />
     <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid10" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid10" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid10" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid10" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid10" />
     <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid10" />
     <file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid10" />
 
     <file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="lib\Xamarin.iOS10" />
     <file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*pdb" target="lib\Xamarin.iOS10" />
     <file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*mdb" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*mdb" target="lib\Xamarin.iOS10" />
     <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\Xamarin.iOS10" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\Xamarin.iOS10" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*mdb" target="lib\Xamarin.iOS10" />
     <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\Xamarin.iOS10" />
     <file src="..\Stubs\Xamarin.Forms.Platform.iOS\bin\iPhone\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\Xamarin.iOS10" />
     
     <file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Xamarin.Forms.Platform.UAP.dll" target="lib\uap10.0" />
     <file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Xamarin.Forms.Platform.UAP.pri" target="lib\uap10.0" />
     <file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Xamarin.Forms.Platform.UAP.xr.xml" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
-    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\uap10.0" />
+    <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.dll" target="lib\uap10.0" />
     <file src="..\Xamarin.Forms.Platform.UAP\Properties\Xamarin.Forms.Platform.UAP.rd.xml" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Properties" />
     <file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\FormsCommandBarStyle.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
     <file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\FormsProgressBarStyle.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
     <file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\FormsEmbeddedPageWrapper.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
 
     <!--Mac-->
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\Xamarin.Mac" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.Mac" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.Mac" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.Mac" />
     <file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="lib\Xamarin.Mac" />
     <file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\Xamarin.Mac" />
 
-    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\uap10.0" />
+    <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\uap10.0" />
     <file src="..\docs\Xamarin.Forms.Core.xml" target="lib\uap10.0" />
-    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\uap10.0" />
+    <file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\uap10.0" />
     <file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\uap10.0" />
 
     <!-- iOS Localized String Resource Assemblies -->
index cddf0e6..e9338fb 100644 (file)
     <AssemblyName>Embedding.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Embedding.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
       <Name>Embedding.XF</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/EmbeddingTestBeds/Embedding.UWP/project.json b/EmbeddingTestBeds/Embedding.UWP/project.json
deleted file mode 100644 (file)
index c594939..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
index 0c50e43..fb5dba8 100644 (file)
@@ -1,62 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{02EAC00F-0425-4959-AC64-E921627265CA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Embedding.XF</RootNamespace>
-    <AssemblyName>Embedding.XF</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AlertsAndActionSheets.xaml.cs">
-      <DependentUpon>AlertsAndActionSheets.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="OpenUri.xaml.cs">
-      <DependentUpon>OpenUri.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Page3.xaml.cs">
-      <DependentUpon>Page3.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Page4.xaml.cs">
-      <DependentUpon>Page4.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WebViewExample.xaml.cs">
-      <DependentUpon>WebViewExample.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Hello.xaml.cs">
-      <DependentUpon>Hello.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AlertsAndActionSheets.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     <EmbeddedResource Include="Page4.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Include="OpenUri.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
     <ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
       <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
       <Name>Xamarin.Forms.Core</Name>
       <Project>{9DB2F292-8034-4E06-89AD-98BBDA4306B9}</Project>
       <Name>Xamarin.Forms.Xaml</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj">
-      <Project>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</Project>
-      <Name>Xamarin.Forms.Build.Tasks</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="OpenUri.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\.nuspec\Xamarin.Forms.targets" />
 </Project>
\ No newline at end of file
index 84d189f..2a6985d 100644 (file)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Embedding.XF.OpenUri">
     <ContentPage.Content>
diff --git a/EmbeddingTestBeds/Embedding.XF/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.XF/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 662ef67..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Embedding.XF")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Embedding.XF")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
index 06be351..ce8b8a7 100644 (file)
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.WindowsAzure.Mobile, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.2.0.1\lib\monoandroid\Microsoft.WindowsAzure.Mobile.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Mobile.Ext, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.2.0.1\lib\monoandroid\Microsoft.WindowsAzure.Mobile.Ext.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Mobile.Client, Version=4.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.4.0.2\lib\monoandroid70\Microsoft.Azure.Mobile.Client.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
@@ -75,6 +86,9 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
+    <Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.Android.Support.Annotations">
       <HintPath>..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Android.Support.Core.Utils">
       <HintPath>..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath>
     </Reference>
+    <Reference Include="Xamarin.Android.Support.CustomTabs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Android.Support.CustomTabs.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.Android.Support.Media.Compat">
       <HintPath>..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath>
     </Reference>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.CustomTabs.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.CustomTabs.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.CustomTabs.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.CustomTabs.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets')" />
+  <Import Project="..\..\packages\Xamarin.Android.Support.CustomTabs.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.CustomTabs.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.CustomTabs.targets')" />
+  <Import Project="..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
 </Project>
\ No newline at end of file
index e415714..dde2c3c 100644 (file)
@@ -3,20 +3,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
-      </dependentAssembly>
-      <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
index 263662b..be4a202 100644 (file)
@@ -1,15 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.Mobile.Client" version="2.0.1" targetFramework="monoandroid60" />
+  <package id="Microsoft.Azure.Mobile.Client" version="4.0.2" targetFramework="monoandroid80" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid80" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid60" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="monoandroid60" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid80" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="NETStandard.Library" version="2.0.0" targetFramework="monoandroid80" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="monoandroid80" />
+  <package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid80" />
+  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid80" />
+  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="monoandroid80" />
+  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="monoandroid80" />
+  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="monoandroid80" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Collections" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Console" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.IO" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Linq" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Net.Http" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Threading" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid80" />
+  <package id="Validation" version="2.2.8" targetFramework="monoandroid80" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid71" />
+  <package id="Xamarin.Android.Support.CustomTabs" version="25.4.0.2" targetFramework="monoandroid80" />
   <package id="Xamarin.Android.Support.Design" version="25.4.0.2" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" />
index c9974de..2b0befb 100644 (file)
@@ -11,8 +11,8 @@
     <AssemblyName>PagesGallery.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -20,6 +20,7 @@
     <PackageCertificateKeyFile>Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx</PackageCertificateKeyFile>
     <PackageCertificateThumbprint>D160433BDC22781DEAE0558325140B91C02A6A20</PackageCertificateThumbprint>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +94,6 @@
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <None Include="PagesGallery.UWP_TemporaryKey.pfx" />
-    <None Include="project.json" />
     <None Include="Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
       <Name>PagesGallery</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/PagesGallery/PagesGallery.UWP/project.json b/PagesGallery/PagesGallery.UWP/project.json
deleted file mode 100644 (file)
index c594939..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
index 832f22b..b107cb0 100644 (file)
@@ -97,6 +97,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <ITunesArtwork Include="iTunesArtwork" />
     <ITunesArtwork Include="iTunesArtwork@2x" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
     <BundleResource Include="Resources\Icon-Small%403x.png" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Azure.Mobile.Client, Version=4.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.4.0.2\lib\xamarinios10\Microsoft.Azure.Mobile.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
+    </Reference>
+    <Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
+    <Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\.nuspec\Xamarin.Forms.targets" />
-</Project>
+  <Import Project="..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
index 4dd3b43..dde2c3c 100644 (file)
@@ -3,8 +3,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/PagesGallery/PagesGallery.iOS/packages.config b/PagesGallery/PagesGallery.iOS/packages.config
new file mode 100644 (file)
index 0000000..88cce26
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Azure.Mobile.Client" version="4.0.2" targetFramework="xamarinios10" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinios10" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="NETStandard.Library" version="2.0.0" targetFramework="xamarinios10" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="xamarinios10" />
+  <package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
+  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Console" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.IO" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Linq" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Net.Http" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Threading" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
+  <package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
+</packages>
\ No newline at end of file
index a6d48e5..a61e285 100644 (file)
@@ -1,84 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PagesGallery</RootNamespace>
-    <AssemblyName>PagesGallery</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CapitalizationConverter.cs" />
-    <Compile Include="EventsPage.xaml.cs">
-      <DependentUpon>EventsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SpeakersPage.xaml.cs">
-      <DependentUpon>SpeakersPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="GettingStarted.Xamarin" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj">
-      <Project>{c9696465-7657-4843-872e-3c01891c4a9b}</Project>
-      <Name>Xamarin.Forms.Pages.Azure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj">
-      <Project>{d6133dbd-6c60-4bd5-bea2-07e0a3927c31}</Project>
-      <Name>Xamarin.Forms.Pages</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj">
-      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
-      <Name>Xamarin.Forms.Platform</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj">
-      <Project>{9db2f292-8034-4e06-89ad-98bbda4306b9}</Project>
-      <Name>Xamarin.Forms.Xaml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj">
-      <Project>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</Project>
-      <Name>Xamarin.Forms.Build.Tasks</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="App.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Net.Http">
-      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Extensions">
-      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives">
-      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+
   <Import Project="..\..\.nuspec\Xamarin.Forms.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/PagesGallery/PagesGallery/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index e5188fe..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle ("PagesGallery")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("PagesGallery")]
-[assembly: AssemblyCopyright ("Copyright ©  2014")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-[assembly: NeutralResourcesLanguage ("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: AssemblyFileVersion ("1.0.0.0")]
diff --git a/PagesGallery/PagesGallery/packages.config b/PagesGallery/PagesGallery/packages.config
deleted file mode 100644 (file)
index 316274a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
-</packages>
\ No newline at end of file
index 6ab7d33..45c7fbd 100644 (file)
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <Import Project="..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" />
index 09f3df2..e42fda4 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 09f3df2702da52c139f1d2e07fd42e5883cc77d2
+Subproject commit e42fda4639d2fbec343fdbd8ffa737688a2e5acd
index 1b01d98..2317831 100644 (file)
@@ -7,9 +7,10 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Xamarin.Forms.Build.Tasks</RootNamespace>
     <AssemblyName>Xamarin.Forms.Build.Tasks</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,7 +22,8 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -31,7 +33,8 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="CompiledMarkupExtensions\" />
-    <Folder Include="CompiledValueProviders\" />
-  </ItemGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <ItemGroup>
-    <Folder Include="CompiledConverters\" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index f37be68..44c9fe8 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net451" />
+  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net47" />
 </packages>
\ No newline at end of file
index d4799e2..d2240c2 100644 (file)
@@ -1,6 +1,5 @@
 #if !FORMS_APPLICATION_ACTIVITY && !PRE_APPLICATION_CLASS
 
-using System.Diagnostics;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -40,9 +39,7 @@ namespace Xamarin.Forms.ControlGallery.Android
                        //Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn);
 
                        base.OnCreate(bundle);
-
-                       if (!Debugger.IsAttached)
-                               Insights.Initialize(App.InsightsApiKey, ApplicationContext);
+                       
 
 #if TEST_EXPERIMENTAL_RENDERERS
                        Forms.SetFlags("FastRenderers_Experimental");
index a4e1bba..1d3e121 100644 (file)
@@ -21,9 +21,6 @@ namespace Xamarin.Forms.ControlGallery.Android
                {
                        base.OnCreate(bundle);
 
-                       if (!Debugger.IsAttached)
-                               Insights.Initialize(App.InsightsApiKey, ApplicationContext);
-
                        Forms.SetFlags("Fake_Flag"); // So we can test for flag initialization issues
 
                        Forms.Init(this, bundle);
index 272bbae..9fdf254 100644 (file)
       <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.42.1021.1\lib\MonoAndroid70\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Insights">
-      <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Android.Support.Annotations">
       <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath>
     </Reference>
     <Compile Include="DisposePageRenderer.cs" />
     <Compile Include="FormsAppCompatActivity.cs" />
     <Compile Include="PreApplicationClassActivity.cs" />
-    <Compile Include="Properties\MapsKey.cs" />
+       <Compile Include="Properties\MapsKey.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="CustomRenderers.cs" />
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
     <AndroidResource Include="Resources\layout\Toolbar.axml">
       <SubType>Designer</SubType>
     </CreateItem>
     <Copy SourceFiles="@(MapsKey)" DestinationFiles="Properties\MapsKey.cs" Condition="!Exists('Properties\MapsKey.cs')" />
   </Target>
-  <Import Project="..\packages\Xamarin.Insights.1.12.3\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\MonoAndroid10\Xamarin.Insights.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/Xamarin.Forms.ControlGallery.Android/app.config b/Xamarin.Forms.ControlGallery.Android/app.config
deleted file mode 100644 (file)
index 83b882b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
index 625599b..80da65b 100644 (file)
@@ -22,5 +22,4 @@
   <package id="Xamarin.GooglePlayServices.Base" version="42.1021.1" targetFramework="monoandroid71" />
   <package id="Xamarin.GooglePlayServices.Basement" version="42.1021.1" targetFramework="monoandroid71" />
   <package id="Xamarin.GooglePlayServices.Tasks" version="42.1021.1" targetFramework="monoandroid71" />
-  <package id="Xamarin.Insights" version="1.12.3" targetFramework="monoandroid70" />
 </packages>
\ No newline at end of file
index 05c11e1..bf42cd7 100644 (file)
@@ -57,6 +57,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
+    <Reference Include="netstandard" />
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Assets.xcassets\AppIcons.appiconset\Contents.json" />
index e53b666..16e71df 100644 (file)
@@ -66,7 +66,7 @@ namespace Xamarin.Forms.ControlGallery.WindowsUniversal
                 rootFrame.NavigationFailed += OnNavigationFailed;
 
                                Forms.Init (e);
-                               FormsMaps.Init (Controls.App.Config["UWPMapsAuthKey"]);
+                               //FormsMaps.Init (Controls.App.Config["UWPMapsAuthKey"]);
 
                                // Place the frame in the current Window
                                Window.Current.Content = rootFrame;
index f59fa37..8621afe 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,8 +12,8 @@
     <AssemblyName>Xamarin.Forms.ControlGallery.WindowsUniversal</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -23,6 +23,7 @@
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
     <Content Include="toolbar_close.png" />
     <Content Include="WebImages\XamarinLogo.png" />
     <Content Include="Assets\Fonts\Lobster-Regular.ttf" />
-    <None Include="project.json" />
     <Content Include="Properties\default.rd.xml" />
     <Compile Include="BrokenImageSourceHandler.cs" />
     <Compile Include="StringProvider.cs" />
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.10586.0">
-      <Name>Windows Mobile Extensions for the UWP</Name>
-    </SDKReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.1</Version>
+    </PackageReference>
   </ItemGroup>
+  
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/project.json b/Xamarin.Forms.ControlGallery.WindowsUniversal/project.json
deleted file mode 100644 (file)
index 5cfed23..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
index f4834f9..34a78d0 100644 (file)
@@ -8,8 +8,6 @@ namespace Xamarin.Forms.ControlGallery.iOS
        {
                static void Main(string[] args)
                {
-                       if (!Debugger.IsAttached)
-                               Insights.Initialize(App.InsightsApiKey);
                        UIApplication.Main(args, null, "AppDelegate");
                }
        }
index 887e615..b27b84f 100644 (file)
     <Compile Include="_57114Renderer.cs" />
     <Compile Include="_58406EffectRenderer.cs" />
     <Compile Include="_60122ImageRenderer.cs" />
-    <None Include="app.config" />
     <None Include="Info.plist" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="packages.config" />
       <HintPath>..\packages\AdvancedColorPicker.2.0.1\lib\Xamarin.iOS\AdvancedColorPicker.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Calabash, Version=21.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.TestCloud.Agent.0.21.3\lib\Xamarin.iOS\Calabash.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
-    <Reference Include="PLCrashReporterUnifiedBinding">
-      <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\Xamarin.iOS10\PLCrashReporterUnifiedBinding.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Insights">
-      <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\Xamarin.iOS10\Xamarin.Insights.dll</HintPath>
+       <Reference Include="netstandard" />
+       <Reference Include="Calabash">
+      <HintPath>..\packages\Xamarin.TestCloud.Agent.0.21.3\lib\Xamarin.iOS\Calabash.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <ItemGroup />
-  <Import Project="..\packages\Xamarin.Insights.1.12.3\build\Xamarin.iOS10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\Xamarin.iOS10\Xamarin.Insights.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.ControlGallery.iOS/app.config b/Xamarin.Forms.ControlGallery.iOS/app.config
deleted file mode 100644 (file)
index 83b882b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
index 05b6852..1d5e835 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AdvancedColorPicker" version="2.0.1" targetFramework="xamarinios10" />
-  <package id="Xamarin.Insights" version="1.12.3" targetFramework="xamarinios10" />
   <package id="Xamarin.TestCloud.Agent" version="0.21.3" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
index 1f90ee8..c1ce85f 100644 (file)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<local:TestContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+<local:TestContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                   xmlns:local="clr-namespace:Xamarin.Forms.Controls"
              x:Class="Xamarin.Forms.Controls.Issues.Bugzilla39636">
index edb609a..82d92a9 100644 (file)
@@ -65,7 +65,6 @@ namespace Xamarin.Forms.Controls
                                        await MasterViewModel.InitializeAsync ();
                                        break;
                                } catch (Exception ex) {
-                                       Insights.Report (ex, Insights.Severity.Error);
                                        errorMessage = ex.Message;
                                }
 
index 3b1318b..0a4e051 100644 (file)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<local:TestNavigationPage xmlns="http://xamarin.com/schemas/2014/forms"
+<local:TestNavigationPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Xamarin.Forms.Controls"
              xmlns:iOsSpecific="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
index b2616c0..c833e7f 100644 (file)
@@ -29,8 +29,7 @@ namespace Xamarin.Forms.Controls
                public App()
                {
                        _testCloudService = DependencyService.Get<ITestCloudService>();
-                       InitInsights();
-
+                       
                        SetMainPage(CreateDefaultMainPage());
 
                        //// Uncomment to verify that there is no gray screen displayed between the blue splash and red MasterDetailPage.
@@ -104,20 +103,6 @@ namespace Xamarin.Forms.Controls
                        }
                }
 
-               public static string InsightsApiKey
-               {
-                       get
-                       {
-                               if (s_insightsKey == null)
-                               {
-                                       string key = Config["InsightsApiKey"];
-                                       s_insightsKey = string.IsNullOrEmpty(key) ? Insights.DebugModeKey : key;
-                               }
-
-                               return s_insightsKey;
-                       }
-               }
-
                public static ContentPage MenuPage { get; set; }
 
                public void SetMainPage(Page rootPage)
@@ -132,18 +117,6 @@ namespace Xamarin.Forms.Controls
                        return Assembly.Load(assemblyname);
                }
 
-               void InitInsights()
-               {
-                       if (Insights.IsInitialized)
-                       {
-                               Insights.ForceDataTransmission = true;
-                               if (_testCloudService != null && _testCloudService.IsOnTestCloud())
-                                       Insights.Identify(_testCloudService.GetTestCloudDevice(), "Name", _testCloudService.GetTestCloudDeviceName());
-                               else
-                                       Insights.Identify("DemoUser", "Name", "Demo User");
-                       }
-               }
-
                static void LoadConfig()
                {
                        s_config = new Dictionary<string, string>();
index a10957c..4baf8d0 100644 (file)
@@ -1,12 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Dynamic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Xamarin.Forms.Controls.GalleryPages;
 using Xamarin.Forms.CustomAttributes;
@@ -390,12 +384,6 @@ namespace Xamarin.Forms.Controls
 
                async Task PushPage (Page contentPage)
                {
-                       if (Insights.IsInitialized) {
-                               Insights.Track ("Navigation", new Dictionary<string, string> {
-                                       { "Pushing", contentPage.GetType().Name }
-                               });
-                       }
-
                        if (navigationBehavior == NavigationBehavior.PushModalAsync) {
                                await Navigation.PushModalAsync (contentPage);
                        } else {
@@ -413,12 +401,6 @@ namespace Xamarin.Forms.Controls
 
                        var page = pageFactory.Realize();
 
-                       if (Insights.IsInitialized) {
-                               Insights.Track ("Navigation", new Dictionary<string, string> {
-                                       { "Pushing", page.GetType().Name }
-                               });
-                       }
-
                        await PushPage (page);
                }
        }
index 2a99acb..4c7f1d7 100644 (file)
@@ -1,33 +1,3 @@
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("Xamarin.Forms.Controls")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Xamarin Inc.")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Xamarin Inc.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
-[assembly: InternalsVisibleTo ("Xamarin.Forms.Core.WP8")]
-
-// The control gallary needs to add code references to internals to prevent the linker from 
-// removing the references. Remove this once the [PreserveAttribute] can be applied at the class
-// and member level.
 [assembly: InternalsVisibleTo ("Xamarin.Forms.ControlGallery.Android")]
index e33d5ae..0d383ed 100644 (file)
@@ -26,8 +26,8 @@ namespace Xamarin.Forms.Controls
                                Title = "Page0", 
                        };
                        
-                       Children.add(navpage);
-                       Children.add(new HomeButton ());
+                       //Children.add(navpage);
+                       //Children.add(new HomeButton ());
                }
        }
 }
\ No newline at end of file
index dab64b3..b2df64c 100644 (file)
@@ -75,14 +75,7 @@ namespace Xamarin.Forms.Controls
 
                        static void TrackOnInsights (Page page)
                        {
-                               if (Insights.IsInitialized) {
-                                       Insights.Track ("Navigation", new Dictionary<string, string> {
-                                               {
-                                                       "Pushing",
-                                                       page.GetType ().Name
-                                               }
-                                       });
-                               }
+                               
                        }
 
                        Page ActivatePage (Type type)
index 1d2dbf1..425d2ea 100644 (file)
@@ -1,30 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.Controls</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Controls</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
   </PropertyGroup>
+  <Import Project="..\.nuspec\Xamarin.Forms.DefaultItems.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;PERF;APP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -32,9 +14,6 @@
     <NoWarn>0114;0108;0109;4014;0649;0169;0472;0414;0168;0219;0429</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE;APP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
-    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj">
-      <Project>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</Project>
-      <Name>Xamarin.Forms.Build.Tasks</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj">
-      <Project>{4dcd0420-1168-4b77-86db-6196ee4bd491}</Project>
-      <Name>Xamarin.Forms.CustomAttributes</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
-      <Project>{7d13bac2-c6a4-416a-b07e-c169b199e52b}</Project>
-      <Name>Xamarin.Forms.Maps</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj">
-      <Project>{d6133dbd-6c60-4bd5-bea2-07e0a3927c31}</Project>
-      <Name>Xamarin.Forms.Pages</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj">
-      <Project>{9db2f292-8034-4e06-89ad-98bbda4306b9}</Project>
-      <Name>Xamarin.Forms.Xaml</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App.cs" />
-    <Compile Include="AppLifeCycle.cs" />
-    <Compile Include="Bugzilla44596SplashPage.cs" />
-    <Compile Include="ControlGalleryPages\AutomationPropertiesGallery.cs" />
-    <Compile Include="ControlGalleryPages\CellForceUpdateSizeGalleryPage.cs" />
-    <Compile Include="ControlGalleryPages\FlowDirectionGallery.cs" />
-    <Compile Include="ControlGalleryPages\LayoutAddPerformance.xaml.cs">
-      <DependentUpon>LayoutAddPerformance.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ControlGalleryPages\ListScrollTo.cs" />
-    <Compile Include="ControlGalleryPages\NavBarTitleTestPage.cs" />
-    <Compile Include="ControlGalleryPages\NestedNativeControlGalleryPage.cs" />
-    <Compile Include="ControlGalleryPages\PanGestureGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\KeyboardCoreGalleryPage.cs" />
-    <Compile Include="GalleryPages\BackgroundImageGallery.cs" />
-    <Compile Include="GalleryPages\ControlTemplatePage.cs" />
-    <Compile Include="GalleryPages\ControlTemplateXamlPage.xaml.cs">
-      <DependentUpon>ControlTemplateXamlPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GalleryPages\LayoutPerformanceGallery.cs" />
-    <Compile Include="GalleryPages\NavigationPropertiesGallery.cs" />
-    <Compile Include="ControlGalleryPages\ListViewSelectionColor.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\ApplicationAndroid.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\EntryPageiOS.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\MasterDetailPageiOS.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\MasterDetailPageWindows.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\NavigationPageiOS.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\NavigationPageWindows.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\TabbedPageAndroid.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\TabbedPageiOS.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\TabbedPageWindows.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\VisualElementiOS.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\WindowsPlatformSpecificsGalleryHelpers.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGallery.cs" />
-    <Compile Include="LegacyRepro\Page1.xaml.cs">
-      <DependentUpon>Page1.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainPageLifeCycleTests.cs" />
-    <Compile Include="NavReproApp.cs" />
-    <Compile Include="RootPages\RootContentPage.cs" />
-    <Compile Include="RootPages\SwapHierachyStackLayout.cs" />
-    <Compile Include="GalleryPages\EditableList.cs" />
-    <Compile Include="CoreGalleryPages\EditorCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\EntryCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\FrameCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\ImageCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\LabelCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\ListViewCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\OpenGLViewCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\PickerCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\ProgressBarCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\SearchBarCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\SliderCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\StepperCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\SwitchCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\TableViewCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\TimePickerCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\WebViewCoreGalleryPage.cs" />
-    <Compile Include="LegacyRepro\SampleViewCell.xaml.cs">
-      <DependentUpon>SampleViewCell.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SimpleApp.cs" />
-    <Compile Include="ViewContainers\EventViewContainer.cs" />
-    <Compile Include="ViewContainers\LayeredViewContainer.cs" />
-    <Compile Include="ViewContainers\MultiBindingHack.cs" />
-    <Compile Include="ViewContainers\StateViewContainer.cs" />
-    <Compile Include="ViewContainers\ValueViewContainer.cs" />
-    <Compile Include="ViewContainers\ViewContainer.cs" />
-    <Compile Include="CoreGalleryPages\ActivityIndicatorCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\CoreBoxViewGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\ButtonCoreGalleryPage.cs" />
-    <Compile Include="CoreGallery.cs" />
-    <Compile Include="CoreGalleryPages\DatePickerCoreGalleryPage.cs" />
-    <Compile Include="CoreGalleryPages\CoreGalleryPage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestCases.cs" />
-    <Compile Include="GalleryPages\GridGallery.cs" />
-    <Compile Include="GalleryPages\PickerGallery.cs" />
-    <Compile Include="GalleryPages\ImageLoadingGallery.cs" />
-    <Compile Include="GalleryPages\CarouselPageGallery.cs" />
-    <Compile Include="GalleryPages\StepperGallery.cs" />
-    <Compile Include="GalleryPages\ScaleRotate.cs" />
-    <Compile Include="GalleryPages\LineBreakModeGallery.cs" />
-    <Compile Include="GalleryPages\ActionSheetGallery.cs" />
-    <Compile Include="GalleryPages\XamlPage.xaml.cs">
-      <DependentUpon>XamlPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="RootPages\RootTabbedContentPage.cs" />
-    <Compile Include="RootPages\RootTabbedNavigationContentPage.cs" />
-    <Compile Include="RootPages\RootNavigationContentPage.cs" />
-    <Compile Include="RootPages\RootNavigationTabbedContentPage.cs" />
-    <Compile Include="RootPages\RootMDPNavigationContentPage.cs" />
-    <Compile Include="RootPages\RootTabbedMDPNavigationContentPage.cs" />
-    <Compile Include="RootPages\RootTabbedManyNavigationContentPage.cs" />
-    <Compile Include="RootPages\RootNavigationManyTabbedPage.cs" />
-    <Compile Include="ControlGalleryPages\BehaviorsAndTriggers.xaml.cs">
-      <DependentUpon>BehaviorsAndTriggers.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GalleryPages\CellsGalleries\EntryCellListPage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\EntryCellTablePage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\ImageCellListPage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\ImageCellTablePage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\ProductViewCell.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\SwitchCellListPage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\SwitchCellTablePage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\TextCellListPage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\TextCellTablePage.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\UnEvenViewCellGallery.cs" />
-    <Compile Include="GalleryPages\CellsGalleries\ViewCellGallery.cs" />
-    <Compile Include="GalleryPages\AbsoluteLayoutGallery.cs" />
-    <Compile Include="GalleryPages\BoundContentPage.cs" />
-    <Compile Include="GalleryPages\ButtonGallery.cs" />
-    <Compile Include="GalleryPages\CellTypeList.cs" />
-    <Compile Include="GalleryPages\ClipToBoundsGallery.cs" />
-    <Compile Include="GalleryPages\DisposeGallery.cs" />
-    <Compile Include="GalleryPages\EditorGallery.cs" />
-    <Compile Include="GalleryPages\EntryGallery.cs" />
-    <Compile Include="GalleryPages\FrameGallery.cs" />
-    <Compile Include="GalleryPages\GroupedListActionsGallery.cs" />
-    <Compile Include="GalleryPages\GroupedListContactsGallery.cs" />
-    <Compile Include="GalleryPages\ImageGallery.cs" />
-    <Compile Include="GalleryPages\InputIntentGallery.cs" />
-    <Compile Include="GalleryPages\LabelGallery.cs" />
-    <Compile Include="GalleryPages\LayoutOptionsGallery.cs" />
-    <Compile Include="GalleryPages\ListPage.cs" />
-    <Compile Include="GalleryPages\ListViewDemoPage.cs" />
-    <Compile Include="GalleryPages\MapGallery.cs" />
-    <Compile Include="GalleryPages\MinimumSizeGallery.cs" />
-    <Compile Include="GalleryPages\MultiGallery.cs" />
-    <Compile Include="GalleryPages\NavigationBarGallery.cs" />
-    <Compile Include="GalleryPages\NavigationMenuGallery.cs" />
-    <Compile Include="GalleryPages\OpenGLGallery.cs" />
-    <Compile Include="GalleryPages\ProgressBarGallery.cs" />
-    <Compile Include="GalleryPages\RelativeLayoutGallery.cs" />
-    <Compile Include="GalleryPages\ScrollGallery.cs" />
-    <Compile Include="GalleryPages\SearchBarGallery.cs" />
-    <Compile Include="GalleryPages\SettingsPage.cs" />
-    <Compile Include="GalleryPages\SliderGallery.cs" />
-    <Compile Include="GalleryPages\StackLayoutGallery.cs" />
-    <Compile Include="GalleryPages\SwitchGallery.cs" />
-    <Compile Include="GalleryPages\TableViewGallery.cs" />
-    <Compile Include="GalleryPages\TemplatedCarouselGallery.cs" />
-    <Compile Include="GalleryPages\TemplatedTabbedGallery.cs" />
-    <Compile Include="GalleryPages\UnevenListGallery.cs" />
-    <Compile Include="GalleryPages\WebViewGallery.cs" />
-    <Compile Include="GalleryPages\StyleGallery.cs" />
-    <Compile Include="GalleryPages\StyleXamlGallery.xaml.cs">
-      <DependentUpon>StyleXamlGallery.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GalleryPages\MasterDetailPageTabletPage.cs" />
-    <Compile Include="Helpers\ITestCloudService.cs" />
-    <Compile Include="ControlGalleryPages\ToolbarItems.cs" />
-    <Compile Include="GalleryPages\AlertGallery.cs" />
-    <Compile Include="RootPages\RootMDPNavigationTabbedContentPage.cs" />
-    <Compile Include="Controls\Issue3076Button.cs" />
-    <Compile Include="ControlGalleryPages\ListRefresh.cs" />
-    <Compile Include="ControlGalleryPages\PinchGestureTestPage.cs" />
-    <Compile Include="ControlGalleryPages\AppearingGalleryPage.cs" />
-    <Compile Include="ControlGalleryPages\AutomationIDGallery.cs" />
-    <Compile Include="GalleryPages\AppLinkPageGallery.cs" />
-    <Compile Include="ControlGalleryPages\NativeBindingGalleryPage.cs" />
-    <Compile Include="GalleryPages\XamlNativeViews.xaml.cs">
-      <DependentUpon>XamlNativeViews.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="HanselForms\BaseView.cs" />
-    <Compile Include="HanselForms\HBaseViewModel.cs" />
-    <Compile Include="HanselForms\RootPage.cs" />
-    <Compile Include="HanselForms\WebsiteView.cs" />
-    <Compile Include="HanselForms\BlogPage.xaml.cs">
-      <DependentUpon>BlogPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="HanselForms\MyAbout.xaml.cs">
-      <DependentUpon>MyAbout.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="HanselForms\TwitterPage.xaml.cs">
-      <DependentUpon>TwitterPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GalleryPages\MacTwitterDemo.xaml.cs">
-      <DependentUpon>MacTwitterDemo.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CompressedLayout.xaml.cs">
-      <DependentUpon>CompressedLayout.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\LargeTitlesPageiOS.cs" />
-    <Compile Include="GalleryPages\PlatformSpecificsGalleries\SafeAreaPageiOS.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\.nuspec\Xamarin.Forms.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  
   <ItemGroup>
     <EmbeddedResource Include="GalleryPages\crimson.jpg" />
-    <EmbeddedResource Include="GalleryPages\XamlPage.xaml">
+    <EmbeddedResource Update="GalleryPages\XamlPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="ControlGalleryPages\BehaviorsAndTriggers.xaml">
+    <EmbeddedResource Update="ControlGalleryPages\BehaviorsAndTriggers.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="GalleryPages\StyleXamlGallery.xaml">
+    <EmbeddedResource Update="GalleryPages\StyleXamlGallery.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="GalleryPages\XamlNativeViews.xaml">
+    <EmbeddedResource Update="GalleryPages\XamlNativeViews.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="GalleryPages\MacTwitterDemo.xaml">
+    <EmbeddedResource Update="GalleryPages\MacTwitterDemo.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="HanselForms\MyAbout.xaml">
+    <EmbeddedResource Update="HanselForms\MyAbout.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="HanselForms\BlogPage.xaml">
+    <EmbeddedResource Update="HanselForms\BlogPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="HanselForms\TwitterPage.xaml">
+    <EmbeddedResource Update="HanselForms\TwitterPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="CompressedLayout.xaml">
+    <EmbeddedResource Update="CompressedLayout.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\packages\Xamarin.Insights.1.11.1\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.1\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <ItemGroup>
-    <EmbeddedResource Include="ControlGalleryPages\LayoutAddPerformance.xaml">
+    <EmbeddedResource Update="ControlGalleryPages\LayoutAddPerformance.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="GalleryPages\ControlTemplateXamlPage.xaml">
+    <EmbeddedResource Update="GalleryPages\ControlTemplateXamlPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <EmbeddedResource Include="controlgallery.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="LegacyRepro\Page1.xaml">
+    <EmbeddedResource Update="LegacyRepro\Page1.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="LegacyRepro\SampleViewCell.xaml">
+    <EmbeddedResource Update="LegacyRepro\SampleViewCell.xaml">
       <Generator>MSBuild:UpdateDeisgnTimeXaml</Generator>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.Insights">
-      <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+  
   <Target Name="BeforeBuild">
     <CreateItem Include="blank.config">
       <Output TaskParameter="Include" ItemName="ConfigFile" />
     </CreateItem>
     <Copy SourceFiles="@(ConfigFile)" DestinationFiles="controlgallery.config" Condition="!Exists('controlgallery.config')" />
   </Target>
-  <Import Project="..\packages\Xamarin.Insights.1.12.3\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets')" />
-</Project>
+
+  <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" />
+</Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls/packages.config b/Xamarin.Forms.Controls/packages.config
deleted file mode 100644 (file)
index d5db6b3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Insights" version="1.12.3" targetFramework="portable45-net45+win8+wp8+wpa81" />
-</packages>
\ No newline at end of file
index f8c6337..59cccc6 100644 (file)
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Core.UITests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Core.Android.UITests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
   <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" />
   <Import Project="..\Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ItemGroup />
-</Project>
+ </Project>
\ No newline at end of file
index f3c5bb3..4651dd2 100644 (file)
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Core.Design</RootNamespace>
     <AssemblyName>Xamarin.Forms.Core.Design</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
index 26b31cf..ea92417 100644 (file)
@@ -141,15 +141,15 @@ namespace Xamarin.Forms.Core.UnitTests
                                return Task.FromResult (true);
                        }
 
-                       public Task<Stream> OpenFileAsync (string path, Internals.FileMode mode, Internals.FileAccess access)
+                       public Task<Stream> OpenFileAsync (string path, FileMode mode, FileAccess access)
                        {
-                               Stream stream = isolatedStorageFile.OpenFile (path, (System.IO.FileMode)mode, (System.IO.FileAccess)access);
+                               Stream stream = isolatedStorageFile.OpenFile (path, mode, access);
                                return Task.FromResult (stream);
                        }
 
-                       public Task<Stream> OpenFileAsync (string path, Internals.FileMode mode, Internals.FileAccess access, Internals.FileShare share)
+                       public Task<Stream> OpenFileAsync (string path, FileMode mode, FileAccess access, FileShare share)
                        {
-                               Stream stream = isolatedStorageFile.OpenFile (path, (System.IO.FileMode)mode, (System.IO.FileAccess)access, (System.IO.FileShare)share);
+                               Stream stream = isolatedStorageFile.OpenFile (path, mode, access, share);
                                return Task.FromResult (stream);
                        }
 
index c7c6b0b..6ec7d5e 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Core.UnitTests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Core.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
index 3ef6c09..18a37dc 100644 (file)
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Core.UITests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Core.Windows.UITests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,9 +43,8 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -79,6 +79,7 @@
     <Compile Include="WinQuery.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
similarity index 52%
rename from Xamarin.Forms.Controls/app.config
rename to Xamarin.Forms.Core.Windows.UITests/app.config
index b1d2a5a..dde2c3c 100644 (file)
@@ -3,8 +3,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
index 742002d..5f7c1ad 100644 (file)
@@ -2,7 +2,7 @@
 <packages>
   <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="Selenium.Support" version="3.0.1" targetFramework="net45" />
   <package id="Selenium.WebDriver" version="3.0.1" targetFramework="net45" />
index 77c1e41..b9b73ce 100644 (file)
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Core.UITests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Core.iOS.UITests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
   <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" />
   <Import Project="..\Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
index d1c0dfa..414c0db 100644 (file)
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Xamarin.Forms.Core.macOS.UITests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Core.macOS.UITests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Xamarin.Forms.Core/FileAccess.cs b/Xamarin.Forms.Core/FileAccess.cs
deleted file mode 100644 (file)
index 418dfa9..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.ComponentModel;
-
-namespace Xamarin.Forms.Internals
-{
-       [EditorBrowsable(EditorBrowsableState.Never)]
-       public enum FileAccess
-       {
-               Read = 0x00000001,
-               Write = 0x00000002,
-               ReadWrite = Read | Write
-       }
-}
\ No newline at end of file
diff --git a/Xamarin.Forms.Core/FileMode.cs b/Xamarin.Forms.Core/FileMode.cs
deleted file mode 100644 (file)
index fa278ba..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.ComponentModel;
-
-namespace Xamarin.Forms.Internals
-{
-       [EditorBrowsable(EditorBrowsableState.Never)]
-       public enum FileMode
-       {
-               CreateNew = 1,
-               Create = 2,
-               Open = 3,
-               OpenOrCreate = 4,
-               Truncate = 5,
-               Append = 6
-       }
-}
\ No newline at end of file
diff --git a/Xamarin.Forms.Core/FileShare.cs b/Xamarin.Forms.Core/FileShare.cs
deleted file mode 100644 (file)
index 25bda2b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Xamarin.Forms.Internals
-{
-       [Flags]
-       [EditorBrowsable(EditorBrowsableState.Never)]
-       public enum FileShare
-       {
-               None = 0,
-               Read = 1,
-               Write = 2,
-               ReadWrite = 3,
-               Delete = 4,
-               Inheritable = 16
-       }
-}
\ No newline at end of file
index 106d675..8be02f2 100644 (file)
@@ -1,18 +1,11 @@
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using Xamarin.Forms.Internals;
 
-[assembly: AssemblyTitle("Xamarin.Forms.Core")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCulture("")]
-
 [assembly: InternalsVisibleTo("iOSUnitTests")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Controls")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Core.Design")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Core.UnitTests")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Core.Android.UnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Core.WP8.UnitTests")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Xaml")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Maps")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS")]
index 358bc29..ee0870a 100644 (file)
@@ -2,7 +2,7 @@ using System.Reflection;
 
 [assembly: AssemblyCompany("Xamarin Inc.")]
 [assembly: AssemblyProduct("Xamarin.Forms")]
-[assembly: AssemblyCopyright("Copyright © Xamarin Inc. 2013-2016")]
+[assembly: AssemblyCopyright("Copyright © Xamarin Inc. 2013-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyVersion("2.0.0.0")]
 [assembly: AssemblyFileVersion("2.0.0.0")]
\ No newline at end of file
index 8fd79a2..1d89a4a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</ProjectGuid>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Forms</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Core</AssemblyName>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AbsoluteLayoutFlags.cs" />
-    <Compile Include="Accelerator.cs" />
-    <Compile Include="AcceleratorTypeConverter.cs" />
-    <Compile Include="AutomationProperties.cs" />
-    <Compile Include="ActionSheetArguments.cs" />
-    <Compile Include="AlertArguments.cs" />
-    <Compile Include="AnimatableKey.cs" />
-    <Compile Include="Application.cs" />
-    <Compile Include="Aspect.cs" />
-    <Compile Include="BackButtonPressedEventArgs.cs" />
-    <Compile Include="BaseMenuItem.cs" />
-    <Compile Include="BindablePropertyConverter.cs" />
-    <Compile Include="BindingMode.cs" />
-    <Compile Include="BindingTypeConverter.cs" />
-    <Compile Include="BoundsConstraint.cs" />
-    <Compile Include="BoundsTypeConverter.cs" />
-    <Compile Include="CastingEnumerator.cs" />
-    <Compile Include="Cells\EntryCell.cs" />
-    <Compile Include="Cells\ICellController.cs" />
-    <Compile Include="Cells\IEntryCellController.cs" />
-    <Compile Include="Cells\ImageCell.cs" />
-    <Compile Include="Cells\INativeElementView.cs" />
-    <Compile Include="ChatKeyboard.cs" />
-    <Compile Include="ChildCollectionChangedEventArgs.cs" />
-    <Compile Include="CollectionSynchronizationCallback.cs" />
-    <Compile Include="CollectionSynchronizationContext.cs" />
-    <Compile Include="ColorTypeConverter.cs" />
-    <Compile Include="ColumnDefinition.cs" />
-    <Compile Include="ColumnDefinitionCollection.cs" />
-    <Compile Include="Constraint.cs" />
-    <Compile Include="ConstraintExpression.cs" />
-    <Compile Include="ConstraintType.cs" />
-    <Compile Include="ConstraintTypeConverter.cs" />
-    <Compile Include="ContentPresenter.cs" />
-    <Compile Include="ControlTemplate.cs" />
-    <Compile Include="CustomKeyboard.cs" />
-    <Compile Include="DataTemplateExtensions.cs" />
-    <Compile Include="DataTemplateSelector.cs" />
-    <Compile Include="DateChangedEventArgs.cs" />
-    <Compile Include="DelegateLogListener.cs" />
-    <Compile Include="EffectiveFlowDirectionExtensions.cs" />
-    <Compile Include="IEditorController.cs" />
-    <Compile Include="IFlowDirectionController.cs" />
-    <Compile Include="IGridController.cs" />
-    <Compile Include="IWebViewController.cs" />
-    <Compile Include="INavigationMenuController.cs" />
-    <Compile Include="Internals\EffectUtilities.cs" />
-    <Compile Include="EnumerableExtensions.cs" />
-    <Compile Include="IMultiPageController.cs" />
-    <Compile Include="LockableObservableListWrapper.cs" />
-    <Compile Include="PlatformConfiguration\AndroidSpecific\AppCompat\Application.cs" />
-    <Compile Include="PlatformConfiguration\AndroidSpecific\Application.cs" />
-    <Compile Include="PlatformConfiguration\AndroidSpecific\Elevation.cs" />
-    <Compile Include="PlatformConfiguration\AndroidSpecific\TabbedPage.cs" />
-    <Compile Include="PlatformConfiguration\ExtensionPoints.cs" />
-    <Compile Include="PlatformConfiguration\GTKSpecific\BoxView.cs" />
-    <Compile Include="PlatformConfiguration\GTKSpecific\NavigationPage.cs" />
-    <Compile Include="PlatformConfiguration\GTKSpecific\TabbedPage.cs" />
-    <Compile Include="PlatformConfiguration\GTKSpecific\TabPosition.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\BlurEffectStyle.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\Entry.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\NavigationPage.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\ScrollView.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\Picker.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\StatusBarTextColorMode.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\Page.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\StatusBarHiddenMode.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\UIStatusBarAnimation.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\UpdateMode.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\VisualElement.cs" />
-    <Compile Include="PlatformConfiguration\WindowsSpecific\ListView.cs" />
-    <Compile Include="PlatformConfiguration\WindowsSpecific\MasterDetailPage.cs" />
-    <Compile Include="PlatformConfiguration\WindowsSpecific\CollapseStyle.cs" />
-    <Compile Include="Configuration.cs" />
-    <Compile Include="IConfigElement.cs" />
-    <Compile Include="IConfigPlatform.cs" />
-    <Compile Include="IElementConfiguration.cs" />
-    <Compile Include="IPlatformElementConfiguration.cs" />
-    <Compile Include="PlatformConfigurationRegistry.cs" />
-    <Compile Include="EffectiveFlowDirection.cs" />
-    <Compile Include="FlowDirection.cs" />
-    <Compile Include="IFontElement.cs" />
-    <Compile Include="DependencyAttribute.cs" />
-    <Compile Include="DependencyFetchTarget.cs" />
-    <Compile Include="DeviceOrientation.cs" />
-    <Compile Include="DeviceOrientationExtensions.cs" />
-    <Compile Include="Effect.cs" />
-    <Compile Include="ElementEventArgs.cs" />
-    <Compile Include="ElementTemplate.cs" />
-    <Compile Include="EmailKeyboard.cs" />
-    <Compile Include="IListProxy.cs" />
-    <Compile Include="IMenuItemController.cs" />
-    <Compile Include="IEntryController.cs" />
-    <Compile Include="IImageController.cs" />
-    <Compile Include="INavigationPageController.cs" />
-    <Compile Include="IMasterDetailPageController.cs" />
-    <Compile Include="Internals\EvalRequested.cs" />
-    <Compile Include="ExportEffectAttribute.cs" />
-    <Compile Include="ExpressionSearch.cs" />
-    <Compile Include="FileAccess.cs" />
-    <Compile Include="FileImageSourceConverter.cs" />
-    <Compile Include="FileMode.cs" />
-    <Compile Include="FileShare.cs" />
-    <Compile Include="FontAttributes.cs" />
-    <Compile Include="FontSizeConverter.cs" />
-    <Compile Include="FontTypeConverter.cs" />
-    <Compile Include="GestureRecognizer.cs" />
-    <Compile Include="GridLength.cs" />
-    <Compile Include="GridLengthTypeConverter.cs" />
-    <Compile Include="GridUnitType.cs" />
-    <Compile Include="HandlerAttribute.cs" />
-    <Compile Include="HtmlWebViewSource.cs" />
-    <Compile Include="IButtonController.cs" />
-    <Compile Include="IControlTemplated.cs" />
-    <Compile Include="IDefinition.cs" />
-    <Compile Include="IEffectControlProvider.cs" />
-    <Compile Include="IElementController.cs" />
-    <Compile Include="IExpressionSearch.cs" />
-    <Compile Include="IExtendedTypeConverter.cs" />
-    <Compile Include="IGestureRecognizer.cs" />
-    <Compile Include="IItemsView.cs" />
-    <Compile Include="IItemViewController.cs" />
-    <Compile Include="ILayoutController.cs" />
-    <Compile Include="IListViewController.cs" />
-    <Compile Include="ImageSourceConverter.cs" />
-    <Compile Include="INavigation.cs" />
-    <Compile Include="InvalidationEventArgs.cs" />
-    <Compile Include="Internals\InvalidationTrigger.cs" />
-    <Compile Include="InvalidNavigationException.cs" />
-    <Compile Include="IOpenGlViewController.cs" />
-    <Compile Include="IPageController.cs" />
-    <Compile Include="IPanGestureController.cs" />
-    <Compile Include="IPinchGestureController.cs" />
-    <Compile Include="IPlatform.cs" />
-    <Compile Include="IProvideParentValues.cs" />
-    <Compile Include="IProvideValueTarget.cs" />
-    <Compile Include="IRegisterable.cs" />
-    <Compile Include="IResourceDictionary.cs" />
-    <Compile Include="IResourcesProvider.cs" />
-    <Compile Include="IRootObjectProvider.cs" />
-    <Compile Include="IScrollViewController.cs" />
-    <Compile Include="ITableModel.cs" />
-    <Compile Include="ITableViewController.cs" />
-    <Compile Include="ITemplatedItemsList.cs" />
-    <Compile Include="ITemplatedItemsListScrollToRequestedEventArgs.cs" />
-    <Compile Include="ITemplatedItemsView.cs" />
-    <Compile Include="ISearchBarController.cs" />
-    <Compile Include="IStreamImageSource.cs" />
-    <Compile Include="ItemTappedEventArgs.cs" />
-    <Compile Include="ItemVisibilityEventArgs.cs" />
-    <Compile Include="IValueConverterProvider.cs" />
-    <Compile Include="IValueProvider.cs" />
-    <Compile Include="IViewController.cs" />
-    <Compile Include="IVisualElementController.cs" />
-    <Compile Include="IWebViewDelegate.cs" />
-    <Compile Include="IXamlTypeResolver.cs" />
-    <Compile Include="IXmlLineInfoProvider.cs" />
-    <Compile Include="KeyboardFlags.cs" />
-    <Compile Include="KeyboardTypeConverter.cs" />
-    <Compile Include="LayoutAlignment.cs" />
-    <Compile Include="LayoutAlignmentExtensions.cs" />
-    <Compile Include="LayoutConstraint.cs" />
-    <Compile Include="LayoutExpandFlag.cs" />
-    <Compile Include="LayoutOptionsConverter.cs" />
-    <Compile Include="ListViewCachingStrategy.cs" />
-    <Compile Include="LockingSemaphore.cs" />
-    <Compile Include="Log.cs" />
-    <Compile Include="LogListener.cs" />
-    <Compile Include="MasterBehavior.cs" />
-    <Compile Include="MeasureFlags.cs" />
-    <Compile Include="MenuItem.cs" />
-    <Compile Include="ModalEventArgs.cs" />
-    <Compile Include="ModalPoppedEventArgs.cs" />
-    <Compile Include="ModalPoppingEventArgs.cs" />
-    <Compile Include="ModalPushedEventArgs.cs" />
-    <Compile Include="ModalPushingEventArgs.cs" />
-    <Compile Include="NavigationEventArgs.cs" />
-    <Compile Include="NavigationModel.cs" />
-    <Compile Include="Internals\NavigationRequestedEventArgs.cs" />
-    <Compile Include="Internals\NotifyCollectionChangedEventArgsEx.cs" />
-    <Compile Include="Internals\NotifyCollectionChangedEventArgsExtensions.cs" />
-    <Compile Include="NullEffect.cs" />
-    <Compile Include="NumericKeyboard.cs" />
-    <Compile Include="ObservableList.cs" />
-    <Compile Include="OrderedDictionary.cs" />
-    <Compile Include="PanGestureRecognizer.cs" />
-    <Compile Include="PanUpdatedEventArgs.cs" />
-    <Compile Include="Performance.cs" />
-    <Compile Include="PinchGestureUpdatedEventArgs.cs" />
-    <Compile Include="PlatformConfiguration\WindowsSpecific\Page.cs" />
-    <Compile Include="PlatformConfiguration\WindowsSpecific\ToolbarPlacement.cs" />
-    <Compile Include="PlatformEffect.cs" />
-    <Compile Include="PointTypeConverter.cs" />
-    <Compile Include="Internals\PreserveAttribute.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BindableObject.cs" />
-    <Compile Include="BindableObjectExtensions.cs" />
-    <Compile Include="BindableProperty.cs" />
-    <Compile Include="Binding.cs" />
-    <Compile Include="BindingBase.cs" />
-    <Compile Include="BindingBaseExtensions.cs" />
-    <Compile Include="BindingExpression.cs" />
-    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
-    <Compile Include="PropertyChangingEventArgs.cs" />
-    <Compile Include="IValueConverter.cs" />
-    <Compile Include="PropertyChangingEventHandler.cs" />
-    <Compile Include="ReadOnlyCastingList.cs" />
-    <Compile Include="ReadOnlyListAdapter.cs" />
-    <Compile Include="RectangleTypeConverter.cs" />
-    <Compile Include="Registrar.cs" />
-    <Compile Include="RenderWithAttribute.cs" />
-    <Compile Include="ResolutionGroupNameAttribute.cs" />
-    <Compile Include="ResourcesChangedEventArgs.cs" />
-    <Compile Include="ResourcesExtensions.cs" />
-    <Compile Include="RoutingEffect.cs" />
-    <Compile Include="RowDefinition.cs" />
-    <Compile Include="RowDefinitionCollection.cs" />
-    <Compile Include="ScrollOrientation.cs" />
-    <Compile Include="ScrollToMode.cs" />
-    <Compile Include="ScrollToPosition.cs" />
-    <Compile Include="SelectedItemChangedEventArgs.cs" />
-    <Compile Include="SelectedPositionChangedEventArgs.cs" />
-    <Compile Include="SeparatorMenuItem.cs" />
-    <Compile Include="SeparatorVisibility.cs" />
-    <Compile Include="SizeRequest.cs" />
-    <Compile Include="Span.cs" />
-    <Compile Include="StackOrientation.cs" />
-    <Compile Include="StreamWrapper.cs" />
-    <Compile Include="SynchronizedList.cs" />
-    <Compile Include="TableIntent.cs" />
-    <Compile Include="TableRoot.cs" />
-    <Compile Include="TableSectionBase.cs" />
-    <Compile Include="TapGestureRecognizer.cs" />
-    <Compile Include="TelephoneKeyboard.cs" />
-    <Compile Include="TemplateBinding.cs" />
-    <Compile Include="TemplatedItemsList.cs" />
-    <Compile Include="Internals\CellExtensions.cs" />
-    <Compile Include="TemplatedPage.cs" />
-    <Compile Include="TemplatedView.cs" />
-    <Compile Include="TemplateUtilities.cs" />
-    <Compile Include="TextChangedEventArgs.cs" />
-    <Compile Include="TextKeyboard.cs" />
-    <Compile Include="ThicknessTypeConverter.cs" />
-    <Compile Include="Internals\Ticker.cs" />
-    <Compile Include="ToggledEventArgs.cs" />
-    <Compile Include="ToolbarItemEventArgs.cs" />
-    <Compile Include="ToolbarItemOrder.cs" />
-    <Compile Include="TrackableCollection.cs" />
-    <Compile Include="TypeConverterAttribute.cs" />
-    <Compile Include="TypeConverter.cs" />
-    <Compile Include="ReflectionExtensions.cs" />
-    <Compile Include="Device.cs" />
-    <Compile Include="TargetPlatform.cs" />
-    <Compile Include="TargetIdiom.cs" />
-    <Compile Include="UnsolvableConstraintsException.cs" />
-    <Compile Include="UrlKeyboard.cs" />
-    <Compile Include="UrlWebViewSource.cs" />
-    <Compile Include="ValueChangedEventArgs.cs" />
-    <Compile Include="Vec2.cs" />
-    <Compile Include="View.cs" />
-    <Compile Include="IElement.cs" />
-    <Compile Include="IAnimatable.cs" />
-    <Compile Include="Easing.cs" />
-    <Compile Include="NavigationProxy.cs" />
-    <Compile Include="NavigationPage.cs" />
-    <Compile Include="Page.cs" />
-    <Compile Include="LayoutOptions.cs" />
-    <Compile Include="CarouselPage.cs" />
-    <Compile Include="Rectangle.cs" />
-    <Compile Include="Color.cs" />
-    <Compile Include="ResourceDictionary.cs" />
-    <Compile Include="EventArg.cs" />
-    <Compile Include="Size.cs" />
-    <Compile Include="GestureState.cs" />
-    <Compile Include="Point.cs" />
-    <Compile Include="Thickness.cs" />
-    <Compile Include="ToolbarItem.cs" />
-    <Compile Include="ContentPropertyAttribute.cs" />
-    <Compile Include="MessagingCenter.cs" />
-    <Compile Include="Cells\Cell.cs" />
-    <Compile Include="Cells\SwitchCell.cs" />
-    <Compile Include="Cells\TextCell.cs" />
-    <Compile Include="Cells\ViewCell.cs" />
-    <Compile Include="ListView.cs" />
-    <Compile Include="TableView.cs" />
-    <Compile Include="ItemsView.cs" />
-    <Compile Include="TableModel.cs" />
-    <Compile Include="TableSection.cs" />
-    <Compile Include="DataTemplate.cs" />
-    <Compile Include="ListProxy.cs" />
-    <Compile Include="AbsoluteLayout.cs" />
-    <Compile Include="ActivityIndicator.cs" />
-    <Compile Include="BoxView.cs" />
-    <Compile Include="Button.cs" />
-    <Compile Include="Command.cs" />
-    <Compile Include="ContentView.cs" />
-    <Compile Include="DatePicker.cs" />
-    <Compile Include="DependencyService.cs" />
-    <Compile Include="Editor.cs" />
-    <Compile Include="Entry.cs" />
-    <Compile Include="Frame.cs" />
-    <Compile Include="Image.cs" />
-    <Compile Include="UriImageSource.cs" />
-    <Compile Include="IMarkupExtension.cs" />
-    <Compile Include="InputView.cs" />
-    <Compile Include="Keyboard.cs" />
-    <Compile Include="Label.cs" />
-    <Compile Include="LineBreakMode.cs" />
-    <Compile Include="MasterDetailPage.cs" />
-    <Compile Include="NavigationMenu.cs" />
-    <Compile Include="OpenGLView.cs" />
-    <Compile Include="ProgressBar.cs" />
-    <Compile Include="RelativeLayout.cs" />
-    <Compile Include="ScrollView.cs" />
-    <Compile Include="SearchBar.cs" />
-    <Compile Include="Slider.cs" />
-    <Compile Include="StackLayout.cs" />
-    <Compile Include="Stepper.cs" />
-    <Compile Include="Switch.cs" />
-    <Compile Include="TabbedPage.cs" />
-    <Compile Include="TemplateExtensions.cs" />
-    <Compile Include="TimePicker.cs" />
-    <Compile Include="Internals\ToolbarTracker.cs" />
-    <Compile Include="ViewExtensions.cs" />
-    <Compile Include="ViewState.cs" />
-    <Compile Include="WeakEventManager.cs" />
-    <Compile Include="WeakReferenceExtensions.cs" />
-    <Compile Include="WebNavigatedEventArgs.cs" />
-    <Compile Include="WebNavigatingEventArgs.cs" />
-    <Compile Include="WebNavigationEvent.cs" />
-    <Compile Include="WebNavigationEventArgs.cs" />
-    <Compile Include="WebNavigationResult.cs" />
-    <Compile Include="WebView.cs" />
-    <Compile Include="Animation.cs" />
-    <Compile Include="AnimationExtensions.cs" />
-    <Compile Include="Tweener.cs" />
-    <Compile Include="IPlatformServices.cs" />
-    <Compile Include="UriTypeConverter.cs" />
-    <Compile Include="IIsolatedStorageFile.cs" />
-    <Compile Include="Grid.cs" />
-    <Compile Include="GridCalc.cs" />
-    <Compile Include="DefinitionCollection.cs" />
-    <Compile Include="Element.cs" />
-    <Compile Include="ObservableWrapper.cs" />
-    <Compile Include="ElementCollection.cs" />
-    <Compile Include="IViewContainer.cs" />
-    <Compile Include="Layout.cs" />
-    <Compile Include="ContentPage.cs" />
-    <Compile Include="IPageContainer.cs" />
-    <Compile Include="MultiPage.cs" />
-    <Compile Include="ILayout.cs" />
-    <Compile Include="FocusEventArgs.cs" />
-    <Compile Include="VisualElement.cs" />
-    <Compile Include="NameScopeExtensions.cs" />
-    <Compile Include="NamedSize.cs" />
-    <Compile Include="TextAlignment.cs" />
-    <Compile Include="Font.cs" />
-    <Compile Include="Picker.cs" />
-    <Compile Include="NumericExtensions.cs" />
-    <Compile Include="BindablePropertyKey.cs" />
-    <Compile Include="ImageSource.cs" />
-    <Compile Include="FileImageSource.cs" />
-    <Compile Include="StreamImageSource.cs" />
-    <Compile Include="OnPlatform.cs" />
-    <Compile Include="OnIdiom.cs" />
-    <Compile Include="TappedEventArgs.cs" />
-    <Compile Include="FormattedString.cs" />
-    <Compile Include="Interactivity\Behavior.cs" />
-    <Compile Include="Interactivity\IAttachedObject.cs" />
-    <Compile Include="Interactivity\AttachedCollection.cs" />
-    <Compile Include="Interactivity\TriggerAction.cs" />
-    <Compile Include="Interactivity\EventTrigger.cs" />
-    <Compile Include="Interactivity\TriggerBase.cs" />
-    <Compile Include="Interactivity\Trigger.cs" />
-    <Compile Include="Setter.cs" />
-    <Compile Include="Style.cs" />
-    <Compile Include="ParameterAttribute.cs" />
-    <Compile Include="TypeTypeConverter.cs" />
-    <Compile Include="SettersExtensions.cs" />
-    <Compile Include="IDeserializer.cs" />
-    <Compile Include="ISystemResourcesProvider.cs" />
-    <Compile Include="Interactivity\DataTrigger.cs" />
-    <Compile Include="Interactivity\Condition.cs" />
-    <Compile Include="Interactivity\BindingCondition.cs" />
-    <Compile Include="Interactivity\PropertyCondition.cs" />
-    <Compile Include="Interactivity\MultiTrigger.cs" />
-    <Compile Include="Interactivity\MultiCondition.cs" />
-    <Compile Include="DeviceInfo.cs" />
-    <Compile Include="WebViewSource.cs" />
-    <Compile Include="WebViewSourceTypeConverter.cs" />
-    <Compile Include="XamlParseException.cs" />
-    <Compile Include="ScrolledEventArgs.cs" />
-    <Compile Include="ScrollToRequestedEventArgs.cs" />
-    <Compile Include="XmlLineInfo.cs" />
-    <Compile Include="GestureStatus.cs" />
-    <Compile Include="Internals\INameScope.cs" />
-    <Compile Include="Internals\NameScope.cs" />
-    <Compile Include="Internals\IDataTemplate.cs" />
-    <Compile Include="Internals\IDynamicResourceHandler.cs" />
-    <Compile Include="Internals\DynamicResource.cs" />
-    <Compile Include="PinchGestureRecognizer.cs" />
-    <Compile Include="IStyle.cs" />
-    <Compile Include="MergedStyle.cs" />
-    <Compile Include="IAppLinks.cs" />
-    <Compile Include="IAppLinkEntry.cs" />
-    <Compile Include="AppLinkEntry.cs" />
-    <Compile Include="IApplicationController.cs" />
-    <Compile Include="IAppIndexingProvider.cs" />
-    <Compile Include="ListStringTypeConverter.cs" />
-    <Compile Include="PoppedToRootEventArgs.cs" />
-    <Compile Include="NativeBindingHelpers.cs" />
-    <Compile Include="INativeValueConverterService.cs" />
-    <Compile Include="INativeBindingService.cs" />
-    <Compile Include="ProvideCompiledAttribute.cs" />
-    <Compile Include="TypedBinding.cs" />
-    <Compile Include="XmlnsDefinitionAttribute.cs" />
-    <Compile Include="PlatformConfiguration\macOSSpecific\TabbedPage.cs" />
-    <Compile Include="PlatformConfiguration\macOSSpecific\TabsStyle.cs" />
-    <Compile Include="FontElement.cs" />
-    <Compile Include="PlatformConfiguration\AndroidSpecific\ListView.cs" />
-    <Compile Include="ITextElement.cs" />
-    <Compile Include="TextElement.cs" />
-    <Compile Include="Internals\ResourceLoader.cs" />
-    <Compile Include="Xaml\TypeConversionExtensions.cs" />
-    <Compile Include="Xaml\ValueConverterProvider.cs" />
-    <Compile Include="PlatformConfiguration\macOSSpecific\Page.cs" />
-    <Compile Include="ClickGestureRecognizer.cs" />
-    <Compile Include="ClickedEventArgs.cs" />
-    <Compile Include="Menu.cs" />
-    <Compile Include="CompressedLayout.cs" />
-    <Compile Include="PlatformConfiguration\macOSSpecific\NavigationPage.cs" />
-    <Compile Include="PlatformConfiguration\macOSSpecific\NavigationTransitionStyle.cs" />
-    <Compile Include="Xaml\IResourcesLoader.cs" />
-    <Compile Include="Xaml\XamlResourceIdAttribute.cs" />
-    <Compile Include="PlatformConfiguration\iOSSpecific\LargeTitleDisplayMode.cs" />
-    <Compile Include="Internals\INamescopeProvider.cs" />
-    <Compile Include="ReferenceTypeConverter.cs" />
-    <Compile Include="ITextAlignmentElement.cs" />
-    <Compile Include="TextAlignmentElement.cs" />
-    <Compile Include="PaddingElement.cs" />
-    <Compile Include="IPaddingElement.cs" />
-    <Compile Include="TypeConversionAttribute.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+
   <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj">
-      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
-      <Name>Xamarin.Forms.Platform</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj" />
   </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup />
-  <ItemGroup />
-  <ItemGroup />
+
 </Project>
diff --git a/Xamarin.Forms.CustomAttributes/Properties/AssemblyInfo.cs b/Xamarin.Forms.CustomAttributes/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index ce51278..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xamarin.Forms.CustomAttributes")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Forms.CustomAttributes")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
index 274469e..90665e9 100644 (file)
@@ -1,56 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4DCD0420-1168-4B77-86DB-6196EE4BD491}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.CustomAttributes</RootNamespace>
-    <AssemblyName>Xamarin.Forms.CustomAttributes</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0169</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+  
+  <PropertyGroup>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>0169</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestAttributes.cs" />
-    <Compile Include="UiTestAttribute.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
index f4a08c8..78cd3e3 100644 (file)
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Maps.Design</RootNamespace>
     <AssemblyName>Xamarin.Forms.Maps.Design</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
index 2e47f59..c7132bc 100644 (file)
@@ -59,6 +59,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
+    <Reference Include="netstandard" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
index b3ce013..9981b4a 100644 (file)
@@ -50,11 +50,11 @@ namespace Xamarin.Forms.Maps.UWP
                                if (mapModel.Pins.Any())
                                        LoadPins();
 
-                               if (Control == null) return;
+                               if (Control == null) return;
 
                                await Control.Dispatcher.RunIdleAsync(async (i) => await MoveToRegion(mapModel.LastMoveToRegion, MapAnimationKind.None));
                                await UpdateIsShowingUser();
-                       }
+                       }
                }
 
                protected override async void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -158,7 +158,7 @@ namespace Xamarin.Forms.Maps.UWP
                        {
                                var myGeolocator = new Geolocator();
                                if (myGeolocator.LocationStatus != PositionStatus.NotAvailable &&
-                                   myGeolocator.LocationStatus != PositionStatus.Disabled)
+                                       myGeolocator.LocationStatus != PositionStatus.Disabled)
                                {
                                        var userPosition = await myGeolocator.GetGeopositionAsync();
                                        if (userPosition?.Coordinate != null)
@@ -173,7 +173,7 @@ namespace Xamarin.Forms.Maps.UWP
                                        _timer.Tick += async (s, o) => await UpdateIsShowingUser(moveToLocation: false);
                                        _timer.Interval = TimeSpan.FromSeconds(15);
                                }
-                               
+
                                if (!_timer.IsEnabled)
                                        _timer.Start();
                        }
@@ -204,7 +204,6 @@ namespace Xamarin.Forms.Maps.UWP
                {
                        if (Control == null || Element == null)
                                return;
-               
                        try
                        {
                                Geopoint nw, se = null;
@@ -217,12 +216,12 @@ namespace Xamarin.Forms.Maps.UWP
                                        var center = new Position(boundingBox.Center.Latitude, boundingBox.Center.Longitude);
                                        var latitudeDelta = Math.Abs(nw.Position.Latitude - se.Position.Latitude);
                                        var longitudeDelta = Math.Abs(nw.Position.Longitude - se.Position.Longitude);
-                    await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-                    {
+                                       await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+                                       {
                                                Element.SetVisibleRegion(new MapSpan(center, latitudeDelta, longitudeDelta));
-                    });
+                                       });
                                }
-            }
+                       }
                        catch (Exception)
                        {
                                return;
index 5d78702..5818163 100644 (file)
@@ -1,29 +1,5 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Xamarin.Forms.Maps;
+using Xamarin.Forms.Maps;
 using Xamarin.Forms.Maps.UWP;
 using Xamarin.Forms.Platform.UWP;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("Xamarin.Forms.Maps.WindowsUniversal")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
 [assembly: ExportRenderer(typeof (Map), typeof (MapRenderer))]
\ No newline at end of file
index 275268e..dc99c1e 100644 (file)
@@ -25,7 +25,7 @@
     http://go.microsoft.com/fwlink/?LinkID=391919
 -->
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Xamarin.Forms.Maps.WindowsUniversal">
+  <Library Name="Xamarin.Forms.Maps.UWP">
 
        <!-- add directives for your library here -->
 
index 654f773..d68b75b 100644 (file)
     <AssemblyName>Xamarin.Forms.Maps.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
+    <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="FormsMaps.cs" />
     <Compile Include="GeocoderBackend.cs" />
     <Compile Include="MapRenderer.cs" />
     <EmbeddedResource Include="Properties\Xamarin.Forms.Maps.UWP.rd.xml" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
       <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
       <Name>Xamarin.Forms.Core</Name>
diff --git a/Xamarin.Forms.Maps.UWP/project.json b/Xamarin.Forms.Maps.UWP/project.json
deleted file mode 100644 (file)
index c594939..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
index 1a24986..220294d 100644 (file)
@@ -75,4 +75,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
index 8c4d52c..c84e6c4 100644 (file)
@@ -1,14 +1,3 @@
-using System.Reflection;
-using System.Resources;
-using Xamarin.Forms.Internals;
+using Xamarin.Forms.Internals;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("Xamarin.Forms.Maps")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
 [assembly: Preserve]
\ No newline at end of file
index 4175ce2..f0efcbc 100644 (file)
@@ -1,70 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7D13BAC2-C6A4-416A-B07E-C169B199E52B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.Maps</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Maps</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
+    <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Map.cs" />
-    <Compile Include="Pin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Distance.cs" />
-    <Compile Include="MapSpan.cs" />
-    <Compile Include="MapType.cs" />
-    <Compile Include="PinType.cs" />
-    <Compile Include="Position.cs" />
-    <Compile Include="Geocoder.cs" />
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/Xamarin.Forms.Pages.Azure/Properties/AssemblyInfo.cs b/Xamarin.Forms.Pages.Azure/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 8c6b8da..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xamarin.Forms.Pages.Azure")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Forms.Pages.Azure")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
index c8d47fd..71fafc0 100644 (file)
@@ -1,99 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9696465-7657-4843-872E-3C01891C4A9B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.Pages.Azure</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Pages.Azure</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AzureDataSource.cs" />
-    <Compile Include="AzureEasyTableSource.cs" />
-    <Compile Include="AzureSource.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.WindowsAzure.Mobile, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Mobile.Client.2.0.1\lib\portable-win+net45+wp8+wpa81+monotouch+monoandroid\Microsoft.WindowsAzure.Mobile.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Extensions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <PackageReference Include="Microsoft.Azure.Mobile.Client">
+      <Version>4.0.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj">
-      <Project>{d6133dbd-6c60-4bd5-bea2-07e0a3927c31}</Project>
-      <Name>Xamarin.Forms.Pages</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj">
-      <Project>{9db2f292-8034-4e06-89ad-98bbda4306b9}</Project>
-      <Name>Xamarin.Forms.Xaml</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+ </Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.Pages.Azure/packages.config b/Xamarin.Forms.Pages.Azure/packages.config
deleted file mode 100644 (file)
index 035d1e5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Azure.Mobile.Client" version="2.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
-</packages>
\ No newline at end of file
index 1fd2465..a444b19 100644 (file)
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Pages.UnitTests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Pages.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -31,9 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
index b3e166f..db5305a 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Xamarin.Forms.Pages/Properties/AssemblyInfo.cs b/Xamarin.Forms.Pages/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index a7150fb..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Reflection;
-using System.Resources;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("Xamarin.Forms.Pages")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Forms.Pages")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
index 3eceb9e..4d20eee 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Build">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.Pages</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Pages</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BaseDataSource.cs" />
-    <Compile Include="CardView.cs" />
-    <Compile Include="CompoundCollection.cs" />
-    <Compile Include="DataItem.cs" />
-    <Compile Include="DataPage.cs" />
-    <Compile Include="DataSourceBinding.cs" />
-    <Compile Include="DataSourceBindingExtension.cs" />
-    <Compile Include="DataSourceList.cs" />
-    <Compile Include="DataView.cs" />
-    <Compile Include="DirectoryPage.cs" />
-    <Compile Include="HeroImage.cs" />
-    <Compile Include="IDataItem.cs" />
-    <Compile Include="IDataSource.cs" />
-    <Compile Include="IDataSourceProvider.cs" />
-    <Compile Include="JsonSource.cs" />
-    <Compile Include="JsonDataSource.cs" />
-    <Compile Include="JsonSourceConverter.cs" />
-    <Compile Include="ListDataPage.cs" />
-    <Compile Include="ListItemControl.cs" />
-    <Compile Include="PersonDetailPage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StringJsonSource.cs" />
-    <Compile Include="UriJsonSource.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Extensions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>10.0.3</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/Xamarin.Forms.Pages/packages.config b/Xamarin.Forms.Pages/packages.config
deleted file mode 100644 (file)
index 3cd5059..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
-</packages>
\ No newline at end of file
index 893c95b..f85ea4c 100644 (file)
@@ -576,15 +576,15 @@ namespace Xamarin.Forms
                                        return Task.FromResult(_isolatedStorageFile.GetLastWriteTime(path));
                                }
 
-                               public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access)
+                               public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access)
                                {
-                                       Stream stream = _isolatedStorageFile.OpenFile(path, (System.IO.FileMode)mode, (System.IO.FileAccess)access);
+                                       Stream stream = _isolatedStorageFile.OpenFile(path, mode, access);
                                        return Task.FromResult(stream);
                                }
 
-                               public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access, Internals.FileShare share)
+                               public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access, FileShare share)
                                {
-                                       Stream stream = _isolatedStorageFile.OpenFile(path, (System.IO.FileMode)mode, (System.IO.FileAccess)access, (System.IO.FileShare)share);
+                                       Stream stream = _isolatedStorageFile.OpenFile(path, mode, access, share);
                                        return Task.FromResult(stream);
                                }
                        }
index ee3426a..ec8e8e0 100644 (file)
@@ -37,19 +37,19 @@ namespace Xamarin.Forms.Platform.GTK
             return Task.FromResult(storage.GetLastWriteTime(path));
         }
 
-        public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access)
+        public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access)
         {
             var storage = CreateStorageFileInstance();
 
-            Stream stream = storage.OpenFile(path, (System.IO.FileMode)mode, (System.IO.FileAccess)access);
+            Stream stream = storage.OpenFile(path, mode, access);
             return Task.FromResult(stream);
         }
 
-        public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access, Internals.FileShare share)
+        public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access, FileShare share)
         {
             var storage = CreateStorageFileInstance();
 
-            Stream stream = storage.OpenFile(path, (System.IO.FileMode)mode, (System.IO.FileAccess)access, (System.IO.FileShare)share);
+            Stream stream = storage.OpenFile(path, mode, access, share);
             return Task.FromResult(stream);
         }
 
index 3cb18a5..08dd92d 100644 (file)
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Platform.GTK</RootNamespace>
     <AssemblyName>Xamarin.Forms.Platform.GTK</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -92,6 +93,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Animations\BaseAnimation.cs" />
     <Compile Include="Animations\FloatAnimation.cs" />
     <Compile Include="Cells\CellBase.cs" />
index 754c958..f214d26 100644 (file)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
index 1ef202d..18e93d2 100644 (file)
@@ -62,6 +62,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
+    <Reference Include="netstandard" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Net.Http" />
       <Name>Xamarin.Forms.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
 </Project>
\ No newline at end of file
index bf1936a..adf21f1 100644 (file)
@@ -1,13 +1,7 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Xamarin.Forms;
+using Xamarin.Forms;
 using Xamarin.Forms.Platform.UWP;
 
-[assembly: AssemblyTitle("Xamarin.Forms.Platform.UAP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
+
 [assembly: Dependency(typeof(WindowsSerializer))]
 
 // Views
index bdf763f..86aec35 100644 (file)
@@ -58,27 +58,27 @@ namespace Xamarin.Forms.Platform.UWP
                        return properties.DateModified;
                }
 
-               public async Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access)
+               public async Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access)
                {
                        StorageFile file;
 
                        switch (mode)
                        {
-                               case Internals.FileMode.CreateNew:
+                               case FileMode.CreateNew:
                                        file = await _folder.CreateFileAsync(path, CreationCollisionOption.FailIfExists).AsTask().ConfigureAwait(false);
                                        break;
 
-                               case Internals.FileMode.Create:
-                               case Internals.FileMode.Truncate: // TODO See if ReplaceExisting already truncates
+                               case FileMode.Create:
+                               case FileMode.Truncate: // TODO See if ReplaceExisting already truncates
                                        file = await _folder.CreateFileAsync(path, CreationCollisionOption.ReplaceExisting).AsTask().ConfigureAwait(false);
                                        break;
 
-                               case Internals.FileMode.OpenOrCreate:
-                               case Internals.FileMode.Append:
+                               case FileMode.OpenOrCreate:
+                               case FileMode.Append:
                                        file = await _folder.CreateFileAsync(path, CreationCollisionOption.OpenIfExists).AsTask().ConfigureAwait(false);
                                        break;
 
-                               case Internals.FileMode.Open:
+                               case FileMode.Open:
                                        file = await _folder.GetFileAsync(path);
                                        break;
 
@@ -88,16 +88,16 @@ namespace Xamarin.Forms.Platform.UWP
 
                        switch (access)
                        {
-                               case Internals.FileAccess.Read:
+                               case FileAccess.Read:
                                        return await file.OpenStreamForReadAsync().ConfigureAwait(false);
-                               case Internals.FileAccess.Write:
+                               case FileAccess.Write:
                                        Stream stream = await file.OpenStreamForWriteAsync().ConfigureAwait(false);
-                                       if (mode == Internals.FileMode.Append)
+                                       if (mode == FileMode.Append)
                                                stream.Position = stream.Length;
 
                                        return stream;
 
-                               case Internals.FileAccess.ReadWrite:
+                               case FileAccess.ReadWrite:
                                        IRandomAccessStream randStream = await file.OpenAsync(FileAccessMode.ReadWrite).AsTask().ConfigureAwait(false);
                                        return randStream.AsStream();
 
@@ -106,7 +106,7 @@ namespace Xamarin.Forms.Platform.UWP
                        }
                }
 
-               public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access, Internals.FileShare share)
+               public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access, FileShare share)
                {
                        return OpenFileAsync(path, mode, access);
                }
index 3738284..22346c5 100644 (file)
@@ -11,8 +11,8 @@
     <AssemblyName>Xamarin.Forms.Platform.UAP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="FormsPivot.cs" />
     <Compile Include="AlignmentExtensions.cs" />
     <Compile Include="BrushHelpers.cs" />
     <Compile Include="FlowDirectionExtensions.cs" />
-    <Compile Include="FormsProgressBar.cs"/>
-    <Compile Include="FormsTextBox.cs"/>
+    <Compile Include="FormsProgressBar.cs" />
+    <Compile Include="FormsTextBox.cs" />
     <Compile Include="FormsComboBox.cs" />
     <Compile Include="HorizontalTextAlignmentConverter.cs" />
     <Compile Include="ITitleProvider.cs" />
     <Compile Include="IToolbarProvider.cs" />
     <Compile Include="NativeBindingExtensions.cs" />
-    <Compile Include="NativeEventWrapper.cs"/>
+    <Compile Include="NativeEventWrapper.cs" />
     <Compile Include="NativePropertyListener.cs" />
     <Compile Include="NativeViewWrapper.cs" />
     <Compile Include="NativeViewWrapperRenderer.cs" />
     <Compile Include="PlatformConfigurationExtensions.cs" />
     <Compile Include="PlatformEffect.cs" />
-    <Compile Include="UriImageSourceHandler.cs"/>
+    <Compile Include="UriImageSourceHandler.cs" />
     <Compile Include="ViewExtensions.cs" />
-    <Compile Include="LayoutExtensions.cs"/>
+    <Compile Include="LayoutExtensions.cs" />
     <Compile Include="Flags.cs" />
     <Compile Include="FormsPresenter.cs" />
     <Compile Include="FormsUWP.cs" />
     <Compile Include="PageExtensions.cs" />
     <Compile Include="PlatformUWP.cs" />
     <Compile Include="SearchBarRenderer.cs" />
-    <Compile Include="TextAlignmentToHorizontalAlignmentConverter.cs"/>
+    <Compile Include="TextAlignmentToHorizontalAlignmentConverter.cs" />
     <Compile Include="StepperControl.cs" />
     <Compile Include="TabbedPageRenderer.cs" />
     <Compile Include="ToolbarPlacementHelper.cs" />
     <Compile Include="ScrollViewRenderer.cs" />
     <Compile Include="SliderRenderer.cs" />
     <Compile Include="StepperRenderer.cs" />
-    <Compile Include="StreamImagesourceHandler.cs"/>
+    <Compile Include="StreamImagesourceHandler.cs" />
     <Compile Include="SwitchRenderer.cs" />
     <Compile Include="TableViewRenderer.cs" />
     <Compile Include="TaskExtensions.cs" />
     <Compile Include="WindowsIsolatedStorage.cs" />
     <Compile Include="WindowsSerializer.cs" />
     <Compile Include="WindowsTicker.cs" />
-      
-      
     <Compile Include="FormsCommandBar.cs" />
     <Compile Include="MasterDetailControl.cs" />
     <Compile Include="MasterDetailPageRenderer.cs" />
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.10240.0">
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="WindowsMobile, Version=10.0.16299.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Xamarin.Forms.Platform.UAP/project.json b/Xamarin.Forms.Platform.UAP/project.json
deleted file mode 100644 (file)
index c594939..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
index 13d64df..8a219ac 100644 (file)
@@ -333,16 +333,15 @@ namespace Xamarin.Forms
                                        return Task.FromResult(_isolatedStorageFile.GetLastWriteTime(path));
                                }
 
-                               public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access)
+                               public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access)
                                {
-                                       Stream stream = _isolatedStorageFile.OpenFile(path, (System.IO.FileMode)mode, (System.IO.FileAccess)access);
+                                       Stream stream = _isolatedStorageFile.OpenFile(path, mode, access);
                                        return Task.FromResult(stream);
                                }
 
-                               public Task<Stream> OpenFileAsync(string path, Internals.FileMode mode, Internals.FileAccess access, Internals.FileShare share)
+                               public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access, FileShare share)
                                {
-                                       Stream stream = _isolatedStorageFile.OpenFile(path, (System.IO.FileMode)mode, (System.IO.FileAccess)access,
-                                               (System.IO.FileShare)share);
+                                       Stream stream = _isolatedStorageFile.OpenFile(path, mode, access, share);
                                        return Task.FromResult(stream);
                                }
                        }
index 6ca776b..c96fab3 100644 (file)
@@ -1,32 +1,3 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("Xamarin.Forms.Platform")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Forms.Platform")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-[assembly: InternalsVisibleTo("Xamarin.Forms.Core")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Xamarin.Forms.Core")]
\ No newline at end of file
index 3198695..17d3b29 100644 (file)
@@ -1,59 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.Platform</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Platform</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>9af32e5a</NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Xamarin.Forms.Platform.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
index da99b19..d450511 100644 (file)
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.Forms.Xaml.Design</RootNamespace>
     <AssemblyName>Xamarin.Forms.Xaml.Design</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
index 9432557..a9f1d77 100644 (file)
@@ -7,10 +7,11 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Xamarin.Forms.Xaml.UnitTests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Xaml.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>0672;0219;0414</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Mono.Cecil">
-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks">
-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Xamarin.Forms.Core.UnitTests\BaseTestFixture.cs">
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <ItemGroup>
     <EmbeddedResource Include="Issues\Bz41296.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="AppResources\" />
-  </ItemGroup>
-</Project>
+  <ItemGroup />
+</Project>
\ No newline at end of file
index b1d2a5a..1953597 100644 (file)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
+        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
index 01fb832..f7936ac 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net451" />
+  <package id="Mono.Cecil" version="0.10.0-beta6" targetFramework="net47" />
   <package id="NUnit" version="2.6.4" targetFramework="net451" />
   <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net451" />
 </packages>
\ No newline at end of file
index ce9c7db..2095f0a 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -6,7 +6,8 @@
     <ProjectGuid>{928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Mono.Cecil">
+    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
       <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb">
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
       <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb">
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
       <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Rocks">
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
       <HintPath>..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Xamarin.Forms.Xaml.Xamlg\Mono.Options\Options.cs">
@@ -55,9 +56,7 @@
     <Compile Include="Xamlc.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="Mono.Options\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj">
       <Project>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</Project>
@@ -65,6 +64,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.Xamlc/app.config b/Xamarin.Forms.Xaml.Xamlc/app.config
new file mode 100644 (file)
index 0000000..245587d
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
index f37be68..44c9fe8 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net451" />
+  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net47" />
 </packages>
\ No newline at end of file
index 9b2ba4a..4485bd1 100644 (file)
@@ -9,7 +9,8 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
     <AssemblyName>xamlg</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj">
       <Project>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</Project>
       <Name>Xamarin.Forms.Build.Tasks</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.Xamlg/app.config b/Xamarin.Forms.Xaml.Xamlg/app.config
new file mode 100644 (file)
index 0000000..245587d
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
index eda1301..536735b 100644 (file)
@@ -261,7 +261,7 @@ namespace Xamarin.Forms.Xaml
                        bool throwOnError = false)
                {
                        var bindableFieldInfo =
-                               elementType.GetFields().FirstOrDefault(fi => fi.Name == localName + "Property" && fi.IsStatic && fi.IsPublic);
+                               elementType.GetFields(BindingFlags.Static | BindingFlags.Public|BindingFlags.FlattenHierarchy).FirstOrDefault(fi => fi.Name == localName + "Property");
 
                        Exception exception = null;
                        if (exception == null && bindableFieldInfo == null) {
index 7c40dec..28d7138 100644 (file)
@@ -1,27 +1,7 @@
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
-using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("Xamarin.Forms.Xaml")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCulture("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-//[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
 [assembly: InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Build.Tasks")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Xaml.Design")]
index 34c1b50..c453441 100644 (file)
@@ -1,84 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9DB2F292-8034-4E06-89AD-98BBDA4306B9}</ProjectGuid>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Xaml</AssemblyName>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="MarkupExtensions\TemplateBindingExtension.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="MarkupExpressionParser.cs" />
-    <Compile Include="ViewExtensions.cs" />
-    <Compile Include="XamlLoader.cs" />
-    <Compile Include="XamlNode.cs" />
-    <Compile Include="XamlServiceProvider.cs" />
-    <Compile Include="XmlnsHelper.cs" />
-    <Compile Include="IExpressionParser.cs" />
-    <Compile Include="MarkupExtensionParser.cs" />
-    <Compile Include="IDictionaryExtensions.cs" />
-    <Compile Include="MarkupExtensions\NullExtension.cs" />
-    <Compile Include="MarkupExtensions\ReferenceExtension.cs" />
-    <Compile Include="MarkupExtensions\StaticExtension.cs" />
-    <Compile Include="MarkupExtensions\TypeExtension.cs" />
-    <Compile Include="MarkupExtensions\ArrayExtension.cs" />
-    <Compile Include="XmlName.cs" />
-    <Compile Include="XamlNodeVisitor.cs" />
-    <Compile Include="NamescopingVisitor.cs" />
-    <Compile Include="CreateValuesVisitor.cs" />
-    <Compile Include="ApplyPropertiesVisitor.cs" />
-    <Compile Include="HydrationContext.cs" />
-    <Compile Include="RegisterXNamesVisitor.cs" />
-    <Compile Include="XamlParser.cs" />
-    <Compile Include="MarkupExtensions\BindingExtension.cs" />
-    <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
-    <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
-    <Compile Include="FillResourceDictionariesVisitor.cs" />
-    <Compile Include="ExpandMarkupsVisitor.cs" />
-    <Compile Include="XamlCompilationAttribute.cs" />
-    <Compile Include="TypeArgumentsParser.cs" />
-    <Compile Include="PruneIgnoredNodesVisitor.cs" />
-    <Compile Include="XamlFilePathAttribute.cs" />
-    <Compile Include="ResourcesLoader.cs" />
+    <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
       <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
       <Name>Xamarin.Forms.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
 </Project>
index 1e82937..34d4d60 100644 (file)
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+VisualStudioVersion = 15.0.27102.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms", "Xamarin.Forms", "{9AD757F5-E57A-459D-A0A7-E0675E045B84}"
 EndProject
@@ -27,11 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.UnitTest
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Xamlc", "Xamarin.Forms.Xaml.Xamlc\Xamarin.Forms.Xaml.Xamlc.csproj", "{928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{29583A59-ACE2-4C2C-8A73-768D6979551A}"
-       ProjectSection(SolutionItems) = preProject
-               .nuget\packages.config = .nuget\packages.config
-       EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12C50D-A570-4DF1-94E1-8599843FA87C}"
        ProjectSection(SolutionItems) = preProject
                .nuspec\Xamarin.Forms.AppLinks.nuspec = .nuspec\Xamarin.Forms.AppLinks.nuspec
@@ -46,17 +41,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12
                .nuspec\Xamarin.Forms.targets = .nuspec\Xamarin.Forms.targets
        EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core", "Xamarin.Forms.Core\Xamarin.Forms.Core.csproj", "{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Core", "Xamarin.Forms.Core\Xamarin.Forms.Core.csproj", "{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{9DB2F292-8034-4E06-89AD-98BBDA4306B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{9DB2F292-8034-4E06-89AD-98BBDA4306B9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Controls", "Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj", "{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Controls", "Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj", "{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Build.Tasks", "Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj", "{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps", "{132FB9A4-613F-44CE-95D5-758D32D231DD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj", "{7D13BAC2-C6A4-416A-B07E-C169B199E52B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj", "{7D13BAC2-C6A4-416A-B07E-C169B199E52B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.iOS", "Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.csproj", "{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}"
 EndProject
@@ -74,11 +69,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.iOS.UITe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Android.UITests", "Xamarin.Forms.Core.Android.UITests\Xamarin.Forms.Core.Android.UITests.csproj", "{A34EBE01-25BF-4E69-A2DC-2288DC625541}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.CustomAttributes", "Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj", "{4DCD0420-1168-4B77-86DB-6196EE4BD491}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.CustomAttributes", "Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj", "{4DCD0420-1168-4B77-86DB-6196EE4BD491}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.iOS", "Xamarin.Forms.ControlGallery.iOS\Xamarin.Forms.ControlGallery.iOS.csproj", "{C7131F14-274F-4B55-ACA9-E81731AD012F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform", "Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform", "Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forwarders", "Forwarders", "{5A2DADBC-9510-4DD1-BE58-01501F2DF65D}"
 EndProject
@@ -94,23 +89,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGaller
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.UAP", "Xamarin.Forms.Platform.UAP\Xamarin.Forms.Platform.UAP.csproj", "{00D8D049-FFAA-4759-8FC9-1ECA30777F72}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Design", "Xamarin.Forms.Xaml.Design\Xamarin.Forms.Xaml.Design.csproj", "{65BC4888-CC59-428A-9B75-540CF1C09480}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.Design", "Xamarin.Forms.Maps.Design\Xamarin.Forms.Maps.Design.csproj", "{C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Design", "Xamarin.Forms.Core.Design\Xamarin.Forms.Core.Design.csproj", "{98637471-8E5C-4DDE-89CA-2EAA664FB0EF}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.UWP", "Xamarin.Forms.Maps.UWP\Xamarin.Forms.Maps.UWP.csproj", "{04D89A60-78EF-4A32-AE17-87E47E0233A5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Windows.UITests", "Xamarin.Forms.Core.Windows.UITests\Xamarin.Forms.Core.Windows.UITests.csproj", "{0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages", "Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj", "{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Pages", "Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj", "{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages.UnitTests", "Xamarin.Forms.Pages.UnitTests\Xamarin.Forms.Pages.UnitTests.csproj", "{447DC60E-C485-4427-8CF7-50074C6B61DE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pages Gallery", "Pages Gallery", "{80BAC3FB-357A-4D05-A050-9F234DF49C97}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery", "PagesGallery\PagesGallery\PagesGallery.csproj", "{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PagesGallery", "PagesGallery\PagesGallery\PagesGallery.csproj", "{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.Droid", "PagesGallery\PagesGallery.Droid\PagesGallery.Droid.csproj", "{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}"
 EndProject
@@ -118,7 +107,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.UWP", "PagesGa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.AppLinks", "Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj", "{42DB052E-0909-45D2-8240-187F99F393FB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages.Azure", "Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj", "{C9696465-7657-4843-872E-3C01891C4A9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Pages.Azure", "Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj", "{C9696465-7657-4843-872E-3C01891C4A9B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.iOS", "PagesGallery\PagesGallery.iOS\PagesGallery.iOS.csproj", "{392156B2-760A-4EE3-A822-CABD3238A21D}"
 EndProject
@@ -128,7 +117,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EmbeddingTestBeds", "Embedd
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Embedding.Droid", "EmbeddingTestBeds\Embedding.Droid\Embedding.Droid.csproj", "{0C902203-D56E-4F7E-9CE6-E23C701B628D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Embedding.XF", "EmbeddingTestBeds\Embedding.XF\Embedding.XF.csproj", "{02EAC00F-0425-4959-AC64-E921627265CA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Embedding.XF", "EmbeddingTestBeds\Embedding.XF\Embedding.XF.csproj", "{02EAC00F-0425-4959-AC64-E921627265CA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.MacOS", "Xamarin.Forms.Platform.MacOS\Xamarin.Forms.Platform.MacOS.csproj", "{C0059C45-EA1E-42F3-8A0E-794BB547EC3C}"
 EndProject
@@ -1276,174 +1265,6 @@ Global
                {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x64.Build.0 = Release|x64
                {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x86.ActiveCfg = Release|Any CPU
                {00D8D049-FFAA-4759-8FC9-1ECA30777F72}.Release|x86.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|Templates.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|Templates.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|Any CPU.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|ARM.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|ARM.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|iPhone.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|Templates.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|Templates.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|x64.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|x64.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|x86.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.AppStore|x86.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|ARM.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|ARM.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhone.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Templates.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|Templates.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x64.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x64.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x86.ActiveCfg = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x86.Build.0 = Debug|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Any CPU.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|ARM.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|ARM.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhone.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhone.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Templates.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|Templates.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x64.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x64.Build.0 = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.ActiveCfg = Release|Any CPU
-               {65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|Templates.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|Templates.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|Any CPU.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|ARM.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|ARM.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|iPhone.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|Templates.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|Templates.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|x64.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|x64.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|x86.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.AppStore|x86.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|ARM.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|ARM.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhone.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Templates.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|Templates.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x64.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x64.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x86.ActiveCfg = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x86.Build.0 = Debug|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Any CPU.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|ARM.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|ARM.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhone.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhone.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Templates.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|Templates.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x64.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x64.Build.0 = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x86.ActiveCfg = Release|Any CPU
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Release|x86.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|Templates.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|Templates.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|Any CPU.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|ARM.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|ARM.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|iPhone.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|Templates.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|Templates.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|x64.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|x64.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|x86.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.AppStore|x86.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|ARM.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhone.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Templates.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|Templates.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x64.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x64.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x86.Build.0 = Debug|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Any CPU.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|ARM.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|ARM.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhone.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhone.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Templates.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|Templates.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x64.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x64.Build.0 = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x86.ActiveCfg = Release|Any CPU
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Release|x86.Build.0 = Release|Any CPU
                {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
                {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
                {04D89A60-78EF-4A32-AE17-87E47E0233A5}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
@@ -2561,9 +2382,6 @@ Global
                {0F0DB9CC-EA65-429C-9363-38624BF8F49C} = {B2927DF0-F98E-45C8-A917-27941B2B6838}
                {AC257966-9368-478A-9DF4-F0D28E320FE3} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
                {00D8D049-FFAA-4759-8FC9-1ECA30777F72} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
-               {65BC4888-CC59-428A-9B75-540CF1C09480} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
-               {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
-               {98637471-8E5C-4DDE-89CA-2EAA664FB0EF} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
                {04D89A60-78EF-4A32-AE17-87E47E0233A5} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
                {0A39A74B-6F7A-4D41-84F2-B0CCDCE899DF} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9}
                {D6133DBD-6C60-4BD5-BEA2-07E0A3927C31} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileAccess.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileAccess.xml
deleted file mode 100644 (file)
index 36ddf24..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<Type Name="FileAccess" FullName="Xamarin.Forms.Internals.FileAccess">
-  <TypeSignature Language="C#" Value="public enum FileAccess" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed FileAccess extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Forms.Core</AssemblyName>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <summary>For internal use by the Xamarin.Forms platform.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="Read">
-      <MemberSignature Language="C#" Value="Read" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileAccess Read = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileAccess</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ReadWrite">
-      <MemberSignature Language="C#" Value="ReadWrite" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileAccess ReadWrite = int32(3)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileAccess</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Write">
-      <MemberSignature Language="C#" Value="Write" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileAccess Write = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileAccess</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileMode.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileMode.xml
deleted file mode 100644 (file)
index 05451d6..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<Type Name="FileMode" FullName="Xamarin.Forms.Internals.FileMode">
-  <TypeSignature Language="C#" Value="public enum FileMode" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed FileMode extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Forms.Core</AssemblyName>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <summary>For internal use by the Xamarin.Forms platform.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="Append">
-      <MemberSignature Language="C#" Value="Append" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileMode Append = int32(6)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileMode</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Create">
-      <MemberSignature Language="C#" Value="Create" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileMode Create = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileMode</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateNew">
-      <MemberSignature Language="C#" Value="CreateNew" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileMode CreateNew = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileMode</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Open">
-      <MemberSignature Language="C#" Value="Open" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileMode Open = int32(3)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileMode</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="OpenOrCreate">
-      <MemberSignature Language="C#" Value="OpenOrCreate" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileMode OpenOrCreate = int32(4)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileMode</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Truncate">
-      <MemberSignature Language="C#" Value="Truncate" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileMode Truncate = int32(5)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileMode</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileShare.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms.Internals/FileShare.xml
deleted file mode 100644 (file)
index 3187fb3..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<Type Name="FileShare" FullName="Xamarin.Forms.Internals.FileShare">
-  <TypeSignature Language="C#" Value="public enum FileShare" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed FileShare extends System.Enum" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Forms.Core</AssemblyName>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName>
-    </Attribute>
-    <Attribute>
-      <AttributeName>System.Flags</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Docs>
-    <summary>For internal use by the Xamarin.Forms platform.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="Delete">
-      <MemberSignature Language="C#" Value="Delete" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileShare Delete = int32(4)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileShare</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Inheritable">
-      <MemberSignature Language="C#" Value="Inheritable" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileShare Inheritable = int32(16)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileShare</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="None">
-      <MemberSignature Language="C#" Value="None" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileShare None = int32(0)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileShare</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Read">
-      <MemberSignature Language="C#" Value="Read" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileShare Read = int32(1)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileShare</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="ReadWrite">
-      <MemberSignature Language="C#" Value="ReadWrite" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileShare ReadWrite = int32(3)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileShare</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="Write">
-      <MemberSignature Language="C#" Value="Write" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.Internals.FileShare Write = int32(2)" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>2.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Forms.Internals.FileShare</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
index ac1bf6b..fb3c1c9 100644 (file)
@@ -97,8 +97,8 @@
       </Docs>
     </Member>
     <Member MemberName="OpenFileAsync">
-      <MemberSignature Language="C#" Value="public System.Threading.Tasks.Task&lt;System.IO.Stream&gt; OpenFileAsync (string path, Xamarin.Forms.Internals.FileMode mode, Xamarin.Forms.Internals.FileAccess access);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Threading.Tasks.Task`1&lt;class System.IO.Stream&gt; OpenFileAsync(string path, valuetype Xamarin.Forms.Internals.FileMode mode, valuetype Xamarin.Forms.Internals.FileAccess access) cil managed" />
+      <MemberSignature Language="C#" Value="public System.Threading.Tasks.Task&lt;System.IO.Stream&gt; OpenFileAsync (string path, System.IO.FileMode mode, System.IO.FileAccess access);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Threading.Tasks.Task`1&lt;class System.IO.Stream&gt; OpenFileAsync(string path, valuetype System.IO.FileMode mode, valuetype System.IO.FileAccess access) cil managed" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>2.0.0.0</AssemblyVersion>
       </ReturnValue>
       <Parameters>
         <Parameter Name="path" Type="System.String" />
-        <Parameter Name="mode" Type="Xamarin.Forms.Internals.FileMode" />
-        <Parameter Name="access" Type="Xamarin.Forms.Internals.FileAccess" />
+        <Parameter Name="mode" Type="System.IO.FileMode" />
+        <Parameter Name="access" Type="System.IO.FileAccess" />
       </Parameters>
       <Docs>
-        <param name="path">For internal use by the Xamarin.Forms platform.</param>
-        <param name="mode">For internal use by the Xamarin.Forms platform.</param>
-        <param name="access">For internal use by the Xamarin.Forms platform.</param>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <param name="path">To be added.</param>
+        <param name="mode">To be added.</param>
+        <param name="access">To be added.</param>
+        <summary>To be added.</summary>
         <returns>To be added.</returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenFileAsync">
-      <MemberSignature Language="C#" Value="public System.Threading.Tasks.Task&lt;System.IO.Stream&gt; OpenFileAsync (string path, Xamarin.Forms.Internals.FileMode mode, Xamarin.Forms.Internals.FileAccess access, Xamarin.Forms.Internals.FileShare share);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Threading.Tasks.Task`1&lt;class System.IO.Stream&gt; OpenFileAsync(string path, valuetype Xamarin.Forms.Internals.FileMode mode, valuetype Xamarin.Forms.Internals.FileAccess access, valuetype Xamarin.Forms.Internals.FileShare share) cil managed" />
+      <MemberSignature Language="C#" Value="public System.Threading.Tasks.Task&lt;System.IO.Stream&gt; OpenFileAsync (string path, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class System.Threading.Tasks.Task`1&lt;class System.IO.Stream&gt; OpenFileAsync(string path, valuetype System.IO.FileMode mode, valuetype System.IO.FileAccess access, valuetype System.IO.FileShare share) cil managed" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>2.0.0.0</AssemblyVersion>
       </ReturnValue>
       <Parameters>
         <Parameter Name="path" Type="System.String" />
-        <Parameter Name="mode" Type="Xamarin.Forms.Internals.FileMode" />
-        <Parameter Name="access" Type="Xamarin.Forms.Internals.FileAccess" />
-        <Parameter Name="share" Type="Xamarin.Forms.Internals.FileShare" />
+        <Parameter Name="mode" Type="System.IO.FileMode" />
+        <Parameter Name="access" Type="System.IO.FileAccess" />
+        <Parameter Name="share" Type="System.IO.FileShare" />
       </Parameters>
       <Docs>
-        <param name="path">For internal use by the Xamarin.Forms platform.</param>
-        <param name="mode">For internal use by the Xamarin.Forms platform.</param>
-        <param name="access">For internal use by the Xamarin.Forms platform.</param>
-        <param name="share">For internal use by the Xamarin.Forms platform.</param>
-        <summary>For internal use by the Xamarin.Forms platform.</summary>
+        <param name="path">To be added.</param>
+        <param name="mode">To be added.</param>
+        <param name="access">To be added.</param>
+        <param name="share">To be added.</param>
+        <summary>To be added.</summary>
         <returns>To be added.</returns>
         <remarks>To be added.</remarks>
       </Docs>
index be386d9..65af90f 100644 (file)
@@ -9,13 +9,7 @@
           <AttributeName>System.Reflection.AssemblyCompany("Xamarin Inc.")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyConfiguration("")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyCopyright("Copyright © Xamarin Inc. 2013-2016")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyDescription("")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyCopyright("Copyright © Xamarin Inc. 2013-2017")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyFileVersion("2.0.0.0")</AttributeName>
@@ -24,9 +18,6 @@
           <AttributeName>System.Reflection.AssemblyProduct("Xamarin.Forms")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyTitle("Xamarin.Forms.Core")</AttributeName>
-        </Attribute>
-        <Attribute>
           <AttributeName>System.Reflection.AssemblyTrademark("")</AttributeName>
         </Attribute>
         <Attribute>
@@ -48,9 +39,6 @@
           <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Core.Android.UnitTests")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Core.WP8.UnitTests")</AttributeName>
-        </Attribute>
-        <Attribute>
           <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Xaml")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName>
+          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>Xamarin.Forms.Dependency(typeof(Xamarin.Forms.Xaml.ValueConverterProvider))</AttributeName>
       <Type Name="EvalRequested" Kind="Class" />
       <Type Name="EventArg`1" DisplayName="EventArg&lt;T&gt;" Kind="Class" />
       <Type Name="ExpressionSearch" Kind="Class" />
-      <Type Name="FileAccess" Kind="Enumeration" />
-      <Type Name="FileMode" Kind="Enumeration" />
-      <Type Name="FileShare" Kind="Enumeration" />
       <Type Name="IDataTemplate" Kind="Interface" />
       <Type Name="IDeserializer" Kind="Interface" />
       <Type Name="IDynamicResourceHandler" Kind="Interface" />
index d81d482..4ff2de9 100644 (file)
@@ -9,13 +9,7 @@
           <AttributeName>System.Reflection.AssemblyCompany("Xamarin Inc.")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyConfiguration("")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyCopyright("Copyright © Xamarin Inc. 2013-2016")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyDescription("")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyCopyright("Copyright © Xamarin Inc. 2013-2017")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyFileVersion("2.0.0.0")</AttributeName>
           <AttributeName>System.Reflection.AssemblyProduct("Xamarin.Forms")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyTitle("Xamarin.Forms.Maps")</AttributeName>
-        </Attribute>
-        <Attribute>
           <AttributeName>System.Reflection.AssemblyTrademark("")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Resources.NeutralResourcesLanguage("en")</AttributeName>
-        </Attribute>
-        <Attribute>
           <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName>
+          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName>
index 8e0b682..46475ef 100644 (file)
@@ -6,19 +6,16 @@
           <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.Default | System.Diagnostics.DebuggableAttribute+DebuggingModes.DisableOptimizations | System.Diagnostics.DebuggableAttribute+DebuggingModes.EnableEditAndContinue | System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyCompany("")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyCompany("Xamarin.Forms.Pages")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyConfiguration("")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyConfiguration("Debug")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyCopyright("Copyright ©  2016")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyDescription("")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyFileVersion("1.0.0.0")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyFileVersion("1.0.0.0")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyProduct("Xamarin.Forms.Pages")</AttributeName>
           <AttributeName>System.Reflection.AssemblyTitle("Xamarin.Forms.Pages")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyTrademark("")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Resources.NeutralResourcesLanguage("en")</AttributeName>
-        </Attribute>
-        <Attribute>
           <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName>
+          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>
index 5995254..15dd89b 100644 (file)
@@ -9,13 +9,7 @@
           <AttributeName>System.Reflection.AssemblyCompany("Xamarin Inc.")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyConfiguration("")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyCopyright("Copyright © Xamarin Inc. 2013-2016")</AttributeName>
-        </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyDescription("")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyCopyright("Copyright © Xamarin Inc. 2013-2017")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyFileVersion("2.0.0.0")</AttributeName>
@@ -24,9 +18,6 @@
           <AttributeName>System.Reflection.AssemblyProduct("Xamarin.Forms")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyTitle("Xamarin.Forms.Xaml")</AttributeName>
-        </Attribute>
-        <Attribute>
           <AttributeName>System.Reflection.AssemblyTrademark("")</AttributeName>
         </Attribute>
         <Attribute>
@@ -45,7 +36,7 @@
           <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName>
+          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>Xamarin.Forms.Dependency(typeof(Xamarin.Forms.Xaml.ResourcesLoader))</AttributeName>
index 2c40b57..91113d8 100644 (file)
@@ -2,7 +2,7 @@
 
   "sdk": {
 
-    "version": "2.0.0-preview3-006798"
+    "version": "2.0.3"
 
   }
 
index 33e93c2..9430dc0 100644 (file)
@@ -5,19 +5,19 @@ IF EXIST docs.xml (erase docs.xml)
 for /r docs %%i in (*.xml) do type %%i >> docs.xml
 
 echo "Updating Xamarin.Forms.Core"
-tools\mdoc\mdoc update --delete Xamarin.Forms.Core\bin\Debug\Xamarin.Forms.Core.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Core > nul
+tools\mdoc\mdoc update --delete Xamarin.Forms.Core\bin\Debug\netstandard2.0\Xamarin.Forms.Core.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Core > nul
 IF %ERRORLEVEL% NEQ 0 (goto fail)
 
 echo "Updating Xamarin.Forms.Xaml"
-tools\mdoc\mdoc update --delete Xamarin.Forms.Xaml\bin\Debug\Xamarin.Forms.Xaml.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Xaml > nul
+tools\mdoc\mdoc update --delete Xamarin.Forms.Xaml\bin\Debug\netstandard2.0\Xamarin.Forms.Xaml.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Xaml > nul
 IF %ERRORLEVEL% NEQ 0 (goto fail)
 
 echo "Updating Xamarin.Forms.Maps"
-tools\mdoc\mdoc update --delete Xamarin.Forms.Maps\bin\Debug\Xamarin.Forms.Maps.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Maps > nul
+tools\mdoc\mdoc update --delete Xamarin.Forms.Maps\bin\Debug\netstandard2.0\Xamarin.Forms.Maps.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Maps > nul
 IF %ERRORLEVEL% NEQ 0 (goto fail)
 
 echo "Updating Xamarin.Forms.Pages"
-tools\mdoc\mdoc update --delete Xamarin.Forms.Pages\bin\Debug\Xamarin.Forms.Pages.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Pages > nul
+tools\mdoc\mdoc update --delete Xamarin.Forms.Pages\bin\Debug\netstandard2.0\Xamarin.Forms.Pages.dll -L "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile259" --out docs\Xamarin.Forms.Pages > nul
 IF %ERRORLEVEL% NEQ 0 (goto fail)
 
 IF EXIST _docs.xml (erase _docs.xml)