From c02b757d3d23869a22bf430703b7b8987efa18ed Mon Sep 17 00:00:00 2001 From: Nick Randolph Date: Fri, 7 Oct 2022 15:30:41 +1100 Subject: [PATCH] feat: Refactoring tfms --- Directory.Build.props | 50 ++++++++++++------- src/Directory.Build.props | 2 + ...ensions.Authentication.Msal.UI.Wasm.csproj | 5 +- ...o.Extensions.Authentication.Msal.UI.csproj | 6 +-- ...ions.Authentication.Msal.WinUI.Wasm.csproj | 3 +- ...xtensions.Authentication.Msal.WinUI.csproj | 6 +-- ...o.Extensions.Authentication.Oidc.UI.csproj | 6 +-- ...xtensions.Authentication.Oidc.WinUI.csproj | 6 +-- .../Uno.Extensions.Authentication.UI.csproj | 6 +-- ...Uno.Extensions.Authentication.WinUI.csproj | 6 +-- .../Uno.Extensions.Authentication.csproj | 5 +- .../Uno.Extensions.Configuration.csproj | 4 +- .../Uno.Extensions.Core.csproj | 3 +- .../Uno.Extensions.Hosting.UWP.Skia.csproj | 2 +- .../Uno.Extensions.Hosting.UWP.Wasm.csproj | 5 +- .../Uno.Extensions.Hosting.UWP.csproj | 5 +- .../Uno.Extensions.Hosting.WinUI.Skia.csproj | 2 +- .../Uno.Extensions.Hosting.WinUI.Wasm.csproj | 3 +- .../Uno.Extensions.Hosting.WinUI.csproj | 7 +-- .../Uno.Extensions.Hosting.csproj | 5 +- .../Uno.Extensions.Http.Refit.csproj | 6 +-- .../Uno.Extensions.Http.csproj | 8 ++- .../Uno.Extensions.Localization.UI.csproj | 6 +-- .../Uno.Extensions.Localization.WinUI.csproj | 6 +-- .../Uno.Extensions.Localization.csproj | 4 +- .../Uno.Extensions.Logging.Serilog.csproj | 7 +-- .../Uno.Extensions.Logging.UWP.Skia.csproj | 2 +- .../Uno.Extensions.Logging.UWP.Wasm.csproj | 5 +- .../Uno.Extensions.Logging.UWP.csproj | 5 +- .../Uno.Extensions.Logging.WinUI.Skia.csproj | 2 +- .../Uno.Extensions.Logging.WinUI.Wasm.csproj | 5 +- .../Uno.Extensions.Logging.WinUI.csproj | 6 +-- ...no.Extensions.Navigation.Toolkit.UI.csproj | 6 +-- ...Extensions.Navigation.Toolkit.WinUI.csproj | 6 +-- .../Uno.Extensions.Navigation.UI.csproj | 6 +-- .../Uno.Extensions.Navigation.WinUI.csproj | 6 +-- .../Uno.Extensions.Navigation.csproj | 4 +- .../Uno.Extensions.Reactive.Messaging.csproj | 7 +-- .../Uno.Extensions.Reactive.UI.WinUI.csproj | 5 +- .../Uno.Extensions.Reactive.UI.csproj | 5 +- .../Uno.Extensions.Reactive.csproj | 4 +- .../Uno.Extensions.Serialization.Http.csproj | 5 +- .../Uno.Extensions.Serialization.Refit.csproj | 6 +-- .../Uno.Extensions.Serialization.csproj | 5 +- .../Uno.Extensions.Storage.UI.csproj | 6 +-- .../Uno.Extensions.Storage.WinUI.csproj | 6 +-- .../Uno.Extensions.Storage.csproj | 8 +-- .../Directory.Packages.props | 2 +- src/tfms-all.props | 18 +++++++ src/tfms-default.props | 5 ++ src/tfms-uwp.props | 17 +++++++ src/tfms-winui.props | 17 +++++++ 52 files changed, 187 insertions(+), 156 deletions(-) create mode 100644 src/tfms-all.props create mode 100644 src/tfms-default.props create mode 100644 src/tfms-uwp.props create mode 100644 src/tfms-winui.props diff --git a/Directory.Build.props b/Directory.Build.props index d8dae6abcf..ccd9fafccc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,25 +1,39 @@  - - - all - runtime; build; native; contentfiles; analyzers - - - all - runtime; build; native; contentfiles; analyzers - - - - AllEnabledByDefault - + + - + True - \ No newline at end of file + + true + true + true + true + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fe9482d757..186ed4eb7e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,4 +1,6 @@ + + Uno Platform https://github.com/unoplatform/uno.extensions diff --git a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.Wasm.csproj b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.Wasm.csproj index ae17bbfa7e..cc28a2ec90 100644 --- a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.Wasm.csproj +++ b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.Wasm.csproj @@ -1,6 +1,7 @@  + + - netstandard2.0 false Uno.Extensions.Authentication.MSAL.UI Uno.Extensions.Authentication.MSAL.UI @@ -16,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.csproj b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.csproj index ecf35d864d..9dc5d4124c 100644 --- a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.csproj +++ b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.UI.csproj @@ -1,10 +1,8 @@  + + MSAL Authentication Extensions for the Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.Wasm.csproj b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.Wasm.csproj index dc5911176a..bd5b7eff1b 100644 --- a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.Wasm.csproj +++ b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.Wasm.csproj @@ -1,6 +1,7 @@  + + - netstandard2.0 false Uno.Extensions.Authentication.MSAL.WinUI Uno.Extensions.Authentication.MSAL.WinUI diff --git a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj index 02cb64e9c4..a5d47d2c52 100644 --- a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj +++ b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj @@ -1,10 +1,8 @@  + + MSAL Authentication Extensions for the Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false diff --git a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.UI.csproj b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.UI.csproj index 408e7ffc77..c0b7d57740 100644 --- a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.UI.csproj +++ b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.UI.csproj @@ -1,10 +1,8 @@  + + Oidc Authentication Extensions for the Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;netstandard2.1;net5.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj index c5a63664e3..8d16506d6b 100644 --- a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj +++ b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj @@ -1,10 +1,8 @@  + + Oidc Authentication Extensions for the Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false Uno.Extensions.Authentication.Oidc.WinUI diff --git a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.UI.csproj b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.UI.csproj index 92da8cdb9f..283a93cd37 100644 --- a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.UI.csproj +++ b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.UI.csproj @@ -1,10 +1,8 @@  + + Authentication Extensions for the Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj index 5734794d34..d039853d2f 100644 --- a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj +++ b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj @@ -1,10 +1,8 @@  + + Authentication Extensions for the Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false diff --git a/src/Uno.Extensions.Authentication/Uno.Extensions.Authentication.csproj b/src/Uno.Extensions.Authentication/Uno.Extensions.Authentication.csproj index bc94238775..09db5f085c 100644 --- a/src/Uno.Extensions.Authentication/Uno.Extensions.Authentication.csproj +++ b/src/Uno.Extensions.Authentication/Uno.Extensions.Authentication.csproj @@ -1,7 +1,8 @@ - + + + Authentication Extensions for the Uno Platform, UWP and WinUI. Reference Uno.Extensions.Authentication.UI (UWP) or Uno.Extensions.Authentication.WinUI (WinUI) from head projects - netstandard2.0 $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Configuration/Uno.Extensions.Configuration.csproj b/src/Uno.Extensions.Configuration/Uno.Extensions.Configuration.csproj index 307d776417..b488041ec4 100644 --- a/src/Uno.Extensions.Configuration/Uno.Extensions.Configuration.csproj +++ b/src/Uno.Extensions.Configuration/Uno.Extensions.Configuration.csproj @@ -1,9 +1,9 @@  + + Configuration Extensions for reading configuration and writing settings for the Uno Platform, UWP and WinUI - netstandard2.0 - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Core/Uno.Extensions.Core.csproj b/src/Uno.Extensions.Core/Uno.Extensions.Core.csproj index 92f969ec21..84d2078ecb 100644 --- a/src/Uno.Extensions.Core/Uno.Extensions.Core.csproj +++ b/src/Uno.Extensions.Core/Uno.Extensions.Core.csproj @@ -1,8 +1,7 @@  + - netstandard2.0 - Uno.Extensions diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Skia.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Skia.csproj index e41a6840b7..49812fb3ce 100644 --- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Skia.csproj +++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Skia.csproj @@ -1,7 +1,7 @@  + - netstandard2.0 false Uno.Extensions.Hosting.UWP skia diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Wasm.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Wasm.csproj index 3eefc0c87f..f5699a8c80 100644 --- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Wasm.csproj +++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.Wasm.csproj @@ -1,6 +1,7 @@  + + - netstandard2.0 false Uno.Extensions.Hosting.UWP Uno.Extensions.Hosting.UWP @@ -14,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.csproj index b2ca025b2b..99a2018194 100644 --- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.csproj +++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.UWP.csproj @@ -1,8 +1,7 @@  + + - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj index b91780f8af..04340006dd 100644 --- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj +++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj @@ -1,7 +1,7 @@  + - netstandard2.0 false Uno.Extensions.Hosting.WinUI skia diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Wasm.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Wasm.csproj index 11ef6d2b4d..21ec7a385d 100644 --- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Wasm.csproj +++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Wasm.csproj @@ -1,6 +1,7 @@ + + - netstandard2.0 false Uno.Extensions.Hosting.WinUI Uno.Extensions.Hosting.WinUI diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj index 608cc79c17..5f6145a653 100644 --- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj +++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj @@ -1,9 +1,6 @@  - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst - + + diff --git a/src/Uno.Extensions.Hosting/Uno.Extensions.Hosting.csproj b/src/Uno.Extensions.Hosting/Uno.Extensions.Hosting.csproj index a55fd5eea0..69dbbb8194 100644 --- a/src/Uno.Extensions.Hosting/Uno.Extensions.Hosting.csproj +++ b/src/Uno.Extensions.Hosting/Uno.Extensions.Hosting.csproj @@ -1,7 +1,8 @@ - + + + Reference Uno.Extensions.Hosting.UI (UWP) or Uno.Extensions.Hosting.WinUI (WinUI) - netstandard2.0 $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Http.Refit/Uno.Extensions.Http.Refit.csproj b/src/Uno.Extensions.Http.Refit/Uno.Extensions.Http.Refit.csproj index c59e7c903e..da9304d58b 100644 --- a/src/Uno.Extensions.Http.Refit/Uno.Extensions.Http.Refit.csproj +++ b/src/Uno.Extensions.Http.Refit/Uno.Extensions.Http.Refit.csproj @@ -1,11 +1,9 @@  + + HTTP Refit Extensions for registering Refit endpoints for Uno Platform, UWP and WinUI - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Http/Uno.Extensions.Http.csproj b/src/Uno.Extensions.Http/Uno.Extensions.Http.csproj index 611f85b2d1..2a2e36f996 100644 --- a/src/Uno.Extensions.Http/Uno.Extensions.Http.csproj +++ b/src/Uno.Extensions.Http/Uno.Extensions.Http.csproj @@ -1,11 +1,9 @@ - + + + HTTP Extensions for registering endpoints for Uno Platform, UWP and WinUI - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.UI.csproj b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.UI.csproj index 19ad0f6256..f9a7114db7 100644 --- a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.UI.csproj +++ b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.UI.csproj @@ -1,10 +1,8 @@  + + Localization Extensions for registering IStringLocalizer implementation for Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj index ce34ec2592..61dc5bc607 100644 --- a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj +++ b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj @@ -1,10 +1,8 @@  + + Localization Extensions for registering IStringLocalizer implementation for Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Localization/Uno.Extensions.Localization.csproj b/src/Uno.Extensions.Localization/Uno.Extensions.Localization.csproj index 231b7af491..3d57319b5c 100644 --- a/src/Uno.Extensions.Localization/Uno.Extensions.Localization.csproj +++ b/src/Uno.Extensions.Localization/Uno.Extensions.Localization.csproj @@ -1,9 +1,9 @@  + + Localization Extensions for the Uno Platform, UWP and WinUI. Reference Uno.Extensions.Localization.UI (UWP) or Uno.Extensions.Localization.WinUI (WinUI) from head projects - netstandard2.0 - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Logging.Serilog/Uno.Extensions.Logging.Serilog.csproj b/src/Uno.Extensions.Logging.Serilog/Uno.Extensions.Logging.Serilog.csproj index 00e647a3e6..019db282ea 100644 --- a/src/Uno.Extensions.Logging.Serilog/Uno.Extensions.Logging.Serilog.csproj +++ b/src/Uno.Extensions.Logging.Serilog/Uno.Extensions.Logging.Serilog.csproj @@ -1,12 +1,9 @@  + + Logging Extensions for configuring Serilog for Uno Platform, UWP and WinUI - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - - $(TargetFrameworks);net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Skia.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Skia.csproj index c4b9ecdf11..cff0e17d0a 100644 --- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Skia.csproj +++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Skia.csproj @@ -1,7 +1,7 @@  + - netstandard2.0 false Uno.Extensions.Logging.UWP skia diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Wasm.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Wasm.csproj index 40b63c6567..da438cae88 100644 --- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Wasm.csproj +++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.Wasm.csproj @@ -1,6 +1,7 @@ - + + + - netstandard2.0 false Uno.Extensions.Logging.UWP Uno.Extensions.Logging.UWP diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.csproj index 5487d9b9f5..0831f5d5b0 100644 --- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.csproj +++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.UWP.csproj @@ -1,8 +1,7 @@  + + - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj index 7abdd70ddb..60fc39eae2 100644 --- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj +++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj @@ -1,7 +1,7 @@  + - netstandard2.0 false Uno.Extensions.Logging.WinUI skia diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Wasm.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Wasm.csproj index 81ade6890d..7a3933f3a6 100644 --- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Wasm.csproj +++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Wasm.csproj @@ -1,6 +1,7 @@ - + + + - netstandard2.0 false Uno.Extensions.Logging.WinUI Uno.Extensions.Logging.WinUI diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj index 6227a4fcfa..674af1ed35 100644 --- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj +++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj @@ -1,9 +1,5 @@  - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst - + diff --git a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.UI.csproj b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.UI.csproj index fd42009566..6da350e284 100644 --- a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.UI.csproj +++ b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.UI.csproj @@ -1,10 +1,8 @@  + + Navigation Extensions for working with the Uno Toolkit on the Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj index 685b668766..2c7160a034 100644 --- a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj +++ b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj @@ -1,10 +1,8 @@  + + Navigation Extensions for working with the Uno Toolkit on the Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false diff --git a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.UI.csproj b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.UI.csproj index 6fa5044e86..4758607700 100644 --- a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.UI.csproj +++ b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.UI.csproj @@ -1,10 +1,8 @@  + + Navigation Extensions for the Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj index 7550db1f3a..22775e7fad 100644 --- a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj +++ b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj @@ -1,10 +1,8 @@  + + Navigation Extensions for the Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false diff --git a/src/Uno.Extensions.Navigation/Uno.Extensions.Navigation.csproj b/src/Uno.Extensions.Navigation/Uno.Extensions.Navigation.csproj index 1568437e1b..8eb7739676 100644 --- a/src/Uno.Extensions.Navigation/Uno.Extensions.Navigation.csproj +++ b/src/Uno.Extensions.Navigation/Uno.Extensions.Navigation.csproj @@ -1,9 +1,9 @@  + + Navigation Extensions for the Uno Platform, UWP and WinUI. Reference Uno.Extensions.Navigation.UI (UWP) or Uno.Extensions.Navigation.WinUI (WinUI) from head projects - netstandard2.0 - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Reactive.Messaging/Uno.Extensions.Reactive.Messaging.csproj b/src/Uno.Extensions.Reactive.Messaging/Uno.Extensions.Reactive.Messaging.csproj index 50739e2425..7669041ee6 100644 --- a/src/Uno.Extensions.Reactive.Messaging/Uno.Extensions.Reactive.Messaging.csproj +++ b/src/Uno.Extensions.Reactive.Messaging/Uno.Extensions.Reactive.Messaging.csproj @@ -1,8 +1,5 @@ - - - - netstandard2.0 - + + diff --git a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj index da6782e84d..fad6d1a3e4 100644 --- a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj +++ b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj @@ -1,13 +1,12 @@  + + Reactive Extensions for the Uno Platform (WinUI) - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false $(DefineConstants);WINUI Uno.Extensions.Reactive.WinUI diff --git a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.csproj b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.csproj index c52117d4e1..31cbde45af 100644 --- a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.csproj +++ b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.csproj @@ -1,13 +1,12 @@  + + Reactive Extensions for the Uno Platform (UWP) - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst Uno.Extensions.Reactive.UI diff --git a/src/Uno.Extensions.Reactive/Uno.Extensions.Reactive.csproj b/src/Uno.Extensions.Reactive/Uno.Extensions.Reactive.csproj index ad5869f0b2..4e5b837521 100644 --- a/src/Uno.Extensions.Reactive/Uno.Extensions.Reactive.csproj +++ b/src/Uno.Extensions.Reactive/Uno.Extensions.Reactive.csproj @@ -1,7 +1,7 @@ - + + - netstandard2.0 Reactive Extensions for the Uno Platform, UWP and WinUI $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Serialization.Refit/Uno.Extensions.Serialization.Refit.csproj b/src/Uno.Extensions.Serialization.Refit/Uno.Extensions.Serialization.Refit.csproj index 9e284ac69b..bc8e756b1d 100644 --- a/src/Uno.Extensions.Serialization.Refit/Uno.Extensions.Serialization.Refit.csproj +++ b/src/Uno.Extensions.Serialization.Refit/Uno.Extensions.Serialization.Refit.csproj @@ -1,11 +1,9 @@  + + Serialization Extensions for working with ISerializer with HTTP and Refit for the Uno Platform, UWP and WinUI - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst - $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Serialization/Uno.Extensions.Serialization.csproj b/src/Uno.Extensions.Serialization/Uno.Extensions.Serialization.csproj index d0de274a59..c5c9c94027 100644 --- a/src/Uno.Extensions.Serialization/Uno.Extensions.Serialization.csproj +++ b/src/Uno.Extensions.Serialization/Uno.Extensions.Serialization.csproj @@ -1,7 +1,8 @@ - + + + Serialization Extensions for working with ISerializer for the Uno Platform, UWP and WinUI - netstandard2.0 $(WarningsNotAsErrors);CS1591 diff --git a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.UI.csproj b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.UI.csproj index a8762a8847..acf2cb3fc8 100644 --- a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.UI.csproj +++ b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.UI.csproj @@ -1,10 +1,8 @@  + + Storage Extensions for Uno Platform (UWP) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);uap10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst diff --git a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj index cf463639e6..0c8f234fe0 100644 --- a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj +++ b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj @@ -1,10 +1,8 @@  + + Storage Extensions for Uno Platform (WinUI) - - $(UnoTargetFrameworkOverride) - netstandard2.0;xamarinios10;xamarinmac20;monoandroid11.0 - $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst false diff --git a/src/Uno.Extensions.Storage/Uno.Extensions.Storage.csproj b/src/Uno.Extensions.Storage/Uno.Extensions.Storage.csproj index 350c45338c..645a102d55 100644 --- a/src/Uno.Extensions.Storage/Uno.Extensions.Storage.csproj +++ b/src/Uno.Extensions.Storage/Uno.Extensions.Storage.csproj @@ -1,14 +1,16 @@  + + Storage Extensions for Uno Platform, UWP and WinUI netstandard2.0 - + $(WarningsNotAsErrors);CS1591 - + @@ -18,7 +20,7 @@ - + diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props index fb6322e453..794e886bda 100644 --- a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props +++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props @@ -52,4 +52,4 @@ - + \ No newline at end of file diff --git a/src/tfms-all.props b/src/tfms-all.props new file mode 100644 index 0000000000..eaee7b569e --- /dev/null +++ b/src/tfms-all.props @@ -0,0 +1,18 @@ + + + + + $(UnoTargetFrameworkOverride) + + + $(TargetFrameworks);netstandard2.0; + $(TargetFrameworks);xamarinios10 + $(TargetFrameworks);xamarinmac20 + $(TargetFrameworks);monoandroid11.0 + $(TargetFrameworks);uap10.0.18362 + $(TargetFrameworks);net6.0-ios + $(TargetFrameworks);net6.0-macos;net6.0-maccatalyst + $(TargetFrameworks);net6.0-android + $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0 + + diff --git a/src/tfms-default.props b/src/tfms-default.props new file mode 100644 index 0000000000..5176979c8d --- /dev/null +++ b/src/tfms-default.props @@ -0,0 +1,5 @@ + + + netstandard2.0 + + diff --git a/src/tfms-uwp.props b/src/tfms-uwp.props new file mode 100644 index 0000000000..7fe240c6e4 --- /dev/null +++ b/src/tfms-uwp.props @@ -0,0 +1,17 @@ + + + + + $(UnoTargetFrameworkOverride) + + + $(TargetFrameworks);netstandard2.0; + $(TargetFrameworks);xamarinios10 + $(TargetFrameworks);xamarinmac20 + $(TargetFrameworks);monoandroid11.0 + $(TargetFrameworks);uap10.0.18362 + $(TargetFrameworks);net6.0-ios + $(TargetFrameworks);net6.0-macos;net6.0-maccatalyst + $(TargetFrameworks);net6.0-android + + diff --git a/src/tfms-winui.props b/src/tfms-winui.props new file mode 100644 index 0000000000..f0d851a6e5 --- /dev/null +++ b/src/tfms-winui.props @@ -0,0 +1,17 @@ + + + + + $(UnoTargetFrameworkOverride) + + + $(TargetFrameworks);netstandard2.0; + $(TargetFrameworks);xamarinios10 + $(TargetFrameworks);xamarinmac20 + $(TargetFrameworks);monoandroid11.0 + $(TargetFrameworks);net6.0-ios + $(TargetFrameworks);net6.0-macos;net6.0-maccatalyst + $(TargetFrameworks);net6.0-android + $(TargetFrameworks);net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0 + +