diff --git a/global.json b/global.json index 8de663287e..efcccd3369 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", - "Uno.Sdk": "5.3.96" + "Uno.Sdk": "5.5.49" } } diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4a6f9cad4e..0f601ec6a9 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -19,6 +19,7 @@ + @@ -49,7 +50,7 @@ - + diff --git a/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs b/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs index ad02ae0fe8..0c4d32a94d 100644 --- a/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs +++ b/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs @@ -1,4 +1,6 @@ - +#if WINDOWS +using Microsoft.Identity.Client.Desktop; +#endif using Uno.Extensions.Logging; using LogLevel = Microsoft.Extensions.Logging.LogLevel; #if UNO_EXT_MSAL @@ -46,6 +48,11 @@ public void Build() if (Logger.IsEnabled(LogLevel.Trace)) Logger.LogTraceMessage($"Configuring Web RedirectUri"); builder.WithWebRedirectUri(); } + +#if WINDOWS + builder.WithWindowsEmbeddedBrowserSupport(); +#endif + builder.WithUnoHelpers(); _pca = builder.Build(); 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 0fe361c645..36dbd03ed5 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 @@ -65,6 +65,10 @@ + + + + diff --git a/src/Uno.Extensions.Authentication.MSAL/build/Package.targets b/src/Uno.Extensions.Authentication.MSAL/build/Package.targets index 3957411246..90724885af 100644 --- a/src/Uno.Extensions.Authentication.MSAL/build/Package.targets +++ b/src/Uno.Extensions.Authentication.MSAL/build/Package.targets @@ -7,32 +7,4 @@ $(DefineConstants);UNO_EXT_MSAL - - - - - <_WebView2CoreFilesToExclude Include="@(ResolvedFileToPublish)" Condition="'%(Filename)' == 'Microsoft.Web.WebView2.Core'"/> - - - <_WebView2CoreFilesToExclude Remove="@(_WebView2CoreFilesToExclude)" Condition="$([System.String]::Copy(%(FullPath)).Contains('.nuget'))"/> - - - - - - - - - <_WebView2CoreOutputsToExclude Include="@(PackagingOutputs)" Condition="'%(Filename)' == 'Microsoft.Web.WebView2.Core'"/> - - - <_WebView2CoreOutputsToExclude Remove="@(_WebView2CoreOutputsToExclude)" Condition="$([System.String]::Copy(%(FullPath)).Contains('.nuget'))"/> - - - -