From e0c7015e33501953b693f73c250b0cb9f0da7409 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Fri, 11 Mar 2022 10:57:17 -0800 Subject: [PATCH] all new nugets and .net 6 support --- .../MonkeyCache.FileStore.csproj | 26 +++++++++++++---- .../MonkeyCache.LiteDB.csproj | 29 ++++++++++++++----- .../MonkeyCache.SQLite.csproj | 28 +++++++++++++----- .../MonkeyCache.TestApp.Android.csproj | 6 ++-- .../Resources/Resource.designer.cs | 3 +- .../MonkeyCache.TestApp.AspNetCore.csproj | 4 +-- .../MonkeyCache.TestApp.UWP.csproj | 6 ++-- .../MonkeyCache.TestApp.iOS.csproj | 2 +- .../MonkeyCache.TestApp.csproj | 4 +-- .../MonkeyCache.TestsFileStore.csproj | 2 +- .../MonkeyCache.TestsLiteDB.csproj | 4 +-- .../MonkeyCache.TestsSQLite.csproj | 4 +-- src/MonkeyCache/MonkeyCache.csproj | 29 ++++++++++++++----- 13 files changed, 99 insertions(+), 48 deletions(-) diff --git a/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj b/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj index e789b4d..4843501 100644 --- a/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj +++ b/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj @@ -1,8 +1,9 @@ - + - netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299 - $(AssemblyName) ($(TargetFramework)) + netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-maccatalyst + $(TargetFrameworks);uap10.0.19041;net6.0-windows10.0.19041;net461 + $(AssemblyName) ($(TargetFramework)) 1.0.0.0 1.0.0.0 1.0.0.0 @@ -22,7 +23,7 @@ See: https://github.com/jamesmontemagno/monkey-cache https://github.com/jamesmontemagno/monkey-cache - 2020 Refractored LLC & James Montemagno + 2022 Refractored LLC & James Montemagno MonkeyCache.FileStore @@ -45,11 +46,24 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + + + 10.0 + 10.0 + 13.1 + 10.14 + 21.0 + 10.0.16299.0 + 10.0.16299.0 + + + 10.0.16299.0 + + - + diff --git a/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj b/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj index 05930a6..7fc68c1 100644 --- a/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj +++ b/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj @@ -1,8 +1,9 @@ - + - netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299 - $(AssemblyName) ($(TargetFramework)) + netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-maccatalyst + $(TargetFrameworks);uap10.0.19041;net6.0-windows10.0.19041;net461 + $(AssemblyName) ($(TargetFramework)) 1.0.0.0 1.0.0.0 1.0.0.0 @@ -22,7 +23,7 @@ See: https://github.com/jamesmontemagno/monkey-cache https://github.com/jamesmontemagno/monkey-cache - 2020 Refractored LLC & James Montemagno + 2022 Refractored LLC & James Montemagno MonkeyCache.LiteDB @@ -45,13 +46,25 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + + + 10.0 + 10.0 + 13.1 + 10.14 + 21.0 + 10.0.16299.0 + 10.0.16299.0 + + + 10.0.16299.0 + - - - + + + diff --git a/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj b/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj index bbc760e..c8e826c 100644 --- a/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj +++ b/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj @@ -1,8 +1,9 @@ - + - netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299 - $(AssemblyName) ($(TargetFramework)) + netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-maccatalyst + $(TargetFrameworks);uap10.0.19041;net6.0-windows10.0.19041;net461 + $(AssemblyName) ($(TargetFramework)) 1.0.0.0 1.0.0.0 1.0.0.0 @@ -19,7 +20,7 @@ xamarin, windows, ios, android, cache, http 🙊 MonkeyCache.SQLite - A .NET Caching Library A simple caching library to cache any data structure for a specific amount of time in any .NET application. Additionally, offers simple HTTP methods for caching web request data. Powered by SQLite. - 2020 Refractored LLC & James Montemagno + 2022 Refractored LLC & James Montemagno https://github.com/jamesmontemagno/monkey-cache See: https://github.com/jamesmontemagno/monkey-cache @@ -43,13 +44,24 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + - + + 10.0 + 10.0 + 13.1 + 10.14 + 21.0 + 10.0.16299.0 + 10.0.16299.0 + + + 10.0.16299.0 + - - + + diff --git a/src/MonkeyCache.TestApp.Android/MonkeyCache.TestApp.Android.csproj b/src/MonkeyCache.TestApp.Android/MonkeyCache.TestApp.Android.csproj index f9d409d..4dcbb18 100644 --- a/src/MonkeyCache.TestApp.Android/MonkeyCache.TestApp.Android.csproj +++ b/src/MonkeyCache.TestApp.Android/MonkeyCache.TestApp.Android.csproj @@ -8,7 +8,7 @@ Library MonkeyCache.TestApp.Droid MonkeyCache.TestApp.Android - v8.1 + v12.0 True Resources\Resource.designer.cs Resource @@ -48,10 +48,10 @@ - 5.0.8 + 5.0.11 - 1.7.335 + 1.8.116 diff --git a/src/MonkeyCache.TestApp.Android/Resources/Resource.designer.cs b/src/MonkeyCache.TestApp.Android/Resources/Resource.designer.cs index 4252e30..96001f8 100644 --- a/src/MonkeyCache.TestApp.Android/Resources/Resource.designer.cs +++ b/src/MonkeyCache.TestApp.Android/Resources/Resource.designer.cs @@ -2,7 +2,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,7 +14,7 @@ namespace MonkeyCache.TestApp.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.99.54")] public partial class Resource { diff --git a/src/MonkeyCache.TestApp.AspNetCore/MonkeyCache.TestApp.AspNetCore.csproj b/src/MonkeyCache.TestApp.AspNetCore/MonkeyCache.TestApp.AspNetCore.csproj index 21e72ea..f3cc6a2 100644 --- a/src/MonkeyCache.TestApp.AspNetCore/MonkeyCache.TestApp.AspNetCore.csproj +++ b/src/MonkeyCache.TestApp.AspNetCore/MonkeyCache.TestApp.AspNetCore.csproj @@ -5,12 +5,12 @@ - + - + diff --git a/src/MonkeyCache.TestApp.UWP/MonkeyCache.TestApp.UWP.csproj b/src/MonkeyCache.TestApp.UWP/MonkeyCache.TestApp.UWP.csproj index fde6979..9e83a52 100644 --- a/src/MonkeyCache.TestApp.UWP/MonkeyCache.TestApp.UWP.csproj +++ b/src/MonkeyCache.TestApp.UWP/MonkeyCache.TestApp.UWP.csproj @@ -11,7 +11,7 @@ MonkeyCache.TestApp.UWP en-US UAP - 10.0.16299.0 + 10.0.19041.0 10.0.16299.0 14 true @@ -149,10 +149,10 @@ - 5.0.8 + 5.0.11 - 1.7.335 + 1.8.116 diff --git a/src/MonkeyCache.TestApp.iOS/MonkeyCache.TestApp.iOS.csproj b/src/MonkeyCache.TestApp.iOS/MonkeyCache.TestApp.iOS.csproj index 796a091..0b10bc3 100644 --- a/src/MonkeyCache.TestApp.iOS/MonkeyCache.TestApp.iOS.csproj +++ b/src/MonkeyCache.TestApp.iOS/MonkeyCache.TestApp.iOS.csproj @@ -123,7 +123,7 @@ 5.0.10 - 1.7.335 + 1.8.116 diff --git a/src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj b/src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj index b09f311..8048718 100644 --- a/src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj +++ b/src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/MonkeyCache.TestsFileStore/MonkeyCache.TestsFileStore.csproj b/src/MonkeyCache.TestsFileStore/MonkeyCache.TestsFileStore.csproj index 3192b4c..08b9c0d 100644 --- a/src/MonkeyCache.TestsFileStore/MonkeyCache.TestsFileStore.csproj +++ b/src/MonkeyCache.TestsFileStore/MonkeyCache.TestsFileStore.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/MonkeyCache.TestsLiteDB/MonkeyCache.TestsLiteDB.csproj b/src/MonkeyCache.TestsLiteDB/MonkeyCache.TestsLiteDB.csproj index 10af6ee..69df677 100644 --- a/src/MonkeyCache.TestsLiteDB/MonkeyCache.TestsLiteDB.csproj +++ b/src/MonkeyCache.TestsLiteDB/MonkeyCache.TestsLiteDB.csproj @@ -17,11 +17,11 @@ - + - + diff --git a/src/MonkeyCache.TestsSQLite/MonkeyCache.TestsSQLite.csproj b/src/MonkeyCache.TestsSQLite/MonkeyCache.TestsSQLite.csproj index 0de4087..c4b1e31 100644 --- a/src/MonkeyCache.TestsSQLite/MonkeyCache.TestsSQLite.csproj +++ b/src/MonkeyCache.TestsSQLite/MonkeyCache.TestsSQLite.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/MonkeyCache/MonkeyCache.csproj b/src/MonkeyCache/MonkeyCache.csproj index 92d8323..a0bedda 100644 --- a/src/MonkeyCache/MonkeyCache.csproj +++ b/src/MonkeyCache/MonkeyCache.csproj @@ -1,7 +1,8 @@ - + - netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299 - $(AssemblyName) ($(TargetFramework)) + netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-maccatalyst + $(TargetFrameworks);uap10.0.19041;net6.0-windows10.0.19041;net461 + $(AssemblyName) ($(TargetFramework)) 1.0.0.0 1.0.0.0 1.0.0.0 @@ -18,7 +19,7 @@ xamarin, windows, ios, android, cache, http 🐒 MonkeyCache.Core - A .NET Caching Library A simple caching library to cache any data structure for a specific amount of time in any .NET application. Additionally, offers simple HTTP methods for caching web request data. - 2020 Refractored LLC & James Montemagno + 2022 Refractored LLC & James Montemagno https://github.com/jamesmontemagno/monkey-cache See: https://github.com/jamesmontemagno/monkey-cache @@ -42,12 +43,24 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + - + + 10.0 + 10.0 + 13.1 + 10.14 + 21.0 + 10.0.16299.0 + 10.0.16299.0 + + + 10.0.16299.0 + - - + + +