fix: Build all projects in Uno E2E solution

intrinity · Apr 24, 2021 · b8a03f7 · b8a03f7
1 parent 9250845
commit b8a03f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs b/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs
@@ -40,7 +40,9 @@ sealed partial class App : PrismApplication
     {
         private static Window _window;
 
+#if HAS_UNO_WINUI || NETCOREAPP
         public static XamlRoot MainXamlRoot { get; private set; }
+#endif
 
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
@@ -145,7 +147,9 @@ protected override UIElement CreateShell()
             _window.Content = shell;
 #endif
 
+#if HAS_UNO_WINUI || NETCOREAPP
             MainXamlRoot = shell.XamlRoot;
+#endif
 
             return shell;
         }

diff --git a/e2e/Uno/HelloUnoWorld.Shared/Dialogs/CustomContentDialog.xaml.cs b/e2e/Uno/HelloUnoWorld.Shared/Dialogs/CustomContentDialog.xaml.cs
@@ -21,9 +21,11 @@ public CustomContentDialog()
         {
             InitializeComponent();
 
+#if HAS_UNO_WINUI || NETCOREAPP
             // This is needed to enable dialog to be created properly.
             // See: https://github.com/microsoft/microsoft-ui-xaml/issues/4251
             XamlRoot = App.MainXamlRoot;
+#endif
         }
 
         public IDialogResult Result { get ; set; }

diff --git a/e2e/Uno/HelloWorld.sln b/e2e/Uno/HelloWorld.sln
@@ -287,6 +287,7 @@ Global
 		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Debug|x64.ActiveCfg = Debug|iPhone
 		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Debug|x86.ActiveCfg = Debug|iPhone
 		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Release|Any CPU.Build.0 = Release|iPhone
 		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Release|ARM.ActiveCfg = Release|iPhone
 		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Release|arm64.ActiveCfg = Release|iPhoneSimulator
 		{6C074C4E-882D-4216-88ED-3A221F9099D4}.Release|iPhone.ActiveCfg = Release|iPhone
@@ -351,6 +352,7 @@ Global
 		{D5213866-A8FD-4843-8877-B2529A43A05E}.Debug|x86.Build.0 = Debug|x86
 		{D5213866-A8FD-4843-8877-B2529A43A05E}.Debug|x86.Deploy.0 = Debug|x86
 		{D5213866-A8FD-4843-8877-B2529A43A05E}.Release|Any CPU.ActiveCfg = Release|x86
+		{D5213866-A8FD-4843-8877-B2529A43A05E}.Release|Any CPU.Build.0 = Release|x86
 		{D5213866-A8FD-4843-8877-B2529A43A05E}.Release|ARM.ActiveCfg = Release|ARM
 		{D5213866-A8FD-4843-8877-B2529A43A05E}.Release|ARM.Build.0 = Release|ARM
 		{D5213866-A8FD-4843-8877-B2529A43A05E}.Release|ARM.Deploy.0 = Release|ARM
@@ -1008,6 +1010,7 @@ Global
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.AppStore|x86.ActiveCfg = Debug|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.AppStore|x86.Build.0 = Debug|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|Any CPU.Build.0 = Debug|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|ARM.ActiveCfg = Debug|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|arm64.ActiveCfg = Debug|arm64
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|arm64.Build.0 = Debug|arm64
@@ -1018,6 +1021,7 @@ Global
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|x86.ActiveCfg = Debug|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Debug|x86.Build.0 = Debug|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Release|Any CPU.ActiveCfg = Release|x86
+		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Release|Any CPU.Build.0 = Release|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Release|ARM.ActiveCfg = Release|x86
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Release|arm64.ActiveCfg = Release|arm64
 		{BFA744D6-BF5B-439E-9CBA-37D2267E798C}.Release|arm64.Build.0 = Release|arm64
@@ -1070,6 +1074,7 @@ Global
 		{19A48274-D9E3-4855-8900-C9C32198B509}.AppStore|x86.Build.0 = Debug|x86
 		{19A48274-D9E3-4855-8900-C9C32198B509}.AppStore|x86.Deploy.0 = Debug|x86
 		{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|Any CPU.Build.0 = Debug|x86
 		{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|ARM.ActiveCfg = Debug|x86
 		{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|arm64.ActiveCfg = Debug|arm64
 		{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|arm64.Build.0 = Debug|arm64
@@ -1207,6 +1212,7 @@ Global
 		{DB447F34-1D29-4C39-9388-62863932AD63}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
 		{DB447F34-1D29-4C39-9388-62863932AD63}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
 		{DB447F34-1D29-4C39-9388-62863932AD63}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{DB447F34-1D29-4C39-9388-62863932AD63}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
 		{DB447F34-1D29-4C39-9388-62863932AD63}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
 		{DB447F34-1D29-4C39-9388-62863932AD63}.Release|arm64.ActiveCfg = Release|iPhoneSimulator
 		{DB447F34-1D29-4C39-9388-62863932AD63}.Release|iPhone.ActiveCfg = Release|iPhone
@@ -1252,6 +1258,7 @@ Global
 		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
 		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
 		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
 		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
 		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Release|arm64.ActiveCfg = Release|iPhoneSimulator
 		{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator