Skip to content
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

Jump to bottom

Remove .NET 7 TFMs #4844

Merged
merged 3 commits into from
Jun 14, 2024
Merged

Remove .NET 7 TFMs #4844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4956e9e
Remove .NET7 TFMs
Cheesebaron Mar 28, 2024
2d33b1e
Also remove from WPF proj
Cheesebaron Mar 28, 2024
849f2b1
Merge branch 'develop' into feature/remove-net7
Cheesebaron Jun 14, 2024
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
2 changes: 1 addition & 1 deletion MvvmCross.DroidX/Leanback/MvvmCross.DroidX.Leanback.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net8.0-android</TargetFrameworks>
<TargetFramework>net8.0-android</TargetFramework>
<AssemblyName>MvvmCross.DroidX.Leanback</AssemblyName>
<RootNamespace>MvvmCross.DroidX.Leanback</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.DroidX/Material/MvvmCross.DroidX.Material.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net8.0-android</TargetFrameworks>
<TargetFramework>net8.0-android</TargetFramework>
<AssemblyName>MvvmCross.DroidX.Material</AssemblyName>
<RootNamespace>MvvmCross.DroidX.Material</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.DroidX/RecyclerView/MvvmCross.DroidX.RecyclerView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net8.0-android</TargetFrameworks>
<TargetFramework>net8.0-android</TargetFramework>
<AssemblyName>MvvmCross.DroidX.RecyclerView</AssemblyName>
<RootNamespace>MvvmCross.DroidX.RecyclerView</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.DroidX/SwipeRefreshLayout/MvvmCross.DroidX.SwipeRefreshLayout.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net8.0-android</TargetFrameworks>
<TargetFramework>net8.0-android</TargetFramework>
<AssemblyName>MvvmCross.DroidX.SwipeRefreshLayout</AssemblyName>
<RootNamespace>MvvmCross.DroidX.SwipeRefreshLayout</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/All/MvvmCross.Plugin.All.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.All</AssemblyName>
<RootNamespace>MvvmCross.Plugin.All</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
4 changes: 2 additions & 2 deletions MvvmCross.Plugins/Color/MvvmCross.Plugin.Color.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/FieldBinding/MvvmCross.Plugin.FieldBinding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.FieldBinding</AssemblyName>
<RootNamespace>MvvmCross.Plugin.FieldBinding</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/Json/MvvmCross.Plugin.Json.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.Json</AssemblyName>
<RootNamespace>MvvmCross.Plugin.Json</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/JsonLocalization/MvvmCross.Plugin.JsonLocalization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.JsonLocalization</AssemblyName>
<RootNamespace>MvvmCross.Plugin.JsonLocalization</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/Messenger/MvvmCross.Plugin.Messenger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.Messenger</AssemblyName>
<RootNamespace>MvvmCross.Plugin.Messenger</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/MethodBinding/MvvmCross.Plugin.MethodBinding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.MethodBinding</AssemblyName>
<RootNamespace>MvvmCross.Plugin.MethodBinding</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
4 changes: 2 additions & 2 deletions MvvmCross.Plugins/ResourceLoader/MvvmCross.Plugin.ResourceLoader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Plugins/ResxLocalization/MvvmCross.Plugin.ResxLocalization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Plugin.ResxLocalization</AssemblyName>
<RootNamespace>MvvmCross.Plugin.ResxLocalization</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
4 changes: 2 additions & 2 deletions MvvmCross.Plugins/Visibility/MvvmCross.Plugin.Visibility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Tests/MvvmCross.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>MvvmCross.Tests</AssemblyName>
<RootNamespace>MvvmCross.Tests</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.Wpf/MvvmCross.Platforms.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFramework>net8.0-windows</TargetFramework>
<AssemblyName>MvvmCross.Platforms.Wpf</AssemblyName>
<RootNamespace>MvvmCross.Platforms.Wpf</RootNamespace>
<Description>MvvmCross is the .NET MVVM framework for cross-platform solutions, including Xamarin iOS, Xamarin Android, Xamarin Forms, Windows and Mac.
Expand Down
6 changes: 3 additions & 3 deletions MvvmCross/MvvmCross.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-tvos;net7.0-macos;net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-tvos;net8.0-macos</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-tvos;net8.0-macos</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -22,7 +22,7 @@ This package contains the 'Core' libraries for MvvmCross</Description>
<None Include="readme.txt" pack="true" PackagePath="." />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<Compile Include="Platforms\Netstandard\**\*.cs" />
<Compile Include="Platforms\Console\**\*.cs" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/MvvmCross.UnitTest/MvvmCross.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/Plugins.Color.UnitTest/MvvmCross.Plugins.Color.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.Plugins.Color.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.Plugins.Color.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/Plugins.JsonLocalization.UnitTest/MvvmCross.Plugins.JsonLocalization.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.Plugins.JsonLocalization.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.Plugins.JsonLocalization.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/Plugins.Messenger.UnitTest/MvvmCross.Plugins.Messenger.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.Plugins.Messenger.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.Plugins.Messenger.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/Plugins.ResourceLoader.UnitTest/MvvmCross.Plugins.ResourceLoader.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.Plugins.ResourceLoader.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.Plugins.ResourceLoader.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/Plugins.ResxLocalization.UnitTest/MvvmCross.Plugins.ResxLocalization.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.Plugins.ResxLocalization.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.Plugins.ResxLocalization.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/Plugins.Visibility.UnitTest/MvvmCross.Plugins.Visibility.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>MvvmCross.Plugins.Visibility.UnitTest</AssemblyName>
<RootNamespace>MvvmCross.Plugins.Visibility.UnitTest</RootNamespace>
Expand Down
Loading