Move XF.Build.Tasks to nestandard2.0 (#1370)

Remove net47 project of XF.Build.Tasks. Xamarin.Forms.nupkg provides
Xamarin.Forms.Build.Tasks.dll and dependencies built with netstandard2.0 only.

diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
index 0959b65..36d1bfd 100644 (file)
--- a/.nuspec/Xamarin.Forms.nuspec
+++ b/.nuspec/Xamarin.Forms.nuspec
@@ -54,44 +54,29 @@
     <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" />
 
-    <!--Xamlc common stuff-->
+    <!--Xamlc stuff-->
     <file src="Xamarin.Forms.targets" target="build\netstandard2.0\Xamarin.Forms$IdAppend$.targets" />
     <file src="Xamarin.Forms.props" target="build\netstandard2.0\Xamarin.Forms$IdAppend$.props" />
     <file src="Xamarin.Forms.DefaultItems.targets" target="build\netstandard2.0" />
     <file src="Xamarin.Forms.DefaultItems.props" target="build\netstandard2.0" />
-
-    <!--Xamlc net47 stuff-->
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="tasks\net47" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="tasks\net47" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="tasks\net47" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="tasks\net47" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="tasks\net47" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="tasks\net47" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="tasks\net47" />
-
-    <!--Xamlc netstandard2.0 stuff-->
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Build.Tasks.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Mono.Cecil.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Mono.Cecil.Mdb.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Mono.Cecil.Pdb.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\Mono.Cecil.Rocks.dll" target="tasks\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks.Core\bin\$Configuration$\netstandard2.0\System.CodeDom.dll" target="tasks\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Build.Tasks.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.Mdb.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.Pdb.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.Rocks.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\System.CodeDom.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.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\netstandard1.0\Design" />
-
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10\Design" />
     <file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10\Design" />
-
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\Xamarin.iOS10\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" />-->
 

diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets
index 3402ace..9655527 100644 (file)
--- a/.nuspec/Xamarin.Forms.targets
+++ b/.nuspec/Xamarin.Forms.targets
@@ -1,15 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-       <PropertyGroup>
-               <_XFBuildTasksTFM Condition="'$(MSBuildRuntimeType)' != 'Core'">net47</_XFBuildTasksTFM>
-               <_XFBuildTasksTFM Condition="'$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_XFBuildTasksTFM>
-               <XFBuildTasksDirectory Condition="'$(XFBuildTasksDirectory)' == ''">$(MSBuildThisFileDirectory)..\..\tasks\$(_XFBuildTasksTFM)\</XFBuildTasksDirectory>
-               <XFBuildTasksDirectory Condition="!Exists('$(XFBuildTasksDirectory)')">$(MSBuildThisFileDirectory)</XFBuildTasksDirectory>
-       </PropertyGroup>
-
-       <UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlGTask" AssemblyFile="$(XFBuildTasksDirectory)Xamarin.Forms.Build.Tasks.dll" />
-       <UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlCTask" AssemblyFile="$(XFBuildTasksDirectory)Xamarin.Forms.Build.Tasks.dll" />
-       <UsingTask TaskName="Xamarin.Forms.Build.Tasks.GetTasksAbi" AssemblyFile="$(XFBuildTasksDirectory)Xamarin.Forms.Build.Tasks.dll" />
+       <UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlGTask" AssemblyFile="$(MSBuildThisFileDirectory)Xamarin.Forms.Build.Tasks.dll" />
+       <UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlCTask" AssemblyFile="$(MSBuildThisFileDirectory)Xamarin.Forms.Build.Tasks.dll" />
+       <UsingTask TaskName="Xamarin.Forms.Build.Tasks.GetTasksAbi" AssemblyFile="$(MSBuildThisFileDirectory)Xamarin.Forms.Build.Tasks.dll" />
 
        <PropertyGroup>
                <EnableDefaultXamlItems Condition="'$(EnableDefaultXamlItems)'==''">True</EnableDefaultXamlItems>

diff --git a/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj b/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
index fb5dba8..9597e26 100644 (file)
--- a/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
+++ b/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
@@ -26,19 +26,9 @@
     </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>
-    </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.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
   </ItemGroup>
   <Import Project="..\..\.nuspec\Xamarin.Forms.targets" />
 </Project>
\ No newline at end of file

diff --git a/PagesGallery/PagesGallery/PagesGallery.csproj b/PagesGallery/PagesGallery/PagesGallery.csproj
index a61e285..6d5cda3 100644 (file)
--- a/PagesGallery/PagesGallery/PagesGallery.csproj
+++ b/PagesGallery/PagesGallery/PagesGallery.csproj
@@ -22,7 +22,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <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" />

diff --git a/Xamarin.Forms.Build.Tasks.Core/Xamarin.Forms.Build.Tasks.Core.csproj b/Xamarin.Forms.Build.Tasks.Core/Xamarin.Forms.Build.Tasks.Core.csproj
deleted file mode 100644 (file)
index 6ddb68c..0000000
--- a/Xamarin.Forms.Build.Tasks.Core/Xamarin.Forms.Build.Tasks.Core.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>Xamarin.Forms.Build.Tasks</AssemblyName>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
-    <PackageReference Include="System.CodeDom" Version="4.4.0" />
-    <PackageReference Include="Microsoft.Build" Version="15.3.409" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.3.409" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
-    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Xamarin.Forms.Build.Tasks\**\*.cs" Exclude="**\obj\**\*.cs" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file

diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
index 2317831..2d2065d 100644 (file)
--- a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
+++ b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
@@ -1,130 +1,31 @@
-<?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>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Forms.Build.Tasks</RootNamespace>
     <AssemblyName>Xamarin.Forms.Build.Tasks</AssemblyName>
-    <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>
-    <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>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="System.Xml" />
-    <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>
+    <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
+    <PackageReference Include="System.CodeDom" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Build" Version="15.3.409" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="15.3.409" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="XamlGTask.cs" />
-    <Compile Include="ILContext.cs" />
-    <Compile Include="CreateObjectVisitor.cs" />
-    <Compile Include="SetPropertiesVisitor.cs" />
-    <Compile Include="SetFieldVisitor.cs" />
-    <Compile Include="TypeReferenceExtensions.cs" />
-    <Compile Include="NodeILExtensions.cs" />
-    <Compile Include="ILProcessorExtensions.cs" />
-    <Compile Include="ExpandMarkupsVisitor.cs" />
-    <Compile Include="SetNamescopesAndRegisterNamesVisitor.cs" />
-    <Compile Include="MethodReferenceExtensions.cs" />
-    <Compile Include="XamlCTask.cs" />
-    <Compile Include="DebugXamlCTask.cs" />
-    <Compile Include="ILRootNode.cs" />
-    <Compile Include="XmlTypeExtensions.cs" />
-    <Compile Include="SetResourcesVisitor.cs" />
-    <Compile Include="TypeDefinitionExtensions.cs" />
-    <Compile Include="FieldReferenceExtensions.cs" />
-    <Compile Include="PropertyDefinitionExtensions.cs" />
-    <Compile Include="XamlCAssemblyResolver.cs" />
-    <Compile Include="MethodDefinitionExtensions.cs" />
-    <Compile Include="CompiledMarkupExtensions\StaticExtension.cs" />
-    <Compile Include="CompiledMarkupExtensions\ICompiledMarkupExtension.cs" />
-    <Compile Include="BindablePropertyReferenceExtensions.cs" />
-    <Compile Include="CompiledConverters\BindablePropertyConverter.cs" />
-    <Compile Include="CompiledConverters\BindingTypeConverter.cs" />
-    <Compile Include="CompiledConverters\BoundsTypeConverter.cs" />
-    <Compile Include="CompiledConverters\ColorTypeConverter.cs" />
-    <Compile Include="CompiledConverters\ICompiledTypeConverter.cs" />
-    <Compile Include="CompiledConverters\LayoutOptionsConverter.cs" />
-    <Compile Include="CompiledConverters\RectangleTypeConverter.cs" />
-    <Compile Include="Logger.cs" />
-    <Compile Include="XamlTask.cs" />
-    <Compile Include="CompiledMarkupExtensions\ArrayExtension.cs" />
-    <Compile Include="CompiledConverters\ConstraintTypeConverter.cs" />
-    <Compile Include="CompiledConverters\ThicknessTypeConverter.cs" />
-    <Compile Include="MethodBodyExtensions.cs" />
-    <Compile Include="CompiledConverters\TypeTypeConverter.cs" />
-    <Compile Include="CompiledValueProviders\SetterValueProvider.cs" />
-    <Compile Include="CompiledValueProviders\ICompiledValueProvider.cs" />
-    <Compile Include="CompiledValueProviders\PassthroughValueProvider.cs" />
-    <Compile Include="CompiledConverters\ListStringTypeConverter.cs" />
-    <Compile Include="CompiledMarkupExtensions\TypeExtension.cs" />
-    <Compile Include="CompiledMarkupExtensions\NullExtension.cs" />
-    <Compile Include="GetTasksAbi.cs" />
-    <Compile Include="CompiledConverters\UriTypeConverter.cs" />
-    <Compile Include="CompiledConverters\RDSourceTypeConverter.cs" />
-    <Compile Include="XamlGenerator.cs" />
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
+
+  <Target Name="_CopyToNuspecDir" AfterTargets="Build">
     <ItemGroup>
       <_CopyItems Include="$(TargetDir)*.dll" />
     </ItemGroup>
     <Copy SourceFiles="@(_CopyItems)" DestinationFolder="..\.nuspec\" ContinueOnError="true" Retries="0" />
   </Target>
-  <ItemGroup>
-    <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">
-      <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
+
 </Project>
\ No newline at end of file

diff --git a/Xamarin.Forms.Build.Tasks/packages.config b/Xamarin.Forms.Build.Tasks/packages.config
deleted file mode 100644 (file)
index 44c9fe8..0000000
--- a/Xamarin.Forms.Build.Tasks/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net47" />
-</packages>
\ No newline at end of file

diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
index 425d2ea..d5d2134 100644 (file)
--- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
+++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@@ -22,14 +22,13 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
-    <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>
   <Import Project="..\.nuspec\Xamarin.Forms.targets" />
-  
+
   <ItemGroup>
     <EmbeddedResource Include="GalleryPages\crimson.jpg" />
     <EmbeddedResource Update="GalleryPages\XamlPage.xaml">
@@ -74,7 +73,7 @@
       <Generator>MSBuild:UpdateDeisgnTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-  
+
   <Target Name="BeforeBuild">
     <CreateItem Include="blank.config">
       <Output TaskParameter="Include" ItemName="ConfigFile" />
@@ -83,5 +82,5 @@
   </Target>
 
   <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.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
index 89cdd83..9effc2a 100644 (file)
--- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
+++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@@ -1,63 +1,32 @@
-<?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>{4B14D295-C09B-4C38-B880-7CC768E50585}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <TargetFramework>net47</TargetFramework>
     <RootNamespace>Xamarin.Forms.Xaml.UnitTests</RootNamespace>
     <AssemblyName>Xamarin.Forms.Xaml.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RestorePackages>true</RestorePackages>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
-    <TargetFrameworkProfile />
-  </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>0672;0219;0414</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>
+    <EnableDefaultItems>False</EnableDefaultItems>
     <NoWarn>0672;0219;0414</NoWarn>
   </PropertyGroup>
+
   <ItemGroup>
-    <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>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <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>
+    <PackageReference Include="NUnit" Version="2.6.4" />
+    <PackageReference Include="NUnitTestAdapter" Version="2.1.1" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" />
+
   <ItemGroup>
     <Compile Include="..\Xamarin.Forms.Core.UnitTests\BaseTestFixture.cs">
       <Link>BaseTestFixture.cs</Link>
@@ -521,43 +490,7 @@
       <DependentUpon>Gh1346.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" />
-  <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.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>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
-      <Project>{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}</Project>
-      <Name>Xamarin.Forms.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
-      <Project>{7D13BAC2-C6A4-416A-B07E-C169B199E52B}</Project>
-      <Name>Xamarin.Forms.Maps</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <StandardHeader Text="" IncludeInNewFiles="True" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
+
   <ItemGroup>
     <EmbeddedResource Include="CustomXamlView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -969,33 +902,22 @@
     <EmbeddedResource Include="Issues\Gh1346.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Issues\Bz41296.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="PlatformSpecifics.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Issues\Bz43450.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="AutomationProperties.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
+
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+
+</Project>

diff --git a/Xamarin.Forms.Xaml.UnitTests/packages.config b/Xamarin.Forms.Xaml.UnitTests/packages.config
deleted file mode 100644 (file)
index db4b7d0..0000000
--- a/Xamarin.Forms.Xaml.UnitTests/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.Cecil" version="0.10.0-beta7" 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

diff --git a/Xamarin.Forms.Xaml.Xamlc/Xamarin.Forms.Xaml.Xamlc.csproj b/Xamarin.Forms.Xaml.Xamlc/Xamarin.Forms.Xaml.Xamlc.csproj
index 2095f0a..c76cc57 100644 (file)
--- a/Xamarin.Forms.Xaml.Xamlc/Xamarin.Forms.Xaml.Xamlc.csproj
+++ b/Xamarin.Forms.Xaml.Xamlc/Xamarin.Forms.Xaml.Xamlc.csproj
@@ -1,70 +1,21 @@
-<?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>{928A23F3-2330-4F9F-B6A3-BFE01FE2A2DF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-  </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>
-    <Externalconsole>true</Externalconsole>
-    <Commandlineparameters>-r "../../../Xamarin.Forms.Controls/bin/Debug/" -p "../../../Xamarin.Forms.Xaml.UnitTest/bin/Debug/;/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5;/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/Facades/" --keep -v 4 ../../../Xamarin.Forms.Xaml.UnitTests/bin/Debug/Xamarin.Forms.Xaml.UnitTests.dll</Commandlineparameters>
+    <TargetFramework>net47</TargetFramework>
     <AssemblyName>xamlc</AssemblyName>
-    <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>
-    <Externalconsole>true</Externalconsole>
-    <AssemblyName>xamlc</AssemblyName>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <ItemGroup>
-    <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, 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, 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, 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">
       <Link>Mono.Options\Options.cs</Link>
     </Compile>
-    <Compile Include="Xamlc.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <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>
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>

diff --git a/Xamarin.Forms.Xaml.Xamlc/app.config b/Xamarin.Forms.Xaml.Xamlc/app.config
deleted file mode 100644 (file)
index 245587d..0000000
--- a/Xamarin.Forms.Xaml.Xamlc/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>

diff --git a/Xamarin.Forms.Xaml.Xamlc/packages.config b/Xamarin.Forms.Xaml.Xamlc/packages.config
deleted file mode 100644 (file)
index 44c9fe8..0000000
--- a/Xamarin.Forms.Xaml.Xamlc/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net47" />
-</packages>
\ No newline at end of file

diff --git a/Xamarin.Forms.Xaml.Xamlg/Program.cs b/Xamarin.Forms.Xaml.Xamlg/Program.cs
deleted file mode 100644 (file)
index 2750854..0000000
--- a/Xamarin.Forms.Xaml.Xamlg/Program.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Program.cs
-//
-// Author:
-//       Stephane Delcroix <stephane@delcroix.org>
-//
-// Copyright (c) 2013 S. Delcroix
-//
-using System;
-
-namespace Xamarin.Forms.Xaml.Xamlg
-{
-       class MainClass
-       {
-               public static void Main (string[] args)
-               {
-                       Console.WriteLine ("Hello World!");
-               }
-       }
-}

diff --git a/Xamarin.Forms.Xaml.Xamlg/Properties/AssemblyInfo.cs b/Xamarin.Forms.Xaml.Xamlg/Properties/AssemblyInfo.cs
index 9070b66..b575191 100644 (file)
--- a/Xamarin.Forms.Xaml.Xamlg/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Xaml.Xamlg/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Reflection;
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.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)]

diff --git a/Xamarin.Forms.Xaml.Xamlg/Xamarin.Forms.Xaml.Xamlg.csproj b/Xamarin.Forms.Xaml.Xamlg/Xamarin.Forms.Xaml.Xamlg.csproj
index 4485bd1..2859f0a 100644 (file)
--- a/Xamarin.Forms.Xaml.Xamlg/Xamarin.Forms.Xaml.Xamlg.csproj
+++ b/Xamarin.Forms.Xaml.Xamlg/Xamarin.Forms.Xaml.Xamlg.csproj
@@ -1,62 +1,21 @@
-<?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>{D597E3C6-1A50-4042-99FA-3E7CE28E4819}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
+    <TargetFramework>net47</TargetFramework>
     <AssemblyName>xamlg</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-  </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>
-    <Externalconsole>true</Externalconsole>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0618</NoWarn>
+    <RootNamespace>Xamarin.Forms.Xaml</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Xamlg.cs" />
-    <Compile Include="Mono.Options\Options.cs" />
     <Compile Include="..\Xamarin.Forms.Xaml\XmlnsHelper.cs">
       <Link>XmlnsHelper.cs</Link>
     </Compile>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <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>
+    <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>

diff --git a/Xamarin.Forms.Xaml.Xamlg/app.config b/Xamarin.Forms.Xaml.Xamlg/app.config
deleted file mode 100644 (file)
index 245587d..0000000
--- a/Xamarin.Forms.Xaml.Xamlg/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>

diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index 0d243e4..ab6f642 100644 (file)
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.0
+VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms", "Xamarin.Forms", "{9AD757F5-E57A-459D-A0A7-E0675E045B84}"
 EndProject
@@ -46,8 +46,11 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{9DB2F292-8034-4E06-89AD-98BBDA4306B9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Controls", "Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj", "{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}
+       EndProjectSection
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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
@@ -100,6 +103,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pages Gallery", "Pages Gallery", "{80BAC3FB-357A-4D05-A050-9F234DF49C97}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PagesGallery", "PagesGallery\PagesGallery\PagesGallery.csproj", "{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}"
+       ProjectSection(ProjectDependencies) = postProject
+               {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}
+       EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.Droid", "PagesGallery\PagesGallery.Droid\PagesGallery.Droid.csproj", "{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}"
 EndProject
@@ -118,6 +124,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Embedding.Droid", "EmbeddingTestBeds\Embedding.Droid\Embedding.Droid.csproj", "{0C902203-D56E-4F7E-9CE6-E23C701B628D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Embedding.XF", "EmbeddingTestBeds\Embedding.XF\Embedding.XF.csproj", "{02EAC00F-0425-4959-AC64-E921627265CA}"
+       ProjectSection(ProjectDependencies) = postProject
+               {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}
+       EndProjectSection
 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
@@ -141,8 +150,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGaller
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.GTK", "Xamarin.Forms.Maps.GTK\Xamarin.Forms.Maps.GTK.csproj", "{A9772BB1-0E17-42F5-A6DB-60BFCCBFDB9D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Build.Tasks.Core", "Xamarin.Forms.Build.Tasks.Core\Xamarin.Forms.Build.Tasks.Core.csproj", "{367E2986-AA27-4FA6-AF3C-CAF98C99A839}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.WPF", "Xamarin.Forms.Platform.WPF\Xamarin.Forms.Platform.WPF.csproj", "{140BC260-8B15-4D3A-B1B0-DDD8072918CC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.WPF", "Xamarin.Forms.Maps.WPF\Xamarin.Forms.Maps.WPF.csproj", "{89B0DB73-A32E-447C-9390-A2A59D89B2E4}"
@@ -2586,62 +2593,6 @@ Global
                {A9772BB1-0E17-42F5-A6DB-60BFCCBFDB9D}.Release|x64.Build.0 = Release|Any CPU
                {A9772BB1-0E17-42F5-A6DB-60BFCCBFDB9D}.Release|x86.ActiveCfg = Release|Any CPU
                {A9772BB1-0E17-42F5-A6DB-60BFCCBFDB9D}.Release|x86.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|Templates.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|Templates.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|ARM.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|iPhone.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|Templates.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|Templates.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|x64.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|x64.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|x86.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.AppStore|x86.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|ARM.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|ARM.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|iPhone.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|Templates.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|Templates.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|x64.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|x64.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|x86.ActiveCfg = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Debug|x86.Build.0 = Debug|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|Any CPU.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|ARM.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|ARM.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|iPhone.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|iPhone.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|Templates.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|Templates.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|x64.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|x64.Build.0 = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|x86.ActiveCfg = Release|Any CPU
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839}.Release|x86.Build.0 = Release|Any CPU
                {140BC260-8B15-4D3A-B1B0-DDD8072918CC}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
                {140BC260-8B15-4D3A-B1B0-DDD8072918CC}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
                {140BC260-8B15-4D3A-B1B0-DDD8072918CC}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
@@ -2911,7 +2862,6 @@ Global
                {83790029-272E-45AF-A41D-E7716684E5B8} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
                {03A51E5B-0A1E-41F0-AAE3-4B19406F7340} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
                {A9772BB1-0E17-42F5-A6DB-60BFCCBFDB9D} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
-               {367E2986-AA27-4FA6-AF3C-CAF98C99A839} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
                {140BC260-8B15-4D3A-B1B0-DDD8072918CC} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
                {89B0DB73-A32E-447C-9390-A2A59D89B2E4} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
                {411B960D-6D30-4079-83B2-ABB9987D2EDF} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}