Skip to content
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

Enable broker support on Linux platform #5086

Merged
merged 151 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
2c18064
initial commit
xinyuxu1026 Oct 22, 2024
6a1f431
add linux test app
xinyuxu1026 Oct 24, 2024
0eb4000
bypass check for linux platform
xinyuxu1026 Oct 28, 2024
c7ff66a
Add isRunningInWsl check
xinyuxu1026 Nov 5, 2024
883e44d
Update RuntimeSupport OS check
xinyuxu1026 Nov 5, 2024
9b6cc0c
update
xinyuxu1026 Nov 15, 2024
67b0bbd
Add linux
xinyuxu1026 Nov 19, 2024
5b3a00d
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 8, 2025
12ae021
update
xinyuxu1026 Jan 15, 2025
0807920
update to net8.0
xinyuxu1026 Jan 16, 2025
9b27756
fix typo
xinyuxu1026 Jan 16, 2025
4a0ac90
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 16, 2025
0339fe5
Update msalruntime version to 0.7.0-alpha
xinyuxu1026 Jan 17, 2025
eadc942
use lazy bool
xinyuxu1026 Jan 23, 2025
212917c
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 23, 2025
9fde6ec
address comments
xinyuxu1026 Jan 24, 2025
20d2e59
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 24, 2025
f21e8f9
initial commit
xinyuxu1026 Jan 24, 2025
e9381a8
fix name issue
xinyuxu1026 Jan 24, 2025
5ee630b
remove for now
xinyuxu1026 Jan 24, 2025
390ec37
try use script
xinyuxu1026 Jan 24, 2025
d8966be
fix syntax error
xinyuxu1026 Jan 24, 2025
d5afada
temp change
xinyuxu1026 Jan 24, 2025
78f8cc8
Add download artifacts
xinyuxu1026 Jan 25, 2025
f0034f2
update download path
xinyuxu1026 Jan 25, 2025
7d67fa3
use DownloadPipelineArtifact
xinyuxu1026 Jan 25, 2025
9bf80be
use MSBuild to restore sln on Linux
xinyuxu1026 Jan 27, 2025
cd281c4
try restore unit test first
xinyuxu1026 Jan 27, 2025
ad07cde
Add new broker option to PublicAPI.Unshipped
xinyuxu1026 Jan 27, 2025
3bb06a7
remove dependency
xinyuxu1026 Jan 27, 2025
f9aff19
specify the msBuildVersion
xinyuxu1026 Jan 27, 2025
cbed763
use dotnet task
xinyuxu1026 Jan 27, 2025
a221a52
set enableWindowsTargeting
xinyuxu1026 Jan 27, 2025
362aeaa
build and run common test
xinyuxu1026 Jan 27, 2025
ccbf9ce
integration tests
xinyuxu1026 Jan 27, 2025
af8fb87
build Integration
xinyuxu1026 Jan 27, 2025
fb2190f
fix typo
xinyuxu1026 Jan 27, 2025
65f444f
update
xinyuxu1026 Jan 27, 2025
4496fcb
add install keyvault
xinyuxu1026 Jan 27, 2025
4f03c3c
get cert pass
xinyuxu1026 Jan 27, 2025
1ace40e
retry
xinyuxu1026 Jan 27, 2025
53c1308
directly read cert on Linux
xinyuxu1026 Jan 27, 2025
c1db7a1
use env
xinyuxu1026 Jan 28, 2025
390115c
fix cert location
xinyuxu1026 Jan 28, 2025
c19a643
add utils to import dlls on Linux
xinyuxu1026 Jan 28, 2025
f81e5e7
include extension project for testing
xinyuxu1026 Jan 28, 2025
6eae017
conditional build
xinyuxu1026 Jan 28, 2025
d6e47cd
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 28, 2025
95cb8d1
Merge remote-tracking branch 'origin/xinyu/wsl-support' into xinyu/ru…
xinyuxu1026 Jan 28, 2025
2b2f827
install deps
xinyuxu1026 Jan 28, 2025
80b02dd
install sudo
xinyuxu1026 Jan 28, 2025
44e221a
install
xinyuxu1026 Jan 28, 2025
97b92db
start xvfb
xinyuxu1026 Jan 28, 2025
f6a5ff9
update
xinyuxu1026 Jan 28, 2025
f43c547
install libwebkit2gtk-4.0
xinyuxu1026 Jan 28, 2025
1106d99
get window
xinyuxu1026 Jan 28, 2025
2dd7fe2
install xvfb
xinyuxu1026 Jan 28, 2025
af35cf4
install systemd
xinyuxu1026 Jan 28, 2025
2c66776
comment some code
xinyuxu1026 Jan 28, 2025
3bb45fc
fix typo
xinyuxu1026 Jan 28, 2025
e438ce3
add log
xinyuxu1026 Jan 28, 2025
bacf045
broker options for different platforms
xinyuxu1026 Jan 28, 2025
fad4500
try another logger
xinyuxu1026 Jan 28, 2025
165d6c0
update
xinyuxu1026 Jan 29, 2025
7e3887f
add installation
xinyuxu1026 Jan 29, 2025
f0a0785
fix install broker bug
xinyuxu1026 Jan 29, 2025
2e33475
add broker xhost
xinyuxu1026 Jan 29, 2025
80285f3
set DBUS_SESSION_BUS_ADDRESS
xinyuxu1026 Jan 29, 2025
1c3f76b
test
xinyuxu1026 Jan 29, 2025
37b9a6c
try fix crash
xinyuxu1026 Jan 29, 2025
af22c02
add test filter
xinyuxu1026 Jan 29, 2025
c8b9745
fix assert
xinyuxu1026 Jan 29, 2025
295e33e
add more filter
xinyuxu1026 Jan 29, 2025
ea5b9c4
runtime broker test
xinyuxu1026 Jan 29, 2025
732f140
get display
xinyuxu1026 Jan 29, 2025
0f1f6fd
test
xinyuxu1026 Jan 29, 2025
ac50e1a
remove filter
xinyuxu1026 Jan 29, 2025
4dd38de
disable some tests
xinyuxu1026 Jan 29, 2025
e88b1a4
clean up some code
xinyuxu1026 Jan 29, 2025
e469ab2
Merge branch 'xinyu/runtime-preview-test' into xinyu/wsl-support
xinyuxu1026 Jan 29, 2025
bde22bc
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 29, 2025
a97ca27
clean up unused code
xinyuxu1026 Jan 29, 2025
70b2107
fix string assert
xinyuxu1026 Jan 29, 2025
14730ab
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 29, 2025
c51f5fb
disable POP test on Linux
xinyuxu1026 Jan 30, 2025
ca8aca8
fix some tests
xinyuxu1026 Jan 30, 2025
0c00894
test interactive sign in
xinyuxu1026 Jan 30, 2025
1d41aaa
try
xinyuxu1026 Jan 30, 2025
04379d1
start xvfb
xinyuxu1026 Jan 30, 2025
7a733c6
add the current user to host
xinyuxu1026 Jan 30, 2025
266d270
update
xinyuxu1026 Jan 30, 2025
1fd20f3
add list os accounts support
xinyuxu1026 Jan 30, 2025
60913bb
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Jan 30, 2025
e8ee2f3
change back
xinyuxu1026 Jan 30, 2025
3361393
fix typo
xinyuxu1026 Jan 30, 2025
77abed3
fix test
xinyuxu1026 Jan 31, 2025
a53e8ea
fix build error
xinyuxu1026 Jan 31, 2025
f37ffb4
fix Windows build
xinyuxu1026 Jan 31, 2025
d42f797
use interactive flow
xinyuxu1026 Feb 3, 2025
c43de08
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Feb 3, 2025
26725fe
fix typo
xinyuxu1026 Feb 3, 2025
de1a7c0
try
xinyuxu1026 Feb 3, 2025
aa3712b
remove setting
xinyuxu1026 Feb 3, 2025
b4d6164
comment tokensource for now
xinyuxu1026 Feb 3, 2025
5ac042f
run more tests
xinyuxu1026 Feb 3, 2025
de29c19
remove username
xinyuxu1026 Feb 3, 2025
92902b8
try opendisplay(0)
xinyuxu1026 Feb 4, 2025
8abca5d
update
xinyuxu1026 Feb 4, 2025
0e834ab
use :1
xinyuxu1026 Feb 4, 2025
c18fc24
hard code :1
xinyuxu1026 Feb 4, 2025
f3b7530
use interactive
xinyuxu1026 Feb 4, 2025
27ab654
use parent handle
xinyuxu1026 Feb 4, 2025
86fe179
fix bracket
xinyuxu1026 Feb 4, 2025
ec7b8b8
hard code the display
xinyuxu1026 Feb 4, 2025
4d37dee
fix import issue
xinyuxu1026 Feb 4, 2025
498ec38
build the sample sln
xinyuxu1026 Feb 4, 2025
3c9d830
fix yaml
xinyuxu1026 Feb 4, 2025
28cb7ea
try build LibsAndSamples.sln all together on Linux
xinyuxu1026 Feb 4, 2025
5e6ae1f
update
xinyuxu1026 Feb 4, 2025
6cabc7a
Revert "update"
xinyuxu1026 Feb 4, 2025
7fd1b67
Revert "try build LibsAndSamples.sln all together on Linux"
xinyuxu1026 Feb 4, 2025
3770f3c
Revert "fix yaml"
xinyuxu1026 Feb 4, 2025
45b39ad
Revert "build the sample sln"
xinyuxu1026 Feb 4, 2025
2ce5756
try more logs
xinyuxu1026 Feb 4, 2025
488b488
update
xinyuxu1026 Feb 4, 2025
dab77ad
test get accounts
xinyuxu1026 Feb 4, 2025
5ac2951
fix build error
xinyuxu1026 Feb 4, 2025
a3e4a30
set list os account to true
xinyuxu1026 Feb 4, 2025
5b3d5b1
add debug log
xinyuxu1026 Feb 5, 2025
4239c11
update logger
xinyuxu1026 Feb 5, 2025
4db422b
test
xinyuxu1026 Feb 5, 2025
66d30a6
update
xinyuxu1026 Feb 5, 2025
eecde81
clean up code
xinyuxu1026 Feb 5, 2025
d6ee8aa
clean up code
xinyuxu1026 Feb 5, 2025
e7bc9e8
try fix cert tests
xinyuxu1026 Feb 5, 2025
b2dcaa7
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Feb 5, 2025
f7d98a5
persist key when import lab cert
xinyuxu1026 Feb 6, 2025
d5fe489
try use rsa instead of rsacng
xinyuxu1026 Feb 6, 2025
3db4fe9
add my test app to sln file
xinyuxu1026 Feb 10, 2025
08f2829
Clean up code and address comments
xinyuxu1026 Feb 20, 2025
03c3ed3
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Feb 20, 2025
5334092
Address comment
xinyuxu1026 Feb 21, 2025
c0e17aa
Update build/template-test-on-linux.yaml
xinyuxu1026 Feb 21, 2025
5a021c8
Update build/template-build-and-run-all-tests.yaml
xinyuxu1026 Feb 21, 2025
5cbb189
Merge branch 'main' into xinyu/wsl-support
xinyuxu1026 Feb 21, 2025
39bc569
update slashes
xinyuxu1026 Feb 21, 2025
15d32b0
add more comments
xinyuxu1026 Feb 21, 2025
aa48c67
add more comments
xinyuxu1026 Feb 21, 2025
b4208ef
fix
xinyuxu1026 Feb 21, 2025
028ad8f
update
xinyuxu1026 Feb 21, 2025
e8abd4f
try enable pop
xinyuxu1026 Feb 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<!-- Version of the Microsoft.Identity.Client.NativeInterop package. -->
<MSALRuntimeNativeInteropVersion>0.16.2</MSALRuntimeNativeInteropVersion>
<MSALRuntimeNativeInteropVersion>0.18.0</MSALRuntimeNativeInteropVersion>
<!-- Version of MSAL if not defined by the CI-->
<MsalInternalVersion>4.61.0</MsalInternalVersion>
</PropertyGroup>
Expand Down
67 changes: 46 additions & 21 deletions LibsAndSamples.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32708.82
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -178,6 +178,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CacheExtension", "tests\dev
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Client.Extensions.Msal", "src\client\Microsoft.Identity.Client.Extensions.Msal\Microsoft.Identity.Client.Extensions.Msal.csproj", "{87679336-95BE-47E4-B42B-8F6860A0B215}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "tests\devapps\WAM\NetWSLWam\test.csproj", "{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug + MobileApps|Any CPU = Debug + MobileApps|Any CPU
Expand Down Expand Up @@ -554,7 +556,6 @@ Global
{24D2AF71-A01E-4450-8C3F-B9923A81134B}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
{24D2AF71-A01E-4450-8C3F-B9923A81134B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24D2AF71-A01E-4450-8C3F-B9923A81134B}.Debug|Any CPU.Build.0 = Debug|Any CPU

{24D2AF71-A01E-4450-8C3F-B9923A81134B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{24D2AF71-A01E-4450-8C3F-B9923A81134B}.Debug|ARM.Build.0 = Debug|Any CPU
{24D2AF71-A01E-4450-8C3F-B9923A81134B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -610,7 +611,6 @@ Global
{959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46}.Debug|x86.Build.0 = Debug|Any CPU
{959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46}.Release|Any CPU.Build.0 = Release|Any CPU

{959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46}.Release|ARM.ActiveCfg = Release|Any CPU
{959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46}.Release|ARM.Build.0 = Release|Any CPU
{959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -723,7 +723,6 @@ Global
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug|Any CPU.Build.0 = Debug|Any CPU

{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug|ARM.Build.0 = Debug|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand All @@ -738,7 +737,6 @@ Global
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Debug|x86.Build.0 = Debug|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Release|Any CPU.Build.0 = Release|Any CPU

{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Release|ARM.ActiveCfg = Release|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Release|ARM.Build.0 = Release|Any CPU
{E7EB3226-D0F5-4A93-87DC-FAAC9A24D684}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -767,7 +765,6 @@ Global
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug|Any CPU.Build.0 = Debug|Any CPU

{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug|ARM.ActiveCfg = Debug|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug|ARM.Build.0 = Debug|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand All @@ -782,7 +779,6 @@ Global
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Debug|x86.Build.0 = Debug|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Release|Any CPU.ActiveCfg = Release|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Release|Any CPU.Build.0 = Release|Any CPU

{339E0B2B-4408-4947-B134-E8C5AAB11286}.Release|ARM.ActiveCfg = Release|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Release|ARM.Build.0 = Release|Any CPU
{339E0B2B-4408-4947-B134-E8C5AAB11286}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -811,7 +807,6 @@ Global
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug|Any CPU.Build.0 = Debug|Any CPU

{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug|ARM.ActiveCfg = Debug|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug|ARM.Build.0 = Debug|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand All @@ -826,7 +821,6 @@ Global
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Debug|x86.Build.0 = Debug|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Release|Any CPU.Build.0 = Release|Any CPU

{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Release|ARM.ActiveCfg = Release|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Release|ARM.Build.0 = Release|Any CPU
{2AF48872-DD47-4DA1-A153-DF4DA13882C2}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1022,7 +1016,6 @@ Global
{998D38B3-344C-4F19-833E-6181B0834AF6}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
{998D38B3-344C-4F19-833E-6181B0834AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{998D38B3-344C-4F19-833E-6181B0834AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU

{998D38B3-344C-4F19-833E-6181B0834AF6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{998D38B3-344C-4F19-833E-6181B0834AF6}.Debug|ARM.Build.0 = Debug|Any CPU
{998D38B3-344C-4F19-833E-6181B0834AF6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1191,7 +1184,6 @@ Global
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug|Any CPU.Build.0 = Debug|Any CPU

{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug|ARM.Build.0 = Debug|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand All @@ -1206,7 +1198,6 @@ Global
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Debug|x86.Build.0 = Debug|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Release|Any CPU.Build.0 = Release|Any CPU

{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Release|ARM.ActiveCfg = Release|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Release|ARM.Build.0 = Release|Any CPU
{3A2042E9-8B03-4F2D-A2B7-EA4BEC36340C}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1242,9 +1233,7 @@ Global
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug + MobileApps|x86.Deploy.0 = Debug|x86
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|Any CPU.Build.0 = Debug|Any CPU

{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU

{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|ARM.ActiveCfg = Debug|ARM
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|ARM.Build.0 = Debug|ARM
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|ARM.Deploy.0 = Debug|ARM
Expand All @@ -1265,9 +1254,7 @@ Global
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Debug|x86.Deploy.0 = Debug|x86
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Release|Any CPU.Build.0 = Release|Any CPU

{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Release|Any CPU.Deploy.0 = Release|Any CPU

{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Release|ARM.ActiveCfg = Release|ARM
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Release|ARM.Build.0 = Release|ARM
{34E323E8-E706-4DF4-B916-D614FC8CFCEB}.Release|ARM.Deploy.0 = Release|ARM
Expand Down Expand Up @@ -1386,7 +1373,6 @@ Global
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug|Any CPU.Build.0 = Debug|Any CPU

{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug|ARM.Build.0 = Debug|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand All @@ -1401,7 +1387,6 @@ Global
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Debug|x86.Build.0 = Debug|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Release|Any CPU.Build.0 = Release|Any CPU

{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Release|ARM.ActiveCfg = Release|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Release|ARM.Build.0 = Release|Any CPU
{B381269F-44DA-4E46-8F51-1F1DF7D1F61D}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1430,7 +1415,6 @@ Global
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug|Any CPU.Build.0 = Debug|Any CPU

{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug|ARM.Build.0 = Debug|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand All @@ -1445,7 +1429,6 @@ Global
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Debug|x86.Build.0 = Debug|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Release|Any CPU.Build.0 = Release|Any CPU

{4EA542D2-D4C9-403C-B615-0047D0A62790}.Release|ARM.ActiveCfg = Release|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Release|ARM.Build.0 = Release|Any CPU
{4EA542D2-D4C9-403C-B615-0047D0A62790}.Release|ARM64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1474,7 +1457,6 @@ Global
{1B047736-9325-4F59-906B-89A3E12AC8FB}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
{1B047736-9325-4F59-906B-89A3E12AC8FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B047736-9325-4F59-906B-89A3E12AC8FB}.Debug|Any CPU.Build.0 = Debug|Any CPU

{1B047736-9325-4F59-906B-89A3E12AC8FB}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1B047736-9325-4F59-906B-89A3E12AC8FB}.Debug|ARM.Build.0 = Debug|Any CPU
{1B047736-9325-4F59-906B-89A3E12AC8FB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1710,6 +1692,48 @@ Global
{87679336-95BE-47E4-B42B-8F6860A0B215}.Release|x64.Build.0 = Release|Any CPU
{87679336-95BE-47E4-B42B-8F6860A0B215}.Release|x86.ActiveCfg = Release|Any CPU
{87679336-95BE-47E4-B42B-8F6860A0B215}.Release|x86.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|Any CPU.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|Any CPU.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|ARM.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|ARM.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|ARM64.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|ARM64.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|iPhone.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|iPhone.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|x64.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|x64.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|x86.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|ARM.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|ARM.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|ARM64.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|iPhone.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|x64.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|x64.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|x86.ActiveCfg = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Debug|x86.Build.0 = Debug|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|Any CPU.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|ARM.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|ARM.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|ARM64.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|ARM64.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|iPhone.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|iPhone.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|x64.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|x64.Build.0 = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|x86.ActiveCfg = Release|Any CPU
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1761,6 +1785,7 @@ Global
{74805FE3-2E0D-4EAB-8CFE-A9D46F8D5972} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB}
{92064C48-0136-48CD-AE8D-C6FEDBC7B639} = {74805FE3-2E0D-4EAB-8CFE-A9D46F8D5972}
{87679336-95BE-47E4-B42B-8F6860A0B215} = {1A37FD75-94E9-4D6F-953A-0DABBD7B49E9}
{43BCA8C7-E9F4-4067-9F54-C2127B82B5E8} = {5FAAD966-36B8-4C19-A5FA-5410DD53063D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {020399A9-DC27-4B82-9CAA-EF488665AC27}
Expand Down
59 changes: 59 additions & 0 deletions build/linux-install-deps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/bash

# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
apt install sudo
# This script must be run elevated. Adding a sudo wrapper if needed.
if [ "$UID" -ne 0 ]; then
exec sudo "$0" "$@"
fi

set -o errexit # Exit the script if any command returns a non-true return value

if [ -f '/usr/bin/apt' ]; then
DEBIAN_FRONTEND=noninteractive
# Install quietly, accepting all packages and not overriding user configurations
PKGINSTALL_CMD='apt-get install -q -y -o Dpkg::Options::=--force-confold'
PACKAGE_MANAGER=apt
PKGEXISTS_CMD='dpkg -s'
elif [ -f '/usr/bin/yum' ]; then
PACKAGE_MANAGER=yum
PKGINSTALL_CMD='yum -y install'
PKGEXISTS_CMD='yum list installed'
else
echo 'Package system currently not supported.'
exit 2
fi

if [ $PACKAGE_MANAGER == 'apt' ]; then
apt-get update || true # If apt update fails, see if we can continue anyway
$PKGINSTALL_CMD \
libx11-dev \
dbus-x11 \
libsystemd0 \
gnome-keyring \
libsecret-tools \
libsecret-1-dev \
xdg-utils \
x11-xserver-utils \
xorg \
libp11-kit-dev \
libwebkit2gtk-4.0-dev
fi

echo "Installing JavaBroker"
LINUX_VERSION=$(sed -r -n -e 's/^VERSION_ID="?([^"]+)"?/\1/p' /etc/os-release)
LINUX_VERSION_MAIN=$(echo $LINUX_VERSION | sed 's/\([0-9]*\)\..*/\1/')

BROKER_PACKAGE_NAME='microsoft-identity-broker'
if [ -f '/usr/bin/apt' ]; then
curl https://packages.microsoft.com/config/ubuntu/$LINUX_VERSION/prod.list | sudo sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
else
$PKGINSTALL_CMD yum-utils
yum-config-manager --add-repo=https://packages.microsoft.com/config/rhel/$LINUX_VERSION_MAIN/prod.repo
rpm --import http://packages.microsoft.com/keys/microsoft.asc
fi
echo "Installing latest published JavaBroker package"
$PKGINSTALL_CMD $BROKER_PACKAGE_NAME

exit 0
10 changes: 10 additions & 0 deletions build/template-build-and-prep-automation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ steps:
}
}

#check Linux runtime files
$linuxRuntimes = 'runtimes\linux-x64\native\libmsalruntime.so';
$LinuxAppsToCheck = 'NetWSLWam\bin\Release\net8.0\';
$appFullPath = $searchInFolder+$LinuxAppsToCheck+$linuxRuntimes
Write-Host $appFullPath
if (-not(Test-Path -Path $appFullPath -PathType Leaf))
{
$errors += "Failed to find Linux runtime files in : " + $SearchInFolder + $app + "`n";
}

#exit if there are errors
IF (![string]::IsNullOrWhitespace($errors))
{
Expand Down
12 changes: 12 additions & 0 deletions build/template-build-and-run-all-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,15 @@ jobs: #Build and stage projects
fallbackOnPRTargetBranch: false
baseDefinitionId: '905' #this is the PR build and it is used as a baseline
baseBranchRef: 'main'

- job: 'BuildandRunIntegrationTestsOnLinux'
pool:
vmImage: 'ubuntu-22.04'
demands:
- msbuild
variables:
runCodesignValidationInjection: false
Codeql.SkipTaskAutoInjection: true

steps:
- template: template-test-on-linux.yaml
17 changes: 12 additions & 5 deletions build/template-install-keyvault-secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,18 @@ steps:
$kvSecretBytes = [System.Convert]::FromBase64String('$(LabAuth)')
$certCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
$certCollection.Import($kvSecretBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)

$protectedCertificateBytes = $certCollection.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pkcs12)
$pfxPath = '$(Build.SourcesDirectory)' + "\TestCert.pfx"
$CertPass = ''
$protectedCertificateBytes = $certCollection.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pkcs12, $CertPass)
$pfxPath = '$(Build.SourcesDirectory)' + "/TestCert.pfx"
[System.IO.File]::WriteAllBytes($pfxPath, $protectedCertificateBytes)

Import-PfxCertificate -FilePath $pfxPath -CertStoreLocation Cert:\LocalMachine\My

if ([System.Environment]::OSVersion.Platform -eq 'Win32NT') {
Import-PfxCertificate -FilePath $pfxPath -CertStoreLocation "Cert:\LocalMachine\My"
} else {
Write-Output "This script is running on a non-Windows platform. Skipping Import-PfxCertificate."
}
Write-Host "Write $((Get-Item -Path $pfxPath).Length) PFX bytes to: $pfxPath"
Write-Host "##vso[task.setvariable variable=certDir;isOutput=true]$pfxPath"
Write-Host "##vso[task.setvariable variable=certPass;isSecret=true;isOutput=true]$CertPass"
name: generateLabCert
displayName: 'Install Keyvault Secrets'
Loading
Loading