Update the project to .NET 7 latest version

dotnet · Apr 3, 2023 · aab271e · aab271e
1 parent a441ce8
commit aab271e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets b/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets
@@ -1,5 +1,5 @@
 <Project>
-	<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net6.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true ">
+	<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net7.0-ios')) != true AND $(TargetFramework.StartsWith('net7.0-maccatalyst')) != true ">
 		<Compile Remove="**\**\*.iOS.cs" />
 		<None Include="**\**\*.iOS.cs" />
 		<Compile Remove="**\iOS\**\*.cs" />
@@ -11,13 +11,13 @@
 		<Compile Remove="**\Mac\**\*.cs" />
 		<None Include="**\Mac\**\*.cs" />
 	</ItemGroup>
-	<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net6.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true">
+	<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net7.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true">
 		<Compile Remove="**\*.MaciOS.cs" />
 		<None Include="**\*.MaciOS.cs" />
 		<Compile Remove="**\MaciOS\**\*.cs" />
 		<None Include="**\MaciOS\**\*.cs" />
 	</ItemGroup>
-	<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net6.0-android')) != true ">
+	<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net7.0-android')) != true ">
 		<Compile Remove="**\**\*.Android.cs" />
 		<None Include="**\**\*.Android.cs" />
 		<Compile Remove="**\Android\**\*.cs" />
@@ -55,16 +55,16 @@
 	</ItemGroup>
 
 	<!-- Android -->
-	<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
+	<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-android'))">
 		<DefineConstants>$(DefineConstants);MONOANDROID</DefineConstants>
 	</PropertyGroup>
 
 	<!-- iOS -->
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-ios' ">
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0-ios' ">
 		<DefineConstants>$(DefineConstants);IOS</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' ">
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0-maccatalyst' ">
 		<DefineConstants>$(DefineConstants);MACCATALYST;IOS</DefineConstants>
 	</PropertyGroup>
 
@@ -82,8 +82,4 @@
 		<DefineConstants>WINDOWS_UWP;$(DefineConstants)</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
-		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
-		<PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" Version="6.0.501" />
-	</ItemGroup>
 </Project>
diff --git a/src/GraphicsControls.Sample/GraphicsControls.Sample.csproj b/src/GraphicsControls.Sample/GraphicsControls.Sample.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>GraphicsControls.Sample</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/src/GraphicsControls/GraphicsControls.csproj b/src/GraphicsControls/GraphicsControls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
 		<RootNamespace>Microsoft.Maui.Graphics.Controls</RootNamespace>
 		<AssemblyName>Microsoft.Maui.Graphics.Controls</AssemblyName>
 		<LangVersion>10.0</LangVersion>
@@ -12,8 +12,5 @@
 	<PropertyGroup>
 		<PackageId>Microsoft.Maui.Graphics.Controls</PackageId>
 	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Graphics" Version="6.0.501" />
-	</ItemGroup>
 	<Import Project="..\..\Microsoft.Maui.Graphics.Controls.MultiTargeting.targets" />
 </Project>