diff --git a/Directory.Build.targets b/Directory.Build.targets index 90fe9f9a..e70c3825 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -20,6 +20,7 @@ + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 755a1cec..a1f8d47c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -21,6 +21,7 @@ + diff --git a/build/Microsoft.PowerBI.Build.targets b/build/Microsoft.PowerBI.Build.targets index 22723270..6d7f8a45 100644 --- a/build/Microsoft.PowerBI.Build.targets +++ b/build/Microsoft.PowerBI.Build.targets @@ -16,6 +16,7 @@ Licensed under the MIT License. + @@ -29,10 +30,17 @@ Licensed under the MIT License. + - + + $(OutputPath)\MSAL\netstandard2.0 + + + $(OutputPath)\MSAL\netstandard2.0 + + $(OutputPath)\MSAL\netstandard2.0 diff --git a/build/Microsoft.PowerBI.Packaging.targets b/build/Microsoft.PowerBI.Packaging.targets index 3bdabca7..2cc875cc 100644 --- a/build/Microsoft.PowerBI.Packaging.targets +++ b/build/Microsoft.PowerBI.Packaging.targets @@ -45,8 +45,8 @@ Licensed under the MIT License. - - + + <_PackageFiles Include="$(OutputPath)\settings.json" Condition="Exists('$(OutputPath)\settings.json') AND '$(NoDependentAssemblies)' != 'true'"> @@ -66,11 +66,11 @@ Licensed under the MIT License. true lib\$(TargetFramework) - - <_PackageFiles Include="$(OutputPath)\MSAL\**\*.*" Condition="Exists('$(OutputPath)\MSAL')"> + + <_PackageFiles Include="$(OutputPath)\MSAL\netstandard2.0\*.*" Condition="Exists('$(OutputPath)\MSAL\netstandard2.0')"> Content true - lib\$(TargetFramework)\MSAL\%(RecursiveDir) + lib\$(TargetFramework) <_PackageFiles Include="$(OutputPath)\$(LangName)\**\*.*" Condition="'$(NoHelpGen)' != 'true'"> diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 8cf7849e..845e9413 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -29,7 +29,10 @@ param # MSBuild properties to execute build with. Default is @{'GenerateFullPaths'='true'}. [ValidateNotNull()] - [Hashtable] $MSBuildProperties = @{'GenerateFullPaths' = 'true' }, + [Hashtable] $MSBuildProperties = @{ + 'GenerateFullPaths' = 'true' + 'EmitLegacyAssetsFileItems' = 'true' + }, # Build Configuration. Default is to use the MSBuild project defaults which is likely Debug. [ValidateSet($null, 'Debug', 'Release')] diff --git a/src/Common/Commands.Common/PowerBICmdlet.cs b/src/Common/Commands.Common/PowerBICmdlet.cs index d9688563..4c2001ed 100644 --- a/src/Common/Commands.Common/PowerBICmdlet.cs +++ b/src/Common/Commands.Common/PowerBICmdlet.cs @@ -64,7 +64,10 @@ private static Assembly RedirectAssemblyLoad(object sender, ResolveEventArgs arg // Handle MSAL assemblies string assemblyFilePath; - if (requestedAssembly.Name == "Microsoft.Identity.Client" || requestedAssembly.Name == "Microsoft.Identity.Client.Extensions.Msal" || requestedAssembly.Name == "Microsoft.Identity.Client.Broker") + if (requestedAssembly.Name == "Microsoft.Identity.Client" + || requestedAssembly.Name == "Microsoft.Identity.Client.Extensions.Msal" + || requestedAssembly.Name == "Microsoft.Identity.Client.Broker" + || requestedAssembly.Name == "Microsoft.Identity.Client.NativeInterop") { var libType = "netstandard2.0"; assemblyFilePath = Path.Combine(executingDirectory, "MSAL", libType, requestedAssembly.Name + ".dll"); diff --git a/src/Common/Common.Authentication/Common.Authentication.csproj b/src/Common/Common.Authentication/Common.Authentication.csproj index 7aee26c5..209abd11 100644 --- a/src/Common/Common.Authentication/Common.Authentication.csproj +++ b/src/Common/Common.Authentication/Common.Authentication.csproj @@ -11,6 +11,7 @@ +