Skip to content

Commit 38de797

Browse files
committed
Committing the changes for .NET 9 for the samples
1 parent 73c0901 commit 38de797

File tree

43 files changed

+181
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+181
-207
lines changed

AI Demos/AISmartPDFFormFill/SmartFill/MainPage.xaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<ColumnDefinition Width="Auto"/>
5858
</Grid.ColumnDefinitions>
5959
<HorizontalStackLayout Grid.Column="0" HorizontalOptions="Start">
60-
<Button x:Name="Save" Text="&#xe75f;" Padding="05" BorderWidth="0" Style="{StaticResource buttonIconStyle}" Clicked="SavePDF" ToolTipProperties.Text="Click to save the document" HeightRequest="40" WidthRequest="40" CornerRadius="5" TextColor="#99000000" BackgroundColor="Transparent" FontSize="24" FontFamily="Maui Material Assets" HorizontalOptions="Center" VerticalOptions="Center" Margin="12,0"/>
61-
<Button x:Name="Print" Text="&#xe77f;" BorderWidth="0" Padding="5" Clicked="PrintPDF" Style="{StaticResource buttonIconStyle}" CornerRadius="5" ToolTipProperties.Text="Click to print the document" HeightRequest="40" WidthRequest="40" TextColor="#99000000" BackgroundColor="Transparent" FontSize="24" FontFamily="Maui Material Assets" HorizontalOptions="Center" VerticalOptions="Center"/>
60+
<Button x:Name="Save" Text="&#xe75f;" Padding="05" BorderWidth="0" Style="{StaticResource buttonIconStyle}" Clicked="SavePDF" ToolTipProperties.Text="Click to save the document" HeightRequest="40" WidthRequest="40" CornerRadius="5" TextColor="#99000000" BackgroundColor="Transparent" FontSize="24" FontFamily="MauiMaterialAssets" HorizontalOptions="Center" VerticalOptions="Center" Margin="12,0"/>
61+
<Button x:Name="Print" Text="&#xe77f;" BorderWidth="0" Padding="5" Clicked="PrintPDF" Style="{StaticResource buttonIconStyle}" CornerRadius="5" ToolTipProperties.Text="Click to print the document" HeightRequest="40" WidthRequest="40" TextColor="#99000000" BackgroundColor="Transparent" FontSize="24" FontFamily="MauiMaterialAssets" HorizontalOptions="Center" VerticalOptions="Center"/>
6262
</HorizontalStackLayout>
6363
<Button x:Name="SubmitForm" ToolTipProperties.Text="Click to smart fill the form" Grid.Column="1" Text="Smart Fill" WidthRequest="110" CornerRadius="20" HeightRequest="40" Clicked="OnSmartFillClicked" VerticalOptions="Center" FontSize="14" FontAttributes="Bold" HorizontalOptions="End" IsEnabled="False" Margin="10,5" IsVisible="{OnPlatform WinUI=true, MacCatalyst=true}" />
6464
</Grid>
@@ -90,7 +90,7 @@
9090
HorizontalOptions="Start"
9191
VerticalOptions="Center"
9292
Padding="18"
93-
FontFamily="Maui Material Assets"
93+
FontFamily="MauiMaterialAssets"
9494
FontAttributes="Bold"/>
9595
</Grid>
9696
<BoxView HeightRequest="1" Opacity="0.5" BackgroundColor="#CAC4D0"/>
@@ -138,7 +138,7 @@ BackgroundColor="#F7F2FB" >
138138
Text="{Binding UserDetail1}"
139139
VerticalOptions="FillAndExpand"
140140
LineHeight="1.25"
141-
FontFamily="Maui Material Assets"
141+
FontFamily="MauiMaterialAssets"
142142
FontSize="14"
143143
LineBreakMode="WordWrap"
144144
TextColor="#99000000"/>
@@ -177,7 +177,7 @@ BackgroundColor="#F7F2FB">
177177
Grid.Column="0"
178178
Text="{Binding UserDetail2}"
179179
VerticalOptions="FillAndExpand"
180-
FontFamily="Maui Material Assets"
180+
FontFamily="MauiMaterialAssets"
181181
FontSize="14"
182182
LineBreakMode="WordWrap"
183183
TextColor="#99000000"/>
@@ -217,7 +217,7 @@ Padding="8"
217217
Grid.Column="0"
218218
Text="{Binding UserDetail3}"
219219
VerticalOptions="FillAndExpand"
220-
FontFamily="Maui Material Assets"
220+
FontFamily="MauiMaterialAssets"
221221
FontSize="14"
222222
LineBreakMode="WordWrap"
223223
TextColor="#99000000"/>
@@ -249,7 +249,7 @@ Padding="8"
249249
<Button
250250
Text="&#xe708;"
251251
x:Name="CopiedDataViewButton"
252-
FontFamily="Maui Material Assets"
252+
FontFamily="MauiMaterialAssets"
253253
Padding="2"
254254
Clicked="FullViewForCopiedData"
255255
BackgroundColor="Transparent"
@@ -310,7 +310,7 @@ Padding="8"
310310
Text="{Binding UserDetail1}"
311311
VerticalOptions="FillAndExpand"
312312
LineHeight="1.25"
313-
FontFamily="Maui Material Assets"
313+
FontFamily="MauiMaterialAssets"
314314
FontSize="14"
315315
LineBreakMode="WordWrap"
316316
TextColor="#99000000"/>
@@ -349,7 +349,7 @@ Padding="8"
349349
LineHeight="1.25"
350350
Text="{Binding UserDetail2}"
351351
VerticalOptions="FillAndExpand"
352-
FontFamily="Maui Material Assets"
352+
FontFamily="MauiMaterialAssets"
353353
FontSize="14"
354354
LineBreakMode="WordWrap"
355355
TextColor="#99000000"/>
@@ -388,7 +388,7 @@ Padding="8"
388388
LineHeight="1.25"
389389
Text="{Binding UserDetail3}"
390390
VerticalOptions="FillAndExpand"
391-
FontFamily="Maui Material Assets"
391+
FontFamily="MauiMaterialAssets"
392392
FontSize="14"
393393
LineBreakMode="WordWrap"
394394
TextColor="#99000000"/>

AI Demos/AISmartPDFFormFill/SmartFill/SmartFill.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<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>
4+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
88

@@ -69,7 +69,7 @@
6969
<ItemGroup>
7070
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
7171
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
72-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
72+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
7373
<PackageReference Include="Syncfusion.Maui.Core" Version="*" />
7474
<PackageReference Include="Syncfusion.Maui.DataForm" Version="*" />
7575
<PackageReference Include="Syncfusion.Maui.Inputs" Version="*" />

AI Demos/SmartRedaction/SmartRedaction/MainPage.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
TextColor="#99000000"
206206
Margin="05"
207207
FontSize="24"
208-
FontFamily="Maui Material Assets"
208+
FontFamily="MauiMaterialAssets"
209209
HorizontalOptions="Start"
210210
VerticalOptions="Center" />
211211
<Button x:Name="Save"
@@ -219,7 +219,7 @@
219219
TextColor="#99000000"
220220
Style="{StaticResource buttonIconStyle}"
221221
FontSize="24"
222-
FontFamily="Maui Material Assets"
222+
FontFamily="MauiMaterialAssets"
223223
HorizontalOptions="Start"
224224
VerticalOptions="Center" />
225225
<HorizontalStackLayout Padding="0"
@@ -297,7 +297,7 @@
297297
TextColor="#1C1B1F"
298298
BackgroundColor="Transparent"
299299
ToolTipProperties.Text="Back"
300-
FontFamily="Maui Material Assets"
300+
FontFamily="MauiMaterialAssets"
301301
Clicked="OpenCloseMobileRedactLayout"
302302
IsVisible="{OnPlatform Android=true, iOS=true, Default=false}"
303303
Text="&#xe72d;" />
@@ -387,7 +387,7 @@
387387
TextColor="#1C1B1F"
388388
BackgroundColor="Transparent"
389389
ToolTipProperties.Text="Back"
390-
FontFamily="Maui Material Assets"
390+
FontFamily="MauiMaterialAssets"
391391
Clicked="OnCancelClicked"
392392
IsVisible="{OnPlatform Android=true, iOS=true, Default=false}"
393393
Text="&#xe72d;" />

AI Demos/SmartRedaction/SmartRedaction/SmartRedaction.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<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>
4+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
88

@@ -68,10 +68,10 @@
6868
<ItemGroup>
6969
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
7070
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
71-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
72-
<PackageReference Include="Syncfusion.Maui.Buttons" Version="26.2.11" />
73-
<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="26.2.11" />
74-
<PackageReference Include="Syncfusion.Maui.TreeView" Version="26.2.11" />
71+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
72+
<PackageReference Include="Syncfusion.Maui.Buttons" Version="*" />
73+
<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="*" />
74+
<PackageReference Include="Syncfusion.Maui.TreeView" Version="*" />
7575
<PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.15" />
7676
</ItemGroup>
7777

AI Demos/Summarizer/Summarizer/MainPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
<HorizontalStackLayout Grid.Column="0" IsVisible="{OnPlatform WinUI=True, MacCatalyst=True, Default=False}" HorizontalOptions="Center">
7272
<Button x:Name="goToPreviousPageButton"
7373
ToolTipProperties.Text="Click to go to previous page" TextColor="#1C1B1F" BackgroundColor="Transparent"
74-
Text="&#xe708;" FontFamily="Maui Material Assets" FontSize="24" Clicked="PreviousPage" IsEnabled="False"
74+
Text="&#xe708;" FontFamily="MauiMaterialAssets" FontSize="24" Clicked="PreviousPage" IsEnabled="False"
7575
Margin="0,0,8,0"
7676
Style="{StaticResource buttonIconStyle}"/>
7777
<Button x:Name="goToNextPageButton"
7878
ToolTipProperties.Text="Click to go to next page" TextColor="#1C1B1F" Clicked="NextPage"
79-
Text="&#xe705;" FontFamily="Maui Material Assets" FontSize="24"
79+
Text="&#xe705;" FontFamily="MauiMaterialAssets" FontSize="24"
8080
Margin="0,0,8,0"
8181
Style="{StaticResource buttonIconStyle}"/>
8282
<inputLayout:SfTextInputLayout Stroke="#49454F" ContainerBackground="Transparent" OutlineCornerRadius="4" HeightRequest="40" WidthRequest="58" FocusedStrokeThickness="1" ReserveSpaceForAssistiveLabels="False" Padding="0,-2.9,0,0" InputViewPadding="0" ContainerType="Outlined">
@@ -120,7 +120,7 @@
120120
<Grid Grid.Row="1" RowDefinitions="auto,auto">
121121
<Grid ColumnDefinitions="auto,auto,*">
122122
<Label x:Name="AIAssist" Grid.Column="1" TextColor="#49454F" FontSize="{OnPlatform Android=16, iOS=16}" Text="AI Assistant" HorizontalOptions="Start" VerticalOptions="Center" Padding="18" FontFamily="Roboto" FontAttributes="Bold"/>
123-
<Button x:Name="close" Grid.Column="3" TextColor="#49454F" Style="{StaticResource buttonIconStyle}" BorderWidth="0" Clicked="AIAssistant_Clicked" CornerRadius="20" FontSize="24" Text="&#xe70b;" HorizontalOptions="End" FontFamily="Maui Material Assets" WidthRequest="40" HeightRequest="40" ToolTipProperties.Text="Close" Padding="0" Margin="0,0,14,0">
123+
<Button x:Name="close" Grid.Column="3" TextColor="#49454F" Style="{StaticResource buttonIconStyle}" BorderWidth="0" Clicked="AIAssistant_Clicked" CornerRadius="20" FontSize="24" Text="&#xe70b;" HorizontalOptions="End" FontFamily="MauiMaterialAssets" WidthRequest="40" HeightRequest="40" ToolTipProperties.Text="Close" Padding="0" Margin="0,0,14,0">
124124
</Button>
125125
</Grid>
126126
</Grid>

AI Demos/Summarizer/Summarizer/Summarizer.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<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>
4+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
88

@@ -69,7 +69,7 @@
6969
<ItemGroup>
7070
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
7171
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
72-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
72+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
7373
<PackageReference Include="Microsoft.SemanticKernel" Version="1.12.0" />
7474
<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="*" />
7575
<PackageReference Include="Syncfusion.Maui.AIAssistView" Version="*" />

AI Demos/Summarizer/Summarizer/Summarizer.csproj.user

Lines changed: 0 additions & 32 deletions
This file was deleted.

Annotations/FreeText/FreeText/FreeText.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<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>
4+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
88

@@ -67,7 +67,7 @@
6767
<ItemGroup>
6868
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
6969
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
70-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
70+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
7171
<PackageReference Include="Syncfusion.Compression.NET" Version="*" />
7272
<PackageReference Include="Syncfusion.Maui.Core" Version="*" />
7373
<PackageReference Include="Syncfusion.Maui.SignaturePad" Version="*" />

0 commit comments

Comments
 (0)