Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3db6009
Enable WAM Broker support for Entra ID Auth modes
cheenamalhotra May 13, 2026
7a0a460
Add test connection project for validating WAM broker behavior on UI …
cheenamalhotra Jun 6, 2026
d23e4a6
Merge branch 'main' into dev/cheena/entra-wam-broker
cheenamalhotra Jun 6, 2026
bc5178a
Update redirectURI + minor changes
cheenamalhotra Jun 6, 2026
240e5ce
Merge branch 'dev/cheena/entra-wam-broker' of https://github.com/dotn…
cheenamalhotra Jun 6, 2026
bca2a62
Comments/cleanup
cheenamalhotra Jun 6, 2026
58083b6
Update config file
cheenamalhotra Jun 6, 2026
fd54502
Update Redirect URI for Unix
cheenamalhotra Jun 6, 2026
b657f32
Remove duplication
cheenamalhotra Jun 6, 2026
01529eb
Fix unix build
cheenamalhotra Jun 6, 2026
152b44e
Apply suggestions from code review
cheenamalhotra Jun 6, 2026
fff68be
Apply suggestions from code review
cheenamalhotra Jun 6, 2026
17564ca
Apply suggestions from code review
cheenamalhotra Jun 6, 2026
0d105e0
Update comment
cheenamalhotra Jun 6, 2026
97fce03
useWamBroker option and tests
cheenamalhotra Jun 9, 2026
de30171
Merge branch 'main' into dev/cheena/entra-wam-broker
cheenamalhotra Jun 9, 2026
84949bb
Update api and docs
cheenamalhotra Jun 9, 2026
82a2d4e
handle .net standard
cheenamalhotra Jun 10, 2026
f14c637
Remove specs
cheenamalhotra Jun 10, 2026
81312dc
Add collection, address docs
cheenamalhotra Jun 10, 2026
5683852
fix: allow AzureSqlConnector fallback build on non-Windows
Copilot Jun 10, 2026
3f91b03
Address feedback
cheenamalhotra Jun 17, 2026
d23b760
Address comments/more changes
cheenamalhotra Jun 17, 2026
449d289
Verify Sibling Assembly
cheenamalhotra Jun 17, 2026
90760e3
Deprecation note for future
cheenamalhotra Jun 17, 2026
69b3787
Support clearing user token cache to enable retesting token acquisiti…
cheenamalhotra Jun 17, 2026
b44ece5
More improvements, clear token cache properly + fix device code flow …
cheenamalhotra Jun 17, 2026
b82106d
Remove temp file
cheenamalhotra Jun 17, 2026
3064e77
Apply suggestions from code review
cheenamalhotra Jun 17, 2026
d436a77
Remove unwanted new ctors, fix errors
cheenamalhotra Jun 17, 2026
6ef039e
Merge branch 'dev/cheena/entra-wam-broker' of https://github.com/dotn…
cheenamalhotra Jun 17, 2026
8c89141
Address PR review: fix </param>, expand WamBroker tests, README note
cheenamalhotra Jun 17, 2026
ff4f373
More improvements + tests
cheenamalhotra Jun 17, 2026
da1929d
Last Updates
cheenamalhotra Jun 17, 2026
681b64f
Update MSAL as well
cheenamalhotra Jun 17, 2026
e628e2b
Potential fix for pull request finding
cheenamalhotra Jun 17, 2026
f8a7c96
Merge branch 'main' into dev/cheena/entra-wam-broker
cheenamalhotra Jun 17, 2026
7eac499
Removed unwanted changes
cheenamalhotra Jun 18, 2026
744af8d
Missing doc
cheenamalhotra Jun 18, 2026
c003f4a
Final changes
cheenamalhotra Jun 18, 2026
8a72de1
More updates, rename options type
cheenamalhotra Jun 18, 2026
ed46a31
Update provider instance initialization flow, other minor changes
cheenamalhotra Jun 18, 2026
b802a2e
Disable broker for AAD Password auth (not supported by MSAL unless us…
cheenamalhotra Jun 18, 2026
a63ac86
Revert "Disable broker for AAD Password auth (not supported by MSAL u…
cheenamalhotra Jun 19, 2026
5fdca68
Remove AAD Password auth tests
cheenamalhotra Jun 19, 2026
9e703ed
Fix wording
cheenamalhotra Jun 19, 2026
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
3 changes: 2 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

<ItemGroup>
<PackageVersion Include="Azure.Core" Version="1.51.1" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.83.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.84.2" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
Expand Down Expand Up @@ -126,6 +126,7 @@

<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.18.0" />
<PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.84.2" />
Comment thread
cheenamalhotra marked this conversation as resolved.
</ItemGroup>

<!-- ===================================================================== -->
Expand Down
34 changes: 34 additions & 0 deletions doc/apps/AzureSqlConnector/AzureSqlConnector.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">

<!--
WinForms WAM-broker sample. Targets net481 (for callers still on .NET Framework)
plus net10.0-windows (for modern .NET) so the sample exercises both API
flavors: the legacy SetIWin32WindowFunc path on net481 and the modern
SetParentActivityOrWindowFunc path on net10. The net10.0-windows TFM
restores and builds cleanly on Linux/macOS hosts even though the resulting
binary only runs on Windows, so the sample no longer needs a separate
no-op cross-platform fallback.
-->
<PropertyGroup>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net481;net10.0-windows</TargetFrameworks>
<TargetFramework Condition="'$(OS)' != 'Windows_NT'">net10.0-windows</TargetFramework>
<!-- Required to build the net*-windows TFM on Linux/macOS (e.g. CodeQL); without
this, the SDK fails with NETSDK1100. The produced binary still only runs on Windows. -->
<EnableWindowsTargeting Condition="'$(OS)' != 'Windows_NT'">true</EnableWindowsTargeting>
<OutputType>WinExe</OutputType>
<RootNamespace>Microsoft.Data.SqlClient.Samples.AzureSqlConnector</RootNamespace>
<AssemblyName>AzureSqlConnector</AssemblyName>
<UseWindowsForms>true</UseWindowsForms>
<LangVersion>latest</LangVersion>
<Nullable>disable</Nullable>
<Platforms>AnyCPU</Platforms>
Comment thread
cheenamalhotra marked this conversation as resolved.
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Microsoft.Data.SqlClient.Extensions\Azure\src\Azure.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj" />
</ItemGroup>

</Project>
25 changes: 25 additions & 0 deletions doc/apps/AzureSqlConnector/IdentityQuery.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
{
/// <summary>
/// Shared SQL text used by both <see cref="MainForm"/> (UI-thread variant) and
/// <see cref="MainFormWorker"/> (worker-thread variant). Keeping the literal in one place
/// avoids drift when one variant gains a new column.
/// </summary>
internal static class IdentityQuery
{
public const string CommandText =
"SELECT " +
" SUSER_SNAME() AS LoggedInUser, " +
" ORIGINAL_LOGIN() AS OriginalLogin, " +
" USER_NAME() AS DatabaseUser, " +
" SUSER_ID() AS LoginSid, " +
" DB_NAME() AS DatabaseName, " +
" @@SERVERNAME AS ServerName, " +
" HOST_NAME() AS ClientHost, " +
" APP_NAME() AS AppName, " +
" SESSION_USER AS SessionUser, " +
" CURRENT_USER AS CurrentUser, " +
" @@SPID AS SessionId, " +
" @@VERSION AS ServerVersion;";
}
}
Loading
Loading