Skip to content

Commit

Permalink
3.0.4-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
adospace committed Nov 20, 2024
1 parent 6e3d006 commit ecbed6d
Show file tree
Hide file tree
Showing 64 changed files with 10,634 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
Solution_Name: ./src/MauiReactor.Build.sln
Test_Project: ./samples/UnitTests/UnitTests.csproj
TemplatePack_Name: ./src/MauiReactor.TemplatePack/MauiReactor.TemplatePack.csproj
Version: 3.0.3-beta
Version: 3.0.4-beta

steps:
- name: Checkout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public ScaffoldTypeGenerator(
.Where(_ => propertiesMap.ContainsKey(_))
.Select(_ => propertiesMap[_])

//.Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.LayoutOptions")
.Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.View")
.Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.ColumnDefinitionCollection")
.Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.RowDefinitionCollection")
.Where(_ => !(declaringTypeFullName == "Microsoft.Maui.Controls.Shell" && _.Name == "CurrentItem"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ namespace MauiReactorTemplate.StartupXaml;

public partial class App : MauiReactorApplication
{
public App()
public App(IServiceProvider serviceProvider)
: base(serviceProvider)
{
InitializeComponent();
}
Expand All @@ -15,7 +16,8 @@ public App()

public abstract class MauiReactorApplication : ReactorApplication<HomePage>
{
public MauiReactorApplication()
public MauiReactorApplication(IServiceProvider serviceProvider)
: base(serviceProvider)
{
this.UseTheme<ApplicationTheme>();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public override VisualNode Render()
.HCenter()
.Set(SemanticProperties.DescriptionProperty, "Cute dot net bot waving hi to you!"),

Label("Hello, World!")
Label("Hello, World!!!!")
.FontSize(32)
.HCenter(),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ public static MauiApp CreateMauiApp()
});

#if DEBUG
builder.Logging.AddDebug();
builder.EnableMauiReactorHotReload();
builder.OnMauiReactorUnhandledException((e) =>
{
System.Diagnostics.Debug.WriteLine(e.ExceptionObject);
});
builder.Logging.AddDebug();
#endif


return builder.Build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Reactor.Maui" Version="3.0.1-beta" />
<PackageReference Include="Reactor.Maui" Version="3.0.3-beta" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
<WindowsPackageType>None</WindowsPackageType>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<!-- App Icon -->
Expand All @@ -62,7 +62,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Reactor.Maui" Version="3.0.1-beta" />
<PackageReference Include="Reactor.Maui" Version="3.0.3-beta" />
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions src/MauiReactor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiReactorTemplate.Startup
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiReactorTemplate.StartupXaml", "..\templates\MauiReactorTemplate.StartupXaml\MauiReactorTemplate.StartupXaml.csproj", "{4150DAE6-3A9D-48F9-9EAE-62AE7C0B279C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiReactorTemplate.StartupSampleXaml", "..\templates\MauiReactorTemplate.StartupSampleXaml\MauiReactorTemplate.StartupSampleXaml.csproj", "{8057F9B6-EFC4-4E96-B219-58E64DE2009C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -187,6 +189,12 @@ Global
{4150DAE6-3A9D-48F9-9EAE-62AE7C0B279C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{4150DAE6-3A9D-48F9-9EAE-62AE7C0B279C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4150DAE6-3A9D-48F9-9EAE-62AE7C0B279C}.Release|Any CPU.Build.0 = Release|Any CPU
{8057F9B6-EFC4-4E96-B219-58E64DE2009C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8057F9B6-EFC4-4E96-B219-58E64DE2009C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8057F9B6-EFC4-4E96-B219-58E64DE2009C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{8057F9B6-EFC4-4E96-B219-58E64DE2009C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8057F9B6-EFC4-4E96-B219-58E64DE2009C}.Release|Any CPU.Build.0 = Release|Any CPU
{8057F9B6-EFC4-4E96-B219-58E64DE2009C}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -205,6 +213,7 @@ Global
{ADF0270D-89D6-400C-9E7C-2E29BA87A170} = {FF33D69E-8D8E-4604-9800-EEF2EE776B35}
{050BF448-18E6-4FC0-B23F-0254E58F9D12} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
{4150DAE6-3A9D-48F9-9EAE-62AE7C0B279C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
{8057F9B6-EFC4-4E96-B219-58E64DE2009C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {52AD377B-6F53-46B0-A934-D9607EF7A143}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Reactor.Maui" Version="3.0.2-beta" />
<PackageReference Include="Reactor.Maui" Version="3.0.3-beta" />
</ItemGroup>

</Project>
14 changes: 14 additions & 0 deletions templates/MauiReactorTemplate.StartupSampleXaml/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<local:MauiReactorApplication xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MauiReactorTemplate.StartupSampleXaml"
x:Class="MauiReactorTemplate.StartupSampleXaml.App">
<local:MauiReactorApplication.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</local:MauiReactorApplication.Resources>
</local:MauiReactorApplication>
25 changes: 25 additions & 0 deletions templates/MauiReactorTemplate.StartupSampleXaml/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using MauiReactor;
using MauiReactorTemplate.StartupSampleXaml.Components;
using MauiReactorTemplate.StartupSampleXaml.Resources.Styles;
using System;

namespace MauiReactorTemplate.StartupSampleXaml;

public partial class App : MauiReactorApplication
{
public App(IServiceProvider serviceProvider)
: base(serviceProvider)
{
InitializeComponent();
}
}


public abstract class MauiReactorApplication : ReactorApplication<HomePage>
{
public MauiReactorApplication(IServiceProvider serviceProvider)
: base(serviceProvider)
{
this.UseTheme<ApplicationTheme>();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
namespace MauiReactorTemplate.StartupSampleXaml.Components;

public class HomePageState
{
public int Counter { get; set; }
}

public partial class HomePage : Component<HomePageState>
{
public override VisualNode Render()
=> ContentPage(
ScrollView(
VStack(
Image("dotnet_bot.png")
.HeightRequest(200)
.HCenter()
.Set(MauiControls.SemanticProperties.DescriptionProperty, "Cute dot net bot waving hi to you!"),

Label("Hello, World!!!!")
.FontSize(32)
.HCenter(),

Label("Welcome to MauiReactor: MAUI with superpowers!")
.FontSize(18)
.HCenter(),

Button(State.Counter == 0 ? "Click me" : $"Clicked {State.Counter} times!")
.OnClicked(() => SetState(s => s.Counter++))
.HCenter()
)
.VCenter()
.Spacing(25)
.Padding(30, 0)
)
);
}
Loading

0 comments on commit ecbed6d

Please sign in to comment.