Skip to content

Commit 4079c0d

Browse files
StrypperStrypper
committed
Adjust code for publish package
1 parent 7f4d13f commit 4079c0d

File tree

9 files changed

+76
-30
lines changed

9 files changed

+76
-30
lines changed

‎src/Core/MAUIsland.Core/MAUIsland.Core.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<SingleProject>true</SingleProject>
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
<Nullable>enable</Nullable>
12+
<UseRidGraph>false</UseRidGraph>
1213

1314
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
1415
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>

‎src/Core/MAUIsland.Core/ServiceExtension.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using CommunityToolkit.Maui;
2-
using CommunityToolkit.Maui.Core;
32
using Material.Components.Maui.Extensions;
43
using MAUIsland.Features.LocalDbFeatures;
54
using MAUIsland.Features.LocalDbFeatures.GitHub;
@@ -14,14 +13,11 @@ public static class ServicesExtension
1413
public static MauiAppBuilder InitCore(this MauiAppBuilder builder)
1514
{
1615

16+
//builder.UseMauiCommunityToolkit(option => option.SetShouldEnableSnackbarOnWindows(true));
17+
1718
builder.UseAcrylicView();
1819
builder.UseSkiaSharp(true);
1920
builder.UseMaterialComponents();
20-
builder.UseMauiCommunityToolkit();
21-
22-
//builder.UseMauiCommunityToolkit(option => option.SetShouldEnableSnackbarOnWindows(true));
23-
builder.UseMauiCommunityToolkitCore();
24-
builder.UseMauiCommunityToolkitMediaElement();
2521

2622

2723
builder.Services.RegisterGitHubFeatures();

‎src/Features/GitHubFeatures/MAUIsland.GitHubFeatures/MAUIsland.GitHubFeatures.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<UseRidGraph>false</UseRidGraph>
78
</PropertyGroup>
89

910
<ItemGroup>

‎src/Features/LocalDbFeatures/GitHub/MAUIsland.Features.LocalDbFeatures.GitHub/MAUIsland.Features.LocalDbFeatures.GitHub.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<UseRidGraph>false</UseRidGraph>
78
</PropertyGroup>
89

910
<ItemGroup>

‎src/Presentations/Windows/Features/Gallery/Pages/Material/Controls/MaterialButton/MaterialButtonPage.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace MAUIsland;
22
public partial class MaterialButtonPage : IGalleryPage
33
{
4-
#region [CTor]
4+
#region [ CTor ]
55
public MaterialButtonPage(MaterialButtonPageViewModel vm)
66
{
77
InitializeComponent();

‎src/Presentations/Windows/Features/Gallery/Pages/Material/Controls/MaterialContextMenu/MaterialContextMenuPage.xaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
66
xmlns:app="clr-namespace:MAUIsland"
77
xmlns:core="clr-namespace:MAUIsland.Core;assembly=MAUIsland.Core"
8+
xmlns:datagrid="clr-namespace:Maui.DataGrid;assembly=Maui.DataGrid"
89
xmlns:icon="clr-namespace:IconPacks.IconKind;assembly=IconPacks.Material"
910
xmlns:mdc="clr-namespace:Material.Components.Maui;assembly=Material.Components.Maui"
1011
Title="MaterialContextMenu"
@@ -99,6 +100,47 @@
99100
<core:SourceCodeExpander Code="{x:Binding ContextMenuXamlCode}" CodeType="Xaml" />
100101
</VerticalStackLayout>
101102
</Border>
103+
<Border Padding="20" StrokeShape="RoundRectangle 4">
104+
<VerticalStackLayout Spacing="10">
105+
<Label
106+
FontAttributes="Bold"
107+
FontSize="Subtitle"
108+
Text="Properties" />
109+
<Grid BackgroundColor="White" HeightRequest="1" />
110+
<datagrid:DataGrid
111+
BorderColor="Gray"
112+
HeaderBackground="#d0bcff"
113+
HeaderHeight="50"
114+
ItemsSource="{x:Binding Properties}"
115+
RowHeight="80">
116+
<datagrid:DataGrid.Columns>
117+
<datagrid:DataGridColumn Title="Name" PropertyName="Name" />
118+
<datagrid:DataGridColumn Title="Data Type" PropertyName="DataType" />
119+
<datagrid:DataGridColumn Title="Default Value" PropertyName="DefaultValue" />
120+
</datagrid:DataGrid.Columns>
121+
</datagrid:DataGrid>
122+
</VerticalStackLayout>
123+
</Border>
124+
<Border Padding="20" StrokeShape="RoundRectangle 4">
125+
<VerticalStackLayout Spacing="10">
126+
<Label
127+
FontAttributes="Bold"
128+
FontSize="Subtitle"
129+
Text="Events" />
130+
<Grid BackgroundColor="White" HeightRequest="1" />
131+
<datagrid:DataGrid
132+
BorderColor="Gray"
133+
HeaderBackground="#d0bcff"
134+
HeaderHeight="50"
135+
ItemsSource="{x:Binding Events}"
136+
RowHeight="80">
137+
<datagrid:DataGrid.Columns>
138+
<datagrid:DataGridColumn Title="Name" PropertyName="Name" />
139+
<datagrid:DataGridColumn Title="Data Type" PropertyName="DataType" />
140+
</datagrid:DataGrid.Columns>
141+
</datagrid:DataGrid>
142+
</VerticalStackLayout>
143+
</Border>
102144
</VerticalStackLayout>
103145
</ScrollView>
104146
</SwipeView>

‎src/Presentations/Windows/MAUIsland.csproj‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,47 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
6-
<OutputType>Exe</OutputType>
7-
<UseMaui>true</UseMaui>
8-
<SingleProject>true</SingleProject>
9-
<ImplicitUsings>enable</ImplicitUsings>
10-
<_MauiForceXamlCForDebug>true</_MauiForceXamlCForDebug>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
6+
<OutputType>Exe</OutputType>
7+
<UseMaui>true</UseMaui>
8+
<SingleProject>true</SingleProject>
9+
<ImplicitUsings>enable</ImplicitUsings>
10+
<UseRidGraph>false</UseRidGraph>
11+
<_MauiForceXamlCForDebug>true</_MauiForceXamlCForDebug>
1112

12-
<!-- Display name -->
13-
<ApplicationTitle>MAUIsland</ApplicationTitle>
13+
<!-- Display name -->
14+
<ApplicationTitle>MAUIsland</ApplicationTitle>
1415

15-
<!-- App Identifier -->
16-
<ApplicationId>com.companyname.mauisland</ApplicationId>
17-
<ApplicationIdGuid>337d7a98-7b00-487e-88d9-3b1a317456c7</ApplicationIdGuid>
16+
<!-- App Identifier -->
17+
<ApplicationId>com.companyname.mauisland</ApplicationId>
18+
<ApplicationIdGuid>337d7a98-7b00-487e-88d9-3b1a317456c7</ApplicationIdGuid>
1819

19-
<!-- Versions -->
20-
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
21-
<ApplicationVersion>1</ApplicationVersion>
20+
<!-- Versions -->
21+
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
22+
<ApplicationVersion>1</ApplicationVersion>
2223

2324
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
2425
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
2526
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
2627
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
27-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
28-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
29-
<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
30-
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
28+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
29+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
30+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
31+
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
3132
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
3233
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
3334
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
3435
<GenerateTestArtifacts>True</GenerateTestArtifacts>
3536
<AppInstallerUri>https://totechsintranet.blob.core.windows.net/installers</AppInstallerUri>
3637
<HoursBetweenUpdateChecks>1</HoursBetweenUpdateChecks>
3738
<PackageCertificateKeyFile>MAUIsland_TemporaryKey.pfx</PackageCertificateKeyFile>
39+
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
3840
</PropertyGroup>
3941

42+
<ItemGroup>
43+
<RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
44+
</ItemGroup>
45+
4046
<ItemGroup>
4147
<!-- App Icon -->
4248
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" BaseSize="1200, 1200" Color="#512BD4" />

‎src/Presentations/Windows/MauiProgram.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using CommunityToolkit.Maui.Storage;
55
using Microsoft.AspNetCore.SignalR.Client;
66
using Microsoft.Extensions.Configuration;
7-
using Microsoft.Extensions.Logging;
87
using Refit;
98
using Syncfusion.Maui.Core.Hosting;
109
using System.Reflection;
@@ -22,6 +21,9 @@ public static MauiApp CreateMauiApp()
2221

2322
var builder = MauiApp.CreateBuilder();
2423
builder
24+
.UseMauiCommunityToolkit()
25+
.UseMauiCommunityToolkitCore()
26+
.UseMauiCommunityToolkitMediaElement()
2527
.InitCore()
2628
.UseMauiApp<App>()
2729
.ConfigureFonts(fonts =>

‎src/Presentations/Windows/Platforms/Windows/Package.appxmanifest‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
<Package
33
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
44
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
5-
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
65
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
76
IgnorableNamespaces="uap rescap">
87

98
<Identity Name="47268StrypperVandelJason.MAUIsland"
109
Publisher="CN=C5255E29-81AE-4129-9BC3-9E2C461A195A"
11-
Version="1.1.18.0" />
12-
13-
<mp:PhoneIdentity PhoneProductId="362d583e-eba9-4af6-9b81-9a3d4a5155b4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
10+
Version="1.0.4.0" />
1411

1512
<Properties>
1613
<DisplayName>MAUIsland</DisplayName>

0 commit comments

Comments
 (0)