Merge branch 'main' into issue-7671

xamarin · Oct 15, 2020 · a6b4020 · a6b4020
2 parents 91cd56d + a09b7d8
commit a6b4020
Show file tree

Hide file tree

Showing 3,473 changed files with 109,898 additions and 69,969 deletions.
diff --git a/.Xamarin.Forms.Android.nuget.sln b/.Xamarin.Forms.Android.nuget.sln
diff --git a/.Xamarin.Forms.Android.slnf b/.Xamarin.Forms.Android.slnf
@@ -2,7 +2,6 @@
   "solution": {
     "path": "Xamarin.Forms.sln",
     "projects": [
-      "EmbeddingTestBeds\\Embedding.Droid\\Embedding.Droid.csproj",
       "PagesGallery\\PagesGallery.Droid\\PagesGallery.Droid.csproj",
       "PagesGallery\\PagesGallery\\PagesGallery.csproj",
       "Stubs\\Xamarin.Forms.Platform.Android\\Xamarin.Forms.Platform.Android (Forwarders).csproj",
@@ -22,14 +21,12 @@
       "Xamarin.Forms.Maps\\Xamarin.Forms.Maps.csproj",
       "Xamarin.Forms.Material.Android\\Xamarin.Forms.Material.Android.csproj",
       "Xamarin.Forms.Pages.Azure\\Xamarin.Forms.Pages.Azure.csproj",
-      "Xamarin.Forms.Pages.UnitTests\\Xamarin.Forms.Pages.UnitTests.csproj",
       "Xamarin.Forms.Pages\\Xamarin.Forms.Pages.csproj",
       "Xamarin.Forms.Platform.Android.AppLinks\\Xamarin.Forms.Platform.Android.AppLinks.csproj",
       "Xamarin.Forms.Platform.Android.FormsViewGroup\\Xamarin.Forms.Platform.Android.FormsViewGroup.csproj",
+      "Xamarin.Forms.Platform.Android.UnitTests\\Xamarin.Forms.Platform.Android.UnitTests.csproj",
       "Xamarin.Forms.Platform.Android\\Xamarin.Forms.Platform.Android.csproj",
       "Xamarin.Forms.Platform\\Xamarin.Forms.Platform.csproj",
-      "Xamarin.Forms.Sandbox.Android\\Xamarin.Forms.Sandbox.Android.csproj",
-      "Xamarin.Forms.Sandbox\\Xamarin.Forms.Sandbox.csproj",
       "Xamarin.Forms.Xaml.Design\\Xamarin.Forms.Xaml.Design.csproj",
       "Xamarin.Forms.Xaml.UnitTests\\Xamarin.Forms.Xaml.UnitTests.csproj",
       "Xamarin.Forms.Xaml\\Xamarin.Forms.Xaml.csproj"

diff --git a/.Xamarin.Forms.UAP.nuget.sln b/.Xamarin.Forms.UAP.nuget.sln
diff --git a/.Xamarin.Forms.iOS.nuget.sln b/.Xamarin.Forms.iOS.nuget.sln
diff --git a/.Xamarin.forms.nuget.sln b/.Xamarin.forms.nuget.sln
diff --git a/.Xamarin.forms.nuget.slnf b/.Xamarin.forms.nuget.slnf
diff --git a/.create-nuget.bat b/.create-nuget.bat
diff --git a/.create-stubs.bat b/.create-stubs.bat
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,7 @@ root = true
 # A newline ending every file
 # Use 4 spaces as indentation
 [*]
-insert_final_newline = false
+# insert_final_newline = false
 indent_style = space
 indent_size = 4