From 9de68d1e96a731045f7bb0e5beb2ec4b41f6a8f6 Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Thu, 15 Dec 2022 09:35:28 +0000 Subject: [PATCH] Housekeeping Remove Unsupported Targets (#823) --- .github/workflows/ci-build.yml | 2 +- .github/workflows/release.yml | 2 +- src/Akavache.Core/Akavache.Core.csproj | 18 +++++++++--------- src/Akavache.Drawing/Akavache.Drawing.csproj | 4 ++-- src/Akavache.Mobile/Akavache.Mobile.csproj | 4 ++-- src/Akavache.Sqlite3/Akavache.Sqlite3.csproj | 6 +++--- ...rovalTests.AkavacheCore.net6.0.approved.txt | 2 +- ...alTests.AkavacheDrawing.net6.0.approved.txt | 2 +- ...alTests.AkavacheProject.net6.0.approved.txt | 2 +- src/Akavache.Tests/Akavache.Tests.csproj | 6 +++--- src/Akavache.sln | 1 + src/Akavache/Akavache.csproj | 6 +++--- src/Directory.build.props | 2 +- src/Directory.build.targets | 8 ++++---- version.json | 2 +- 15 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 5e726ff5f..ed247b909 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -15,5 +15,5 @@ jobs: with: configuration: Release productNamespacePrefix: "Akavache" - useVisualStudioPreview: false + useVisualStudioPreview: true useMauiCheckDotNetTool: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 778a84a8a..b7370fb81 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: with: configuration: Release productNamespacePrefix: "Akavache" - useVisualStudioPreview: false + useVisualStudioPreview: true useMauiCheckDotNetTool: false secrets: SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }} diff --git a/src/Akavache.Core/Akavache.Core.csproj b/src/Akavache.Core/Akavache.Core.csproj index 76dcc374a..78d2702bf 100644 --- a/src/Akavache.Core/Akavache.Core.csproj +++ b/src/Akavache.Core/Akavache.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid11.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst - $(TargetFrameworks);net462;uap10.0.16299;net6.0-windows + netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst + $(TargetFrameworks);net462;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0 Akavache.Core Akavache An asynchronous, persistent key-value store for desktop and mobile applications on .NET @@ -10,7 +10,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -55,12 +55,12 @@ - + - + @@ -77,7 +77,7 @@ - + @@ -87,7 +87,7 @@ - + diff --git a/src/Akavache.Drawing/Akavache.Drawing.csproj b/src/Akavache.Drawing/Akavache.Drawing.csproj index 6e73e3a30..edbd5666e 100644 --- a/src/Akavache.Drawing/Akavache.Drawing.csproj +++ b/src/Akavache.Drawing/Akavache.Drawing.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;MonoAndroid11.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst - $(TargetFrameworks);net462;uap10.0.16299;net6.0-windows + netstandard2.0;netstandard2.1;MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst + $(TargetFrameworks);net462;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0 Akavache.Drawing Akavache An asynchronous, persistent key-value store for desktop and mobile applications on .NET diff --git a/src/Akavache.Mobile/Akavache.Mobile.csproj b/src/Akavache.Mobile/Akavache.Mobile.csproj index ce37061ba..f3c7f5077 100644 --- a/src/Akavache.Mobile/Akavache.Mobile.csproj +++ b/src/Akavache.Mobile/Akavache.Mobile.csproj @@ -1,8 +1,8 @@  - netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid11.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst - $(TargetFrameworks);net462;uap10.0.16299 + netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst + $(TargetFrameworks);net462 Akavache.Mobile Akavache.Mobile An asynchronous, persistent key-value store for desktop and mobile applications on .NET diff --git a/src/Akavache.Sqlite3/Akavache.Sqlite3.csproj b/src/Akavache.Sqlite3/Akavache.Sqlite3.csproj index eb53893ee..3a8db9855 100644 --- a/src/Akavache.Sqlite3/Akavache.Sqlite3.csproj +++ b/src/Akavache.Sqlite3/Akavache.Sqlite3.csproj @@ -1,8 +1,8 @@  - netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid11.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst - $(TargetFrameworks);net462;uap10.0.16299 + netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst + $(TargetFrameworks);net462 Akavache.Sqlite3 Akavache.Sqlite3 Akavache Sqlite3 @@ -18,7 +18,7 @@ - + diff --git a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt index 6fbcff54c..60e4f2388 100644 --- a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt +++ b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt @@ -4,7 +4,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Akavache.Mobile")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Akavache.Sqlite3")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Akavache.Tests")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName="")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")] namespace Akavache { public class AkavacheHttpMixin : Akavache.IAkavacheHttpMixin diff --git a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheDrawing.net6.0.approved.txt b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheDrawing.net6.0.approved.txt index 6fa5f0336..b519a9d67 100644 --- a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheDrawing.net6.0.approved.txt +++ b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheDrawing.net6.0.approved.txt @@ -1,5 +1,5 @@ [assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/akavache")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName=".NET Standard 2.1")] namespace Akavache { public static class BitmapImageMixin diff --git a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheProject.net6.0.approved.txt b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheProject.net6.0.approved.txt index 0504468d0..bf8d2ae82 100644 --- a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheProject.net6.0.approved.txt +++ b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheProject.net6.0.approved.txt @@ -1,5 +1,5 @@ [assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/akavache")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName="")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")] namespace Akavache { public class Registrations diff --git a/src/Akavache.Tests/Akavache.Tests.csproj b/src/Akavache.Tests/Akavache.Tests.csproj index ea5e6bc73..3e6e70a82 100644 --- a/src/Akavache.Tests/Akavache.Tests.csproj +++ b/src/Akavache.Tests/Akavache.Tests.csproj @@ -8,7 +8,7 @@ - + @@ -17,9 +17,9 @@ - + - + all diff --git a/src/Akavache.sln b/src/Akavache.sln index f58d080ba..7e1d934e5 100644 --- a/src/Akavache.sln +++ b/src/Akavache.sln @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.build.targets = Directory.build.targets global.json = global.json stylecop.json = stylecop.json + ..\version.json = ..\version.json EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akavache.Core", "Akavache.Core\Akavache.Core.csproj", "{C5D0B6E1-38B4-45C1-B9CA-2C75E0401E53}" diff --git a/src/Akavache/Akavache.csproj b/src/Akavache/Akavache.csproj index 88b2c623f..5b3d2065a 100644 --- a/src/Akavache/Akavache.csproj +++ b/src/Akavache/Akavache.csproj @@ -1,8 +1,8 @@  - netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid10.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst - $(TargetFrameworks);net462;uap10.0.16299 + netstandard2.0;netstandard2.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst + $(TargetFrameworks);net462 Akavache Akavache An asynchronous, persistent key-value store for desktop and mobile applications on .NET @@ -21,7 +21,7 @@ - + diff --git a/src/Directory.build.props b/src/Directory.build.props index 29e3858f5..0c9686b01 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -50,7 +50,7 @@ - + diff --git a/src/Directory.build.targets b/src/Directory.build.targets index be00ad844..8cef42fe8 100644 --- a/src/Directory.build.targets +++ b/src/Directory.build.targets @@ -15,16 +15,16 @@ $(DefineConstants);MONO;COCOA - + $(DefineConstants);MONO;COCOA $(DefineConstants);MONO;UIKIT;COCOA;XAMARIN_MOBILE - + $(DefineConstants);MONO;UIKIT;COCOA;XAMARIN_MOBILE - + $(DefineConstants);MONO;UIKIT;COCOA;XAMARIN_MOBILE @@ -33,7 +33,7 @@ $(DefineConstants);MONO;ANDROID;XAMARIN_MOBILE - + $(DefineConstants);MONO;ANDROID;XAMARIN_MOBILE diff --git a/version.json b/version.json index 2d29982c5..53136abfc 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "9.0", + "version": "9.1", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of master "^refs/heads/develop$", // we release out of develop