Merge branch '4.0.0'

knasher · May 22, 2019 · f8fd281 · f8fd281
2 parents 48885e0 + c626a3f
commit f8fd281
Show file tree

Hide file tree

Showing 95 changed files with 339 additions and 1,308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,4 +65,5 @@ AndroidNative/gradlew.bat
 *.swp
 tools/
 !tools/mdoc/**/*
-caketools/
+caketools/
+*.binlog
diff --git a/.gitmodules b/.gitmodules
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,4 +5,15 @@
     <__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\net46\</__XFBuildTasksLocation>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
- </Project> 
+  <PropertyGroup>
+    <Company>Microsoft</Company>
+    <Product>Xamarin.Forms</Product>
+  </PropertyGroup>
+  <!-- This target is replaced by GitInfo when restored. Allows Version.targets to rely on it before restore. -->
+  <Target Name="GitVersion" />
+  <PropertyGroup Condition="'$(CI)' == ''">
+    <CI>false</CI>
+    <CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
+  </PropertyGroup>
+
+ </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="GitInfo" Version="2.0.20" PrivateAssets="All" />
+    <PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
+	</ItemGroup>
+
+  <Import Project="Version.targets" />
+ </Project>
diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
@@ -56,7 +56,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="SecondActivity.cs" />
   </ItemGroup>

diff --git a/EmbeddingTestBeds/Embedding.Droid/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.Droid/Properties/AssemblyInfo.cs
diff --git a/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj b/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
@@ -99,7 +99,6 @@
     <Compile Include="Page2.xaml.cs">
       <DependentUpon>Page2.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

diff --git a/EmbeddingTestBeds/Embedding.UWP/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.UWP/Properties/AssemblyInfo.cs
diff --git a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj
@@ -63,7 +63,6 @@
     <Compile Include="AppDelegate.cs" />
     <None Include="GettingStarted.Xamarin" />
     <None Include="Info.plist" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewController.cs" />
     <Compile Include="ViewController.designer.cs">
       <DependentUpon>ViewController.cs</DependentUpon>
@@ -99,10 +98,6 @@
       <IsAppExtension>false</IsAppExtension>
       <IsWatchApp>false</IsWatchApp>
     </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="..\Embedding.XF\Embedding.XF.csproj">
       <Project>{02eac00f-0425-4959-ac64-e921627265ca}</Project>
       <Name>Embedding.XF</Name>

diff --git a/EmbeddingTestBeds/Embedding.iOS/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.iOS/Properties/AssemblyInfo.cs
diff --git a/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs
@@ -1,34 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
+using Android.App;
 
-// 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.Droid")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("PagesGallery.Droid")]
-[assembly: AssemblyCopyright ("Copyright ©  2014")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-[assembly: ComVisible (false)]
-
-// 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")]
-
-// Add some common permissions, these can be removed if not needed
 [assembly: UsesPermission (Android.Manifest.Permission.Internet)]
 [assembly: UsesPermission (Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
@@ -100,7 +100,6 @@
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

diff --git a/PagesGallery/PagesGallery.UWP/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.UWP/Properties/AssemblyInfo.cs
diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
@@ -69,7 +69,6 @@
     <None Include="app.config" />
     <None Include="Entitlements.plist" />
     <None Include="Info.plist" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <ITunesArtwork Include="iTunesArtwork" />
     <ITunesArtwork Include="iTunesArtwork@2x" />
   </ItemGroup>

diff --git a/PagesGallery/PagesGallery.iOS/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.iOS/Properties/AssemblyInfo.cs
diff --git a/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
@@ -1,31 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Android.App;
 
-// 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.Android")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("Xamarin.Forms.Platform.Android")]
-[assembly: AssemblyCopyright ("Copyright ©  2015")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
 [assembly: InternalsVisibleTo ("Xamarin.Forms.Core")]
 [assembly: ComVisible (false)]
-
-// 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/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs
@@ -1,31 +1,7 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+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: AssemblyDescription ("")]
-[assembly: AssemblyCopyright ("Copyright ©  2018")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
 [assembly: InternalsVisibleTo ("Xamarin.Forms.Core")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible (false)]
-
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50757")]
-
-// 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: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50757")]
diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
@@ -2,36 +2,5 @@
 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.Platform.iOS")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("Xamarin.Forms.Platform.iOS")]
-[assembly: AssemblyCopyright ("Copyright ©  2015")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-[assembly: InternalsVisibleTo ("Xamarin.Forms.Core")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible (false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50756")]
-
-// 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: InternalsVisibleTo ("Xamarin.Forms.Core")]