From 6fb9077213f1075692c63b0070235e3b452a28ed Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 19 Mar 2024 12:41:39 +0200 Subject: [PATCH] Update the Multi-Project styles (#21282) * Update the Multi-Project styles * Convert to a solution template * Update TemplateTests.cs --- .../.template.config/template.json | 2 +- .../templates/maui-multiproject/MauiApp.1.sln | 148 ++++++++++++++++++ .../maui-multiproject/MauiApp.1/AppShell.xaml | 2 +- .../Resources/Fonts/OpenSans-Regular.ttf | Bin 107124 -> 96932 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 111012 -> 100820 bytes .../MauiApp.1/Resources/Raw/AboutAssets.txt | 2 +- .../MauiApp.1/Resources/Styles/Colors.xaml | 23 ++- .../MauiApp.1/Resources/Styles/Styles.xaml | 38 +++-- .../TemplateTests.cs | 18 +-- 9 files changed, 193 insertions(+), 40 deletions(-) create mode 100644 src/Templates/src/templates/maui-multiproject/MauiApp.1.sln diff --git a/src/Templates/src/templates/maui-multiproject/.template.config/template.json b/src/Templates/src/templates/maui-multiproject/.template.config/template.json index e7e4afe62b16..cb94e59af8ed 100644 --- a/src/Templates/src/templates/maui-multiproject/.template.config/template.json +++ b/src/Templates/src/templates/maui-multiproject/.template.config/template.json @@ -10,7 +10,7 @@ "shortName": "maui-multiproject", "tags": { "language": "C#", - "type": "project" + "type": "solution" }, "sourceName": "MauiApp.1", "primaryOutputs": [ diff --git a/src/Templates/src/templates/maui-multiproject/MauiApp.1.sln b/src/Templates/src/templates/maui-multiproject/MauiApp.1.sln new file mode 100644 index 000000000000..ab345f853c2f --- /dev/null +++ b/src/Templates/src/templates/maui-multiproject/MauiApp.1.sln @@ -0,0 +1,148 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp.1.WinUI", "MauiApp.1.WinUI\MauiApp.1.WinUI.csproj", "{1AA5F22B-62F8-414F-AE50-635E99EB3F76}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp.1.Mac", "MauiApp.1.Mac\MauiApp.1.Mac.csproj", "{C2800ABA-8C19-4553-A552-BFF679BEB039}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp.1.iOS", "MauiApp.1.iOS\MauiApp.1.iOS.csproj", "{7C064C71-30BE-4D8D-9B68-E7249ED18FA1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp.1.Droid", "MauiApp.1.Droid\MauiApp.1.Droid.csproj", "{9E30318E-74DD-491B-9BAF-814DC9E892B8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp.1", "MauiApp.1\MauiApp.1.csproj", "{E3338D37-FF50-4A34-96BD-2716ED93F1E2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|Any CPU.ActiveCfg = Debug|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|Any CPU.Build.0 = Debug|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|Any CPU.Deploy.0 = Debug|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|ARM64.Build.0 = Debug|ARM64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|x64.ActiveCfg = Debug|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|x64.Build.0 = Debug|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|x64.Deploy.0 = Debug|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|x86.ActiveCfg = Debug|x86 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|x86.Build.0 = Debug|x86 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Debug|x86.Deploy.0 = Debug|x86 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|Any CPU.ActiveCfg = Release|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|Any CPU.Build.0 = Release|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|Any CPU.Deploy.0 = Release|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|ARM64.ActiveCfg = Release|ARM64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|ARM64.Build.0 = Release|ARM64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|ARM64.Deploy.0 = Release|ARM64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|x64.ActiveCfg = Release|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|x64.Build.0 = Release|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|x64.Deploy.0 = Release|x64 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|x86.ActiveCfg = Release|x86 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|x86.Build.0 = Release|x86 + {1AA5F22B-62F8-414F-AE50-635E99EB3F76}.Release|x86.Deploy.0 = Release|x86 + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|ARM64.Build.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|x64.ActiveCfg = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|x64.Build.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|x64.Deploy.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|x86.ActiveCfg = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|x86.Build.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Debug|x86.Deploy.0 = Debug|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|Any CPU.Build.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|Any CPU.Deploy.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|ARM64.ActiveCfg = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|ARM64.Build.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|ARM64.Deploy.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|x64.ActiveCfg = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|x64.Build.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|x64.Deploy.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|x86.ActiveCfg = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|x86.Build.0 = Release|Any CPU + {C2800ABA-8C19-4553-A552-BFF679BEB039}.Release|x86.Deploy.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|ARM64.Build.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|x64.ActiveCfg = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|x64.Build.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|x64.Deploy.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|x86.Build.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Debug|x86.Deploy.0 = Debug|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|Any CPU.Build.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|ARM64.ActiveCfg = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|ARM64.Build.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|ARM64.Deploy.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|x64.ActiveCfg = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|x64.Build.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|x64.Deploy.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|x86.ActiveCfg = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|x86.Build.0 = Release|Any CPU + {7C064C71-30BE-4D8D-9B68-E7249ED18FA1}.Release|x86.Deploy.0 = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|ARM64.Build.0 = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|x64.ActiveCfg = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|x64.Build.0 = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Debug|x86.Build.0 = Debug|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|Any CPU.Build.0 = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|ARM64.ActiveCfg = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|ARM64.Build.0 = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|x64.ActiveCfg = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|x64.Build.0 = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|x86.ActiveCfg = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|x86.Build.0 = Release|Any CPU + {E3338D37-FF50-4A34-96BD-2716ED93F1E2}.Release|x86.Deploy.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|ARM64.Build.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|x64.ActiveCfg = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|x64.Build.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|x64.Deploy.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|x86.ActiveCfg = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|x86.Build.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Debug|x86.Deploy.0 = Debug|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|Any CPU.Build.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|Any CPU.Deploy.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|ARM64.ActiveCfg = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|ARM64.Build.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|ARM64.Deploy.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|x64.ActiveCfg = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|x64.Build.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|x64.Deploy.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|x86.ActiveCfg = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|x86.Build.0 = Release|Any CPU + {9E30318E-74DD-491B-9BAF-814DC9E892B8}.Release|x86.Deploy.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {20E6FD03-9002-4EBA-ABF2-9DDE2C488842} + EndGlobalSection +EndGlobal diff --git a/src/Templates/src/templates/maui-multiproject/MauiApp.1/AppShell.xaml b/src/Templates/src/templates/maui-multiproject/MauiApp.1/AppShell.xaml index 0708e98af216..51dcd1cc35fe 100644 --- a/src/Templates/src/templates/maui-multiproject/MauiApp.1/AppShell.xaml +++ b/src/Templates/src/templates/maui-multiproject/MauiApp.1/AppShell.xaml @@ -1,4 +1,4 @@ - + A!} zogQ!2+yUfoVPIf-=O3(Zw9stcNd`uD2cUdHa&BV5y4_!Y1NjRW7??Yf%SsgZeI=GK zFb2N>$}dVQNYAZH+$PAt=&ixPz`i9tvADi~L6kumXkZFZfk1jrWm<{FOm7ATMi~Z1 z{Vf@(i78CGk_#9ZEj)noW*I;M-ZPxVKnrAme3gvcl8P6mHg|#Y4Gau?vvTs26E#Kd zd}LrW_yDvZEH|;DfYq6a3&_6!RIiYin420ssX?BBF{B6Rz)J=BQpF|pJ2>+h7$XuG n8047?ic$-lw@(AQIOtBZ2IF=OMn(&B7J1vPwcArH7z3ODXjD_d delta 10582 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 E0C_ATNB{r; diff --git a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Fonts/OpenSans-Semibold.ttf b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Fonts/OpenSans-Semibold.ttf index b5b8e0f3898581930b706e73714072507e63792c..54e7059cf36359cb5a3860085714a95306af0dea 100644 GIT binary patch delta 309 zcmZ4TnC;4Bwt5Ce1_lN}Ai=^Q;O^q;#$Cg6g@Lhc2~bqeJ-|PhL6U(7$iD*Q3%Cb| zIz8U3xdX_5!oa}v&Ocb+Xc61=zYL6F4nX;Yf4aRG7?bA!9r&#vU#hsIeg|hh17rFW p1_pWNf}+%diZ!$I7#I`pG;1(!*I;C{aAWC+zmu^&#htOi2>|k5SPcLG delta 10582 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 J7{HtX{s$rR9-#mL diff --git a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Raw/AboutAssets.txt b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Raw/AboutAssets.txt index 15d6244845fb..89dc758d6e0d 100644 --- a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Raw/AboutAssets.txt +++ b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Raw/AboutAssets.txt @@ -4,7 +4,7 @@ is automatically handled by the following `MauiAsset` Build Action within your ` -These files will be deployed with you package and will be accessible using Essentials: +These files will be deployed with your package and will be accessible using Essentials: async Task LoadMauiAsset() { diff --git a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Colors.xaml b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Colors.xaml index 1bde6dd18e42..30307a5ddc3b 100644 --- a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Colors.xaml +++ b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Colors.xaml @@ -7,10 +7,18 @@ #512BD4 + #ac99ea + #242424 #DFD8F7 + #9880e5 #2B0B98 + White Black + #D600AA + #190649 + #1f1f1f + #E1E1E1 #C8C8C8 #ACACAC @@ -19,11 +27,13 @@ #404040 #212121 #141414 + + @@ -32,15 +42,4 @@ - - #F7B548 - #FFD590 - #FFE5B9 - #28C2D1 - #7BDDEF - #C3F2F4 - #3E8EED - #72ACF1 - #A7CBF6 - - + \ No newline at end of file diff --git a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Styles.xaml b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Styles.xaml index 890ced076df8..e0d36bb7ffe9 100644 --- a/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Styles.xaml +++ b/src/Templates/src/templates/maui-multiproject/MauiApp.1/Resources/Styles/Styles.xaml @@ -24,8 +24,8 @@ + + + + + + diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs index 289f5eab2d7c..1d5c1cdaa328 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs @@ -60,22 +60,10 @@ public void BuildMultiProject(string config) Assert.IsTrue(DotnetInternal.New("maui-multiproject", projectDir, DotNetCurrent), $"Unable to create template maui-multiproject. Check test output for errors."); - Assert.IsTrue(DotnetInternal.New("sln", projectDir), - $"Unable to create solution. Check test output for errors."); - - Assert.IsTrue(DotnetInternal.Run("sln", $"{solutionFile} add {projectDir}/{name}.Droid/{name}.Droid.csproj"), - $"Unable to add Android project to solution. Check test output for errors."); - Assert.IsTrue(DotnetInternal.Run("sln", $"{solutionFile} add {projectDir}/{name}.iOS/{name}.iOS.csproj"), - $"Unable to add iOS project to solution. Check test output for errors."); - Assert.IsTrue(DotnetInternal.Run("sln", $"{solutionFile} add {projectDir}/{name}.Mac/{name}.Mac.csproj"), - $"Unable to add Mac Catalyst project to solution. Check test output for errors."); - - if (TestEnvironment.IsWindows) + if (!TestEnvironment.IsWindows) { - // TODO: Enable the Windows build since it refuses to build on CI - // https://github.com/dotnet/maui/issues/20598 - // Assert.IsTrue(DotnetInternal.Run("sln", $"{solutionFile} add {projectDir}/{name}.WinUI/{name}.WinUI.csproj"), - // $"Unable to add WinUI project to solution. Check test output for errors."); + Assert.IsTrue(DotnetInternal.Run("sln", $"{solutionFile} remove {projectDir}/{name}.WinUI/{name}.WinUI.csproj"), + $"Unable to remove WinUI project from solution. Check test output for errors."); } Assert.IsTrue(DotnetInternal.Build(solutionFile, config, properties: BuildProps, msbuildWarningsAsErrors: true),