-
Notifications
You must be signed in to change notification settings - Fork 372
Implement WinUI3 support for Desktop package #5411
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
DharshanBJ
wants to merge
54
commits into
main
Choose a base branch
from
dharshanb/winui3Support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,235
−3
Open
Changes from 52 commits
Commits
Show all changes
54 commits
Select commit
Hold shift + click to select a range
0adea97
update
DharshanBJ 967bdbb
working
DharshanBJ d30aa7b
Code to create a seperate nuget for winui3
DharshanBJ 6632314
builds fine
DharshanBJ 0f190e7
clean-up
DharshanBJ 74804c1
clean-up
DharshanBJ a79a5ba
working
DharshanBJ 7c5396c
update
DharshanBJ 3fa1303
clean-up
DharshanBJ 01a14ef
clean-up
DharshanBJ 2956b33
clean-up
DharshanBJ 9b9dcd6
clean-up
DharshanBJ 3d5a15e
clean-up
DharshanBJ 67a3137
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ cb3caeb
clean-up
DharshanBJ 1fa4a78
clean-up
DharshanBJ 4e7dd8b
clean-up
DharshanBJ fc24488
clean-up
DharshanBJ 9205904
clean-up
DharshanBJ cfe6c59
clean-up
DharshanBJ 82ba6ea
clean-up
DharshanBJ 25911f8
clean-up
DharshanBJ 790050b
update
DharshanBJ db14988
clean-up
DharshanBJ 8be4d3e
clean-up
DharshanBJ 6e7a475
clean-up
DharshanBJ a1f4f20
clean-up
DharshanBJ 8ab32e2
clean-up
DharshanBJ 510072b
update
DharshanBJ ccac18a
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ b3d41f4
Revert changes to AuthCodeRequestComponent.cs and Microsoft.Identity.…
DharshanBJ f1bfbd6
Merge branch 'dharshanb/winui3Support' of https://github.com/AzureAD/…
DharshanBJ 2818fba
Revert changes to AuthCodeRequestComponent.cs and Microsoft.Identity.…
DharshanBJ 2db86dd
add test-app
DharshanBJ f70aea3
add test-app
DharshanBJ 453b9c5
Handle winui3 parent window
DharshanBJ 90ea83d
clean-up
DharshanBJ 0b64613
delete testapp readme
DharshanBJ 8a8bec3
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ 12183e8
update
DharshanBJ 9d04d61
Merge branch 'dharshanb/winui3Support' of https://github.com/AzureAD/…
DharshanBJ 1573262
add winforms test app
DharshanBJ 29c1e13
add winforms app that goes through webview2 flow
DharshanBJ e00856e
update the IsWinUI3Window check
DharshanBJ 601f574
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ c1cd2f8
update
DharshanBJ e982a1a
Merge branch 'dharshanb/winui3Support' of https://github.com/AzureAD/…
DharshanBJ 74b1d29
update
DharshanBJ 48d9e77
update
DharshanBJ e85cd56
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ 880c171
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ 268f1f6
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ cee6bbb
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ 74f8bfb
Merge branch 'main' into dharshanb/winui3Support
DharshanBJ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
.../Microsoft.Identity.Client.Desktop.WinUI3/Microsoft.Identity.Client.Desktop.WinUI3.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework> | ||
<UseWinUI>true</UseWinUI> | ||
<EnableMsixTooling>true</EnableMsixTooling> | ||
<DefineConstants>$(DefineConstants);WINUI3</DefineConstants> | ||
|
||
<PathToMsalSources>$(MSBuildThisFileDirectory)../Microsoft.Identity.Client/</PathToMsalSources> | ||
<PlatformTarget>AnyCPU</PlatformTarget> | ||
<Configurations>Debug;Release;Debug + MobileApps</Configurations> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Label="NuGet and AssemblyInfo metadata"> | ||
<!--This should be passed from the VSTS build--> | ||
<MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion> | ||
<MicrosoftIdentityClientVersion>$(MicrosoftIdentityClientVersion)</MicrosoftIdentityClientVersion> | ||
<!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion--> | ||
<Version>$(MicrosoftIdentityClientVersion)</Version> | ||
<!-- Copyright needs to be in the form of © not (c) to be compliant --> | ||
<Title>MSAL.NET extension for WinUI3 desktop applications</Title> | ||
<Description> | ||
This package contains WinUI3-specific binaries for using MSAL.NET with modern Windows applications built on WinUI3 and Windows App SDK. | ||
</Description> | ||
<PackageTags>Microsoft Authentication Library Desktop MSAL WinUI3 Windows App SDK WebView2</PackageTags> | ||
<Product>Microsoft Authentication Library Desktop WinUI3</Product> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Label="For CI build" Condition="'$(TF_BUILD)' == 'true'"> | ||
DharshanBJ marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> | ||
</PropertyGroup> | ||
|
||
<!-- Include shared source files from Desktop project --> | ||
<ItemGroup> | ||
<Compile Include="..\Microsoft.Identity.Client.Desktop\**\*.cs" | ||
Exclude="..\Microsoft.Identity.Client.Desktop\WebView2WebUi\WinFormsPanelWithWebView2.cs;..\Microsoft.Identity.Client.Desktop\WebView2WebUi\Win32Window.cs;..\Microsoft.Identity.Client.Desktop\obj\**\*;..\Microsoft.Identity.Client.Desktop\bin\**\*" | ||
LinkBase="" /> | ||
|
||
<!-- Include InternalsVisibleTo --> | ||
<Compile Include="..\Microsoft.Identity.Client\Properties\InternalsVisibleTo.cs" Link="Properties\InternalsVisibleTo.cs" /> | ||
</ItemGroup> | ||
|
||
<!-- WinUI3 and Windows App SDK dependencies --> | ||
<ItemGroup> | ||
<PackageReference Include="Microsoft.WindowsAppSDK" /> | ||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" /> | ||
</ItemGroup> | ||
|
||
<!-- Project references --> | ||
<ItemGroup> | ||
<ProjectReference Include="..\Microsoft.Identity.Client.Broker\Microsoft.Identity.Client.Broker.csproj" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we need this reference as well? i.e broker reference? |
||
<ProjectReference Include="..\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj" /> | ||
|
||
<PackageReference Remove="Microsoft.CodeAnalysis.PublicApiAnalyzers" /> | ||
</ItemGroup> | ||
|
||
</Project> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.