Skip to content

Commit b71feeb

Browse files
nevsenevse
committed
net9
1 parent ef3a3ce commit b71feeb

File tree

76 files changed

+2237
-157
lines changed

Some content is hidden

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

76 files changed

+2237
-157
lines changed

‎CS/ASPDataBaseServer/ASPDataBaseServer/ASPDataBaseServer.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
@@ -14,9 +14,9 @@
1414
<None Remove="Microsoft.EntityFrameworkCore.SqlServer" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
18-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.0" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<Folder Include="Models\" />

‎CS/ASPDataBaseServer/ASPDataBaseServer/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static void GenerateEmployees() {
99
var context = new CustomersContext();
1010
List<Customer> result = new List<Customer>();
1111

12-
string fileName = "Data/customers.json";
12+
string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data/customers.json");
1313
string jsonString = File.ReadAllText(fileName);
1414
result = JsonSerializer.Deserialize<List<Customer>>(jsonString);
1515
context.Customers.AddRange(result);

‎CS/ASPDataBaseServer/MauiDataGridView_GetFromASPServer/App.xaml.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
namespace MauiDataGridView_GetFromASPServer;
1+

2+
namespace MauiDataGridView_GetFromASPServer;
23

34
public partial class App : Application {
45
public App() {
56
InitializeComponent();
6-
7-
MainPage = new MainPage();
7+
}
8+
protected override Window CreateWindow(IActivationState activationState)
9+
{
10+
return new Window(new MainPage());
811
}
912
}

‎CS/ASPDataBaseServer/MauiDataGridView_GetFromASPServer/MauiDataGridView_GetFromASPServer.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<UseMaui>true</UseMaui>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -17,11 +17,12 @@
1717
<ApplicationVersion>1</ApplicationVersion>
1818
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
1919
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
20+
<MauiVersion>9.0.10</MauiVersion>
2021
</PropertyGroup>
21-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
22+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-ios|AnyCPU'">
2223
<CreatePackage>false</CreatePackage>
2324
</PropertyGroup>
24-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
25+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-ios|AnyCPU'">
2526
<CreatePackage>false</CreatePackage>
2627
</PropertyGroup>
2728
<ItemGroup>
@@ -37,8 +38,8 @@
3738
<ItemGroup>
3839
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
3940
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
40-
<PackageReference Include="DevExpress.Maui.Editors" Version="24.1.*" />
41-
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
42-
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.1.*" />
41+
<PackageReference Include="DevExpress.Maui.Editors" Version="24.2.*" />
42+
<PackageReference Include="DevExpress.Maui.Core" Version="24.2.*" />
43+
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.2.*" />
4344
</ItemGroup>
4445
</Project>

‎CS/AdvancedColumnLayout/AdvancedColumnLayout.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<UseMaui>true</UseMaui>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -16,12 +16,13 @@
1616
<ApplicationVersion>1</ApplicationVersion>
1717
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
1818
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
19+
<MauiVersion>9.0.10</MauiVersion>
1920
</PropertyGroup>
2021
<ItemGroup>
2122
<!-- App Icon -->
22-
<MauiImage Include="Resources\appicon.svg" IsAppIcon="true" ForegroundFile="Resources\splashscreen.svg" Color="#FFFFFF" />
23+
<MauiImage Include="Resources\AppIcon\appicon.svg" IsAppIcon="true" ForegroundFile="Resources\Splash\splash.svg" Color="#FFFFFF" />
2324
<!-- Splash Screen -->
24-
<MauiSplashScreen Include="Resources\splashscreen.svg" Color="#5B27D9" />
25+
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#5B27D9" />
2526
<!-- Images -->
2627
<MauiImage Include="Resources\Images\*" />
2728
<!-- Custom Fonts -->
@@ -38,16 +39,16 @@
3839
<ItemGroup>
3940
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
4041
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
41-
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
42-
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.1.*" />
42+
<PackageReference Include="DevExpress.Maui.Core" Version="24.2.*" />
43+
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.2.*" />
4344
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4445
</ItemGroup>
4546
<PropertyGroup>
4647
<UseInterpreter Condition="$(TargetFramework.Contains('-ios'))">True</UseInterpreter>
4748
<UseInterpreter Condition="$(TargetFramework.Contains('-android'))">False</UseInterpreter>
4849
<RuntimeIdentifiers Condition="$(TargetFramework.Contains('-android'))">android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
4950
</PropertyGroup>
50-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
51+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-ios|AnyCPU'">
5152
<CreatePackage>false</CreatePackage>
5253
</PropertyGroup>
5354
</Project>

‎CS/AdvancedColumnLayout/App.xaml.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
namespace AdvancedColumnLayout {
1+

2+
namespace AdvancedColumnLayout {
23
public partial class App : Application {
34
public App() {
45
InitializeComponent();
5-
6-
MainPage = new MainPage();
6+
}
7+
protected override Window CreateWindow(IActivationState activationState)
8+
{
9+
return new Window(new MainPage());
710
}
811
}
912
}

‎CS/AdvancedColumnLayout/Platforms/Android/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="35" />
44
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
66
</manifest>

‎CS/AdvancedColumnLayout/Resources/AppIcon/appicon.svg

+4
Loading

‎CS/AdvancedColumnLayout/Resources/AppIcon/appiconfg.svg

+8
Loading

0 commit comments

Comments
 (0)