Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
<!-- Dependencies shared by multiple projects -->

<ItemGroup>
<PackageVersion Include="Azure.Core" Version="1.51.1" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.83.0" />
<PackageVersion Include="Azure.Core" Version="1.53.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.83.3" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
Comment thread
ErikEJ marked this conversation as resolved.
</ItemGroup>

Expand Down Expand Up @@ -81,9 +81,7 @@
<!-- ===================================================================== -->
<!-- Azure Dependencies -->

<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.18.0" />
</ItemGroup>
<!-- None -->
Comment thread
ErikEJ marked this conversation as resolved.

<!-- ===================================================================== -->
<!-- SqlClient Dependencies -->
Expand Down
8 changes: 5 additions & 3 deletions doc/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
<!-- Import parent Directory.Packages.props -->
<Import Project="..\Directory.Packages.props" />
<ItemGroup>
<!-- Explicitly include Azure.Identity. -->
<PackageVersion Include="Azure.Identity" Version="1.21.0" />
<!-- Reference SqlClient package versions that support our needs. -->
<PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0-preview4.26064.3" />
<PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0-preview1.26064.3" />
<PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0-preview1.26064.3" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions doc/apps/AzureAuthentication/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<!-- We purposely do not include any parent Directory.Packages.props files. -->

<PropertyGroup>
<!-- Use SqlClient 7.0.0 Preview 4 if no version was specified. -->
<SqlClientVersion>7.0.0-preview4.26064.3</SqlClientVersion>
<!-- Use SqlClient 7.0.0 if no version was specified. -->
<SqlClientVersion>7.0.0</SqlClientVersion>

<!-- Use AKV Provider 7.0.0 Preview 1 if no version was specified. -->
<AkvProviderVersion>7.0.0-preview1.26064.3</AkvProviderVersion>
<!-- Use AKV Provider 7.0.0 if no version was specified. -->
<AkvProviderVersion>7.0.0</AkvProviderVersion>
</PropertyGroup>

<!-- SqlClient Packages -->
Expand All @@ -25,8 +25,8 @@

<!-- Other Packages -->
<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.3" />
<PackageVersion Include="Azure.Core" Version="1.53.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.6" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions doc/apps/AzureAuthentication/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Package versions are controlled through MSBuild properties. Pass them on the com

| Property | Default | Description |
| --- | --- | --- |
| `SqlClientVersion` | `7.0.0-preview4.26064.3` | Version of `Microsoft.Data.SqlClient` to reference. |
| `AkvProviderVersion` | `7.0.0-preview1.26064.3` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
| `SqlClientVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient` to reference. |
| `AkvProviderVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
| `AzureVersion` | None | Version of `Microsoft.Data.SqlClient.Extensions.Azure` to reference. When omitted, the `Azure` package will not be referenced. |

## Local Package Source
Expand Down Expand Up @@ -68,9 +68,9 @@ Description:

Supply specific package versions when building to test different versions of the SqlClient suite, for example:

-p:SqlClientVersion=7.0.0.preview4
-p:AkvProviderVersion=7.0.1-preview2
-p:AzureVersion=1.0.0-preview1
-p:SqlClientVersion=7.1.0.preview1
-p:AkvProviderVersion=7.0.0
-p:AzureVersion=1.1.0-preview1
Comment thread
ErikEJ marked this conversation as resolved.

Usage:
AzureAuthentication [options]
Expand Down Expand Up @@ -104,9 +104,9 @@ Azure Authentication Tester
---------------------------

Packages used:
SqlClient: 7.0.0-preview4.26055.1
AKV Provider: 6.1.2
Azure: 1.0.0-preview1.26055.1
SqlClient: 7.0.0
AKV Provider: 7.0.0
Azure: 1.0.0

Comment thread
ErikEJ marked this conversation as resolved.
Connection details:
Data Source: adotest.database.windows.net
Expand Down Expand Up @@ -142,19 +142,19 @@ authentication provider.
Run against locally-built packages (drop `.nupkg` files into the `packages/` folder first):

```bash
dotnet run -p:SqlClientVersion=7.0.0-preview4 -- -c "<connection string>"
dotnet run -p:SqlClientVersion=7.1.0-preview1 -- -c "<connection string>"
```

Run including the `Azure` extensions package:

```bash
dotnet run -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
dotnet run -p:AzureVersion=1.0.0 -- -c "<connection string>"
```

Override all three versions at once:

```bash
dotnet run -p:SqlClientVersion=7.0.0-preview1 -p:AkvProviderVersion=7.0.0-preview1 -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
dotnet run -p:SqlClientVersion=7.1.0-preview1 -p:AkvProviderVersion=7.1.0-preview1 -p:AzureVersion=1.0.0 -- -c "<connection string>"
```

## Prerequisites
Expand Down
1 change: 0 additions & 1 deletion doc/samples/Microsoft.Data.SqlClient.Samples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.Identity.Client" />
<PackageReference Include="Microsoft.SqlServer.Server" />
<PackageReference Include="Microsoft.Data.SqlClient" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@

<ItemGroup>
<PackageReference Include="Azure.Core" />
Comment thread
ErikEJ marked this conversation as resolved.
<PackageReference Include="Azure.Identity" />
Comment thread
ErikEJ marked this conversation as resolved.
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<!-- Explicitly depend on the same version of Microsoft.Identity.Client as SqlClient. -->
<PackageReference Include="Microsoft.Identity.Client" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!-- References for netfx -->
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Azure.Security.KeyVault.Keys" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
Expand All @@ -33,7 +33,7 @@

<!-- References for netcore -->
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Azure.Security.KeyVault.Keys" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
<PackageReference Include="xunit" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Transactions" />

<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.Bcl.Cryptography" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI"
Condition="'$(ReferenceType)' != 'Package'" />
Expand Down Expand Up @@ -97,7 +97,7 @@

<!-- References for netcore -->
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.Bcl.Cryptography" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
Condition="'$(ReferenceType)' != 'Package'" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Transactions" />

<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
Comment thread
ErikEJ marked this conversation as resolved.
<PackageReference Include="Microsoft.Bcl.Cryptography" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.ValueTuple" />
Expand Down Expand Up @@ -391,7 +391,7 @@

<!-- References for netcore -->
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.Bcl.Cryptography" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
Condition="'$(ReferenceType)' != 'Package'" />
Expand Down
Loading