Skip to content

Commit

Permalink
updated to .net 7
Browse files Browse the repository at this point in the history
  • Loading branch information
IeuanWalker committed Dec 28, 2022
1 parent 14c6cb1 commit 3be4824
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
8 changes: 7 additions & 1 deletion Demo/App.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios;</TargetFrameworks>
<TargetFrameworks>net7.0-android;net7.0-ios;</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>App</RootNamespace>
<UseMaui>true</UseMaui>
Expand All @@ -24,6 +24,12 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
<ProvisioningType>automatic</ProvisioningType>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignKey>iPhone Distribution: CARDIFF COUNTY COUNCIL (RHSME4M265)</CodesignKey>
</PropertyGroup>

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
Expand Down
8 changes: 4 additions & 4 deletions Scr/MultiTargeting.targets
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-ios')) != true">
<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-ios')) != true">
<Compile Remove="**\*.iOS.cs" />
<None Include="**\*.iOS.cs" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-android')) != true">
<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-android')) != true">
<Compile Remove="**\*.Android.cs" />
<None Include="**\*.Android.cs" />
</ItemGroup>
Expand All @@ -19,12 +19,12 @@
</PropertyGroup>

<!-- ANDROID -->
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-android'))">
<DefineConstants>$(DefineConstants);MONOANDROID</DefineConstants>
</PropertyGroup>

<!-- IOS -->
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-ios'))">
<DefineConstants>$(DefineConstants);IOS</DefineConstants>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Scr/StateButton.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;</TargetFrameworks>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;</TargetFrameworks>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down

0 comments on commit 3be4824

Please sign in to comment.