Fix toggle for including sample content in template (#25549)
### Description of Change This fixes the toggle for including sample content in the template. In #25419 some last-minute changes were made to not make the sample content show up by default, but that introduced a bug where you couldn't get the sample content to show up at all using Visual Studio. With this change the sample content can optionally be included again in Visual Studio by using the checkbox and through the CLI by specifying either `--sample-content` or `-sc`. Also the not used `Empty` switch was removed as well as the `SampleContent` variable which did not serve any additional purpose.
This commit is contained in:
Коммит
ad6f752f70
|
@ -4,11 +4,10 @@
|
|||
"Framework": {
|
||||
"longName": "framework"
|
||||
},
|
||||
"Empty": {
|
||||
"longName": "empty"
|
||||
},
|
||||
"IncludeSampleContent": {
|
||||
"isHidden": true
|
||||
|
||||
"longName": "sample-content",
|
||||
"shortName": "sc"
|
||||
},
|
||||
"skipRestore": {
|
||||
"longName": "no-restore",
|
||||
|
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -10,6 +10,5 @@
|
|||
"symbols/Framework/choices/DOTNET_TFM_VALUE/description": "Target DOTNET_TFM_VALUE",
|
||||
"symbols/IncludeSampleContent/displayName": "_Include sample content",
|
||||
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns.",
|
||||
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
|
||||
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create."
|
||||
}
|
|
@ -58,7 +58,7 @@
|
|||
"copyOnly": [ "**/*.svg", "**/*.ttf" ],
|
||||
"modifiers": [
|
||||
{
|
||||
"condition": "(!SampleContent)",
|
||||
"condition": "(!IncludeSampleContent)",
|
||||
"exclude": [
|
||||
"Data/**",
|
||||
"GlobalUsings.cs",
|
||||
|
@ -75,7 +75,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"condition": "(SampleContent)",
|
||||
"condition": "(IncludeSampleContent)",
|
||||
"exclude": [
|
||||
"MainPage.xaml",
|
||||
"MainPage.xaml.cs"
|
||||
|
@ -180,16 +180,6 @@
|
|||
"defaultValue": "false",
|
||||
"displayName": "_Include sample content",
|
||||
"description": "Configures whether to add sample pages and functionality to demonstrate basic usage patterns."
|
||||
},
|
||||
"Empty": {
|
||||
"type": "parameter",
|
||||
"datatype": "bool",
|
||||
"defaultValue": "true",
|
||||
"description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns."
|
||||
},
|
||||
"SampleContent": {
|
||||
"type": "computed",
|
||||
"value": "((IncludeSampleContent && (HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")))"
|
||||
},
|
||||
"skipRestore": {
|
||||
"type": "parameter",
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
|
||||
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<ResourceDictionary Source="Resources/Styles/AppStyles.xaml" />
|
||||
<!--#endif -->
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
|
|
@ -3,23 +3,23 @@
|
|||
x:Class="MauiApp._1.AppShell"
|
||||
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
xmlns:sf="clr-namespace:Syncfusion.Maui.Toolkit.SegmentedControl;assembly=Syncfusion.Maui.Toolkit"
|
||||
xmlns:pages="clr-namespace:MauiApp._1.Pages"
|
||||
<!--#endif -->
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
xmlns:local="clr-namespace:MauiApp._1"
|
||||
<!--#endif -->
|
||||
Shell.FlyoutBehavior="Flyout"
|
||||
Title="MauiApp._1">
|
||||
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<ShellContent
|
||||
Title="Home"
|
||||
ContentTemplate="{DataTemplate local:MainPage}"
|
||||
Route="MainPage" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<ShellContent
|
||||
Title="Dashboard"
|
||||
Icon="{StaticResource IconDashboard}"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
using CommunityToolkit.Maui.Alerts;
|
||||
using CommunityToolkit.Maui.Core;
|
||||
using Font = Microsoft.Maui.Font;
|
||||
|
@ -10,12 +10,12 @@ public partial class AppShell : Shell
|
|||
public AppShell()
|
||||
{
|
||||
InitializeComponent();
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
var currentTheme = Application.Current!.UserAppTheme;
|
||||
ThemeSegmentedControl.SelectedIndex = currentTheme == AppTheme.Light ? 0 : 1;
|
||||
#endif
|
||||
}
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
public static async Task DisplaySnackbarAsync(string message)
|
||||
{
|
||||
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<SingleProject>true</SingleProject>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<!-- https://github.com/CommunityToolkit/Maui/issues/2205 -->
|
||||
<NoWarn>XC0103</NoWarn>
|
||||
<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
|
||||
|
@ -69,7 +69,7 @@
|
|||
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_LOG_DEBUG_VERSION" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
|
||||
<PackageReference Include="CommunityToolkit.Maui" Version="9.1.0" />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
using CommunityToolkit.Maui;
|
||||
#endif
|
||||
using Microsoft.Extensions.Logging;
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
using Syncfusion.Maui.Toolkit.Hosting;
|
||||
#endif
|
||||
|
||||
|
@ -15,7 +15,7 @@ public static class MauiProgram
|
|||
var builder = MauiApp.CreateBuilder();
|
||||
builder
|
||||
.UseMauiApp<App>()
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
.UseMauiCommunityToolkit()
|
||||
.ConfigureSyncfusionToolkit()
|
||||
.ConfigureMauiHandlers(handlers =>
|
||||
|
@ -29,7 +29,7 @@ public static class MauiProgram
|
|||
{
|
||||
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
|
||||
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
fonts.AddFont("SegoeUI-Semibold.ttf", "SegoeSemibold");
|
||||
fonts.AddFont("FluentSystemIcons-Regular.ttf", FluentUI.FontFamily);
|
||||
#endif
|
||||
|
@ -39,14 +39,14 @@ public static class MauiProgram
|
|||
#if DEBUG
|
||||
builder.Logging.AddDebug();
|
||||
//+:cnd:noEmit
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
builder.Services.AddLogging(configure => configure.AddDebug());
|
||||
#endif
|
||||
//-:cnd:noEmit
|
||||
#endif
|
||||
//+:cnd:noEmit
|
||||
|
||||
#if (SampleContent)
|
||||
#if (IncludeSampleContent)
|
||||
builder.Services.AddSingleton<ProjectRepository>();
|
||||
builder.Services.AddSingleton<TaskRepository>();
|
||||
builder.Services.AddSingleton<CategoryRepository>();
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<Color x:Key="SecondaryDarkText">#9880e5</Color>
|
||||
<Color x:Key="Tertiary">#2B0B98</Color>
|
||||
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Color x:Key="DarkBackground">#17171a</Color>
|
||||
<Color x:Key="LightOnDarkBackground">#C3C3C3</Color>
|
||||
<Color x:Key="LightBackground">#F2F2F2</Color>
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
<?xaml-comp compile="true" ?>
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:shimmer="clr-namespace:Syncfusion.Maui.Toolkit.Shimmer;assembly=Syncfusion.Maui.Toolkit">
|
||||
<!--#endif -->
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
|
||||
<!--#endif -->
|
||||
|
||||
|
@ -30,19 +30,19 @@
|
|||
</Style>
|
||||
|
||||
<Style TargetType="Button">
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}" />
|
||||
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
|
||||
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Primary}}" />
|
||||
<!--#endif -->
|
||||
<Setter Property="FontFamily" Value="OpenSansRegular"/>
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="FontSize" Value="14"/>
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="FontSize" Value="18"/>
|
||||
<!--#endif -->
|
||||
<Setter Property="BorderWidth" Value="0"/>
|
||||
|
@ -128,18 +128,18 @@
|
|||
</Style>
|
||||
|
||||
<Style TargetType="Entry">
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkOnLightBackground}, Dark={StaticResource LightOnDarkBackground}}" />
|
||||
<!--#endif -->
|
||||
<Setter Property="BackgroundColor" Value="Transparent" />
|
||||
<Setter Property="FontFamily" Value="OpenSansRegular"/>
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="FontSize" Value="14" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="FontSize" Value="{OnIdiom 18, Desktop=24}" />
|
||||
<!--#endif -->
|
||||
<Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
|
||||
|
@ -235,10 +235,10 @@
|
|||
<Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
|
||||
<Setter Property="BackgroundColor" Value="Transparent" />
|
||||
<Setter Property="FontFamily" Value="OpenSansRegular"/>
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="FontSize" Value="14" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="FontSize" Value="{OnIdiom 18, Desktop=24}" />
|
||||
<!--#endif -->
|
||||
<Setter Property="MinimumHeightRequest" Value="44"/>
|
||||
|
@ -451,19 +451,19 @@
|
|||
|
||||
<Style TargetType="Page" ApplyToDerivedTypes="True">
|
||||
<Setter Property="Padding" Value="0"/>
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightBackground}, Dark={StaticResource DarkBackground}}" />
|
||||
<!--#endif -->
|
||||
</Style>
|
||||
|
||||
<Style TargetType="Shell" ApplyToDerivedTypes="True">
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightBackground}, Dark={StaticResource DarkBackground}}" />
|
||||
<!--#endif -->
|
||||
<Setter Property="Shell.ForegroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
|
||||
|
@ -471,12 +471,12 @@
|
|||
<Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
|
||||
<Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
|
||||
<Setter Property="Shell.NavBarHasShadow" Value="False" />
|
||||
<!--#if (!SampleContent) -->
|
||||
<!--#if (!IncludeSampleContent) -->
|
||||
<Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
|
||||
<Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
|
||||
<Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
|
||||
<!--#endif -->
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource LightBackground}, Dark={StaticResource DarkBackground}}" />
|
||||
<Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource DarkOnLightBackground}, Dark={StaticResource LightOnDarkBackground}}" />
|
||||
<Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource DarkOnLightBackground}, Dark={StaticResource LightOnDarkBackground}}" />
|
||||
|
@ -497,7 +497,7 @@
|
|||
<Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
|
||||
</Style>
|
||||
|
||||
<!--#if (SampleContent) -->
|
||||
<!--#if (IncludeSampleContent) -->
|
||||
<Style TargetType="shimmer:SfShimmer">
|
||||
<Setter Property="Fill" Value="{AppThemeBinding Light={StaticResource LightSecondaryBackground}, Dark={StaticResource DarkSecondaryBackground}}" />
|
||||
<Setter Property="WaveColor" Value="{AppThemeBinding Light={StaticResource LightBackground}, Dark={StaticResource DarkBackground}}" />
|
||||
|
|
|
@ -11,8 +11,8 @@ public class SimpleTemplateTest : BaseTemplateTests
|
|||
[TestCase("maui", DotNetPrevious, "Release", false, "")]
|
||||
[TestCase("maui", DotNetCurrent, "Debug", false, "")]
|
||||
[TestCase("maui", DotNetCurrent, "Release", false, "")]
|
||||
[TestCase("maui", DotNetCurrent, "Debug", false, "--IncludeSampleContent")]
|
||||
[TestCase("maui", DotNetCurrent, "Release", false, "--IncludeSampleContent")]
|
||||
[TestCase("maui", DotNetCurrent, "Debug", false, "--sample-content")]
|
||||
[TestCase("maui", DotNetCurrent, "Release", false, "--sample-content")]
|
||||
[TestCase("maui-blazor", DotNetPrevious, "Debug", false, "")]
|
||||
[TestCase("maui-blazor", DotNetPrevious, "Release", false, "")]
|
||||
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "")]
|
||||
|
@ -42,7 +42,7 @@ public class SimpleTemplateTest : BaseTemplateTests
|
|||
|
||||
string[]? warningsToIgnore = null;
|
||||
|
||||
if (additionalDotNetNewParams.Contains("IncludeSampleContent", StringComparison.OrdinalIgnoreCase))
|
||||
if (additionalDotNetNewParams.Contains("sample-content", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
warningsToIgnore = new string[]
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче