From c781bfe9849eeab25a99abf31fdd00a3ffe8a68b Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Fri, 7 Jan 2022 14:47:10 -0800 Subject: [PATCH 1/4] Bump .NET MAUI P11 final version --- Directory.build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.build.props b/Directory.build.props index 26b1400..31a2154 100644 --- a/Directory.build.props +++ b/Directory.build.props @@ -1,5 +1,5 @@ - 6.0.101-preview.11.2082 + 6.0.101-preview.11.2349 From 7dabe6f296dc55968ff3807a353da1803028cca5 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Fri, 7 Jan 2022 14:47:41 -0800 Subject: [PATCH 2/4] Update Microsoft.NetConf2021.Maui.csproj --- src/Mobile/Microsoft.NetConf2021.Maui.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mobile/Microsoft.NetConf2021.Maui.csproj b/src/Mobile/Microsoft.NetConf2021.Maui.csproj index f0936ba..48b82cd 100644 --- a/src/Mobile/Microsoft.NetConf2021.Maui.csproj +++ b/src/Mobile/Microsoft.NetConf2021.Maui.csproj @@ -47,8 +47,8 @@ - - + + From 0d99cb4be6c288cc8e43a9d38c51bedd3509cee4 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Fri, 7 Jan 2022 14:48:02 -0800 Subject: [PATCH 3/4] Update NetPodsMauiBlazor.csproj --- src/MobileBlazor/mauiapp/NetPodsMauiBlazor.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MobileBlazor/mauiapp/NetPodsMauiBlazor.csproj b/src/MobileBlazor/mauiapp/NetPodsMauiBlazor.csproj index d2d7b41..aae4eba 100644 --- a/src/MobileBlazor/mauiapp/NetPodsMauiBlazor.csproj +++ b/src/MobileBlazor/mauiapp/NetPodsMauiBlazor.csproj @@ -43,8 +43,8 @@ - - + + From 87505e4a45538f3b79a005486f26271efe83d122 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Fri, 7 Jan 2022 15:13:54 -0800 Subject: [PATCH 4/4] .NET 6 updates --- .../Platforms/Android/Services/MediaPlayerService.cs | 1 + src/Mobile/Services/EssentialsExtensions.cs | 11 ----------- .../ListenTogether.Application.csproj | 2 +- .../ListenTogether.Hub/ListenTogether.Hub.csproj | 6 +++--- .../ListenTogether.Infrastructure.csproj | 6 +++--- src/Services/Podcasts/Podcast.API/Podcast.API.csproj | 4 ++-- .../Podcast.Infrastructure.csproj | 6 +++--- .../Podcast.Ingestion.Worker.csproj | 4 ++-- .../Podcast.Updater.Worker.csproj | 4 ++-- src/Web/Client/Podcast.Client.csproj | 4 ++-- src/Web/Components/Podcast.Components.Maui.csproj | 4 ++-- src/Web/Components/Podcast.Components.csproj | 4 ++-- src/Web/Pages/Podcast.Pages.Maui.csproj | 2 +- src/Web/Pages/Podcast.Pages.csproj | 2 +- src/Web/Server/Podcast.Server.csproj | 2 +- 15 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/Mobile/Platforms/Android/Services/MediaPlayerService.cs b/src/Mobile/Platforms/Android/Services/MediaPlayerService.cs index 586efb1..1d24863 100644 --- a/src/Mobile/Platforms/Android/Services/MediaPlayerService.cs +++ b/src/Mobile/Platforms/Android/Services/MediaPlayerService.cs @@ -11,6 +11,7 @@ using Android.Graphics; using System; using System.Threading.Tasks; using System.Collections.Generic; +using Microsoft.Maui.Platform; namespace Microsoft.NetConf2021.Maui.Platforms.Android.Services { diff --git a/src/Mobile/Services/EssentialsExtensions.cs b/src/Mobile/Services/EssentialsExtensions.cs index e36853c..2c836d5 100644 --- a/src/Mobile/Services/EssentialsExtensions.cs +++ b/src/Mobile/Services/EssentialsExtensions.cs @@ -18,8 +18,6 @@ namespace Microsoft.Maui.Essentials IEssentialsBuilder OnAppAction(Action action); IEssentialsBuilder UseVersionTracking(); - - IEssentialsBuilder UseLegacySecureStorage(); } public static class EssentialsExtensions @@ -121,8 +119,6 @@ namespace Microsoft.Maui.Essentials #if WINDOWS Platform.MapServiceToken = _essentialsBuilder.MapServiceToken; -#elif __ANDROID__ - SecureStorage.LegacyKeyHashFallback = _essentialsBuilder.UseLegaceSecureStorage; #endif AppActions.OnAppAction += HandleOnAppAction; @@ -155,7 +151,6 @@ namespace Microsoft.Maui.Essentials internal bool TrackVersions; #pragma warning disable CS0414 // Remove unread private members - internal bool UseLegaceSecureStorage; internal string MapServiceToken; #pragma warning restore CS0414 // Remove unread private members @@ -182,12 +177,6 @@ namespace Microsoft.Maui.Essentials TrackVersions = true; return this; } - - public IEssentialsBuilder UseLegacySecureStorage() - { - UseLegaceSecureStorage = true; - return this; - } } } } diff --git a/src/Services/ListenTogether/ListenTogether.Application/ListenTogether.Application.csproj b/src/Services/ListenTogether/ListenTogether.Application/ListenTogether.Application.csproj index 4c4598b..e0323bc 100644 --- a/src/Services/ListenTogether/ListenTogether.Application/ListenTogether.Application.csproj +++ b/src/Services/ListenTogether/ListenTogether.Application/ListenTogether.Application.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Services/ListenTogether/ListenTogether.Hub/ListenTogether.Hub.csproj b/src/Services/ListenTogether/ListenTogether.Hub/ListenTogether.Hub.csproj index a6b1596..6504706 100644 --- a/src/Services/ListenTogether/ListenTogether.Hub/ListenTogether.Hub.csproj +++ b/src/Services/ListenTogether/ListenTogether.Hub/ListenTogether.Hub.csproj @@ -10,12 +10,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Services/ListenTogether/ListenTogether.Infrastructure/ListenTogether.Infrastructure.csproj b/src/Services/ListenTogether/ListenTogether.Infrastructure/ListenTogether.Infrastructure.csproj index d6c5b28..d7f30b9 100644 --- a/src/Services/ListenTogether/ListenTogether.Infrastructure/ListenTogether.Infrastructure.csproj +++ b/src/Services/ListenTogether/ListenTogether.Infrastructure/ListenTogether.Infrastructure.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/Services/Podcasts/Podcast.API/Podcast.API.csproj b/src/Services/Podcasts/Podcast.API/Podcast.API.csproj index 33a8795..e0305a5 100644 --- a/src/Services/Podcasts/Podcast.API/Podcast.API.csproj +++ b/src/Services/Podcasts/Podcast.API/Podcast.API.csproj @@ -11,11 +11,11 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Services/Podcasts/Podcast.Infrastructure/Podcast.Infrastructure.csproj b/src/Services/Podcasts/Podcast.Infrastructure/Podcast.Infrastructure.csproj index 0317d87..2752920 100644 --- a/src/Services/Podcasts/Podcast.Infrastructure/Podcast.Infrastructure.csproj +++ b/src/Services/Podcasts/Podcast.Infrastructure/Podcast.Infrastructure.csproj @@ -7,12 +7,12 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Services/Podcasts/Podcast.Ingestion.Worker/Podcast.Ingestion.Worker.csproj b/src/Services/Podcasts/Podcast.Ingestion.Worker/Podcast.Ingestion.Worker.csproj index 4ee34b5..89370ed 100644 --- a/src/Services/Podcasts/Podcast.Ingestion.Worker/Podcast.Ingestion.Worker.csproj +++ b/src/Services/Podcasts/Podcast.Ingestion.Worker/Podcast.Ingestion.Worker.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/Services/Podcasts/Podcast.Updater.Worker/Podcast.Updater.Worker.csproj b/src/Services/Podcasts/Podcast.Updater.Worker/Podcast.Updater.Worker.csproj index 1b11c9a..f634e7a 100644 --- a/src/Services/Podcasts/Podcast.Updater.Worker/Podcast.Updater.Worker.csproj +++ b/src/Services/Podcasts/Podcast.Updater.Worker/Podcast.Updater.Worker.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/src/Web/Client/Podcast.Client.csproj b/src/Web/Client/Podcast.Client.csproj index 6b8ba3f..bec7ff5 100644 --- a/src/Web/Client/Podcast.Client.csproj +++ b/src/Web/Client/Podcast.Client.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Web/Components/Podcast.Components.Maui.csproj b/src/Web/Components/Podcast.Components.Maui.csproj index 6832626..a5d75d8 100644 --- a/src/Web/Components/Podcast.Components.Maui.csproj +++ b/src/Web/Components/Podcast.Components.Maui.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/Web/Components/Podcast.Components.csproj b/src/Web/Components/Podcast.Components.csproj index 74d5d91..93c45e2 100644 --- a/src/Web/Components/Podcast.Components.csproj +++ b/src/Web/Components/Podcast.Components.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Web/Pages/Podcast.Pages.Maui.csproj b/src/Web/Pages/Podcast.Pages.Maui.csproj index fdeb2b8..cf83947 100644 --- a/src/Web/Pages/Podcast.Pages.Maui.csproj +++ b/src/Web/Pages/Podcast.Pages.Maui.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Web/Pages/Podcast.Pages.csproj b/src/Web/Pages/Podcast.Pages.csproj index a172396..d2a9bbe 100644 --- a/src/Web/Pages/Podcast.Pages.csproj +++ b/src/Web/Pages/Podcast.Pages.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Web/Server/Podcast.Server.csproj b/src/Web/Server/Podcast.Server.csproj index 6267758..7d95db6 100644 --- a/src/Web/Server/Podcast.Server.csproj +++ b/src/Web/Server/Podcast.Server.csproj @@ -10,7 +10,7 @@ - +