blahba.com/flower-story
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

downgrade .net

Browse Source
This commit is contained in:
Tsanie Lily
2023-07-31 23:18:14 +08:00
parent 8419c9d389
commit d67fadbd7b
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlowerApp/Extensions.cs
View File

@@ -44,7 +44,7 @@ internal sealed class Extensions
values.FirstOrDefault() is string oAuth)
{
Constants.SetAuthorization(oAuth);
var result = await content.ReadFromJsonAsync<R>(cancellation);
var result = await content.ReadFromJsonAsync<R>(cancellationToken: cancellation);
return result;
}
}

31
FlowerApp/FlowerApp.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Blahblah.FlowerApp</RootNamespace>
@@ -15,6 +15,7 @@
<!-- App Identifier -->
<ApplicationId>org.blahblah.flowerstory</ApplicationId>
<ApplicationIdGuid>2a32c3a1-d02e-450d-b524-5dbea90f13ed</ApplicationIdGuid>
<!-- Versions -->
<ApplicationDisplayVersion>0.2.731</ApplicationDisplayVersion>
@@ -24,11 +25,11 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Debug|net8.0-android'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Debug|net7.0-android'">
<RuntimeIdentifiers>android-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Release|net8.0-android'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Release|net7.0-android'">
<RuntimeIdentifiers>android-x64;android-arm64</RuntimeIdentifiers>
<AndroidPackageFormat>apk</AndroidPackageFormat>
<AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
@@ -39,12 +40,12 @@
<ProvisioningType>manual</ProvisioningType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Debug|net8.0-ios'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Debug|net7.0-ios'">
<CodesignKey>Apple Development</CodesignKey>
<CodesignProvision>Flower Story Development</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Release|net8.0-ios'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'Release|net7.0-ios'">
<CodesignKey>Apple Distribution</CodesignKey>
<CodesignProvision>Flower Story Ad-Hoc</CodesignProvision>
</PropertyGroup>
@@ -52,7 +53,6 @@
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiIcon Include="Resources\AppIcon\appiconfg.svg" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
@@ -74,11 +74,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.9" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-preview.6.23329.7" />
<!--<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />-->
<PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
<!--<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />-->
<!--<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />-->
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.5" />
</ItemGroup>
@@ -96,6 +96,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Localizations.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Localizations.zh.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
@@ -116,10 +119,4 @@
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionFlowerAppHideInfoBar="True" /></VisualStudio></ProjectExtensions>
<!--<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>-->
</Project>

1
FlowerApp/LoginPage.xaml
View File

@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Blahblah.FlowerApp.LoginPage"
x:Name="loginPage"
x:DataType="l:LoginPage">

1
FlowerApp/MainPage.xaml
View File

@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Blahblah.FlowerApp.HomePage"
x:Name="homePage"
x:DataType="l:HomePage"

4
FlowerApp/MauiProgram.cs
View File

@@ -1,5 +1,5 @@
using Blahblah.FlowerApp.Data;
using CommunityToolkit.Maui;
//using CommunityToolkit.Maui;
#if DEBUG
using Microsoft.Extensions.Logging;
#endif
@@ -13,7 +13,7 @@ public static class MauiProgram
var builder = MauiApp.CreateBuilder();
builder
.UseMauiApp<App>()
.UseMauiCommunityToolkit()
//.UseMauiCommunityToolkit()
.ConfigureFonts(fonts =>
{
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");