Skip to content

Upgrade to .NET 9.0 (Revert WinUI) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RezaT4795 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to .NET 9.0 (Revert WinUI) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Google.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net9.0-windows10.0.26100</TargetFrameworks>
<AssemblyName>Zebble.Google</AssemblyName>
<RootNamespace>Zebble</RootNamespace>
<PackageId>Zebble.Google</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>2.1.2.0</Version>
<Version>2.1.3.0</Version>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<DefineConstants>$(DefineConstants)</DefineConstants>
Expand Down Expand Up @@ -35,9 +35,10 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" $(TargetFramework.Contains('windows')) ">
<PropertyGroup Condition=" $(TargetFramework.Contains('net9.0-windows')) ">
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
<DefineConstants>$(DefineConstants);UWP</DefineConstants>
<UseUwp>true</UseUwp>
</PropertyGroup>
<PropertyGroup Condition=" $(TargetFramework.Contains('android')) ">
<DefineConstants>$(DefineConstants);ANDROID</DefineConstants>
Expand All @@ -49,8 +50,10 @@
<ItemGroup>
<Compile Include="Shared\**\*.cs" />
</ItemGroup>
<ItemGroup Condition=" $(DefineConstants.Contains('WINUI')) ">
<Compile Include="WinUI\**\*.cs" />
<ItemGroup Condition=" $(DefineConstants.Contains('UWP')) ">
<Compile Include="UWP\**\*.cs" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" IncludeAssets="build" PrivateAssets="all" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
</ItemGroup>
<ItemGroup Condition=" $(DefineConstants.Contains('ANDROID')) ">
<PackageReference Include="Xamarin.GooglePlayServices.Auth" Version="121.3.0.1" />
Expand All @@ -68,9 +71,9 @@
<None Remove="Zebble-LicenseAgreement.txt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Zebble" Version="5.1.5" />
<PackageReference Include="Zebble" Version="5.1.7" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process">
<Version>2.8.7.2</Version>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion WinUI/Google.cs → UWP/Google.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Zebble
using Windows.Security.Cryptography.Core;
using Windows.Storage;
using Windows.Storage.Streams;
using Microsoft.UI.Xaml;
using Windows.UI.Xaml;

public partial class Google
{
Expand Down