Skip to content

FIX | Add Component Model annotations to SqlConnectionStringBuilder class in netcore's src folder #1152

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.

Sign up for GitHub

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

Merged
cheenamalhotra merged 7 commits into from
Aug 20, 2021
Merged

FIX | Add Component Model annotations to SqlConnectionStringBuilder class in netcore's src folder #1152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7e1040
Address failure on Test Pipelines
JRahnama Jul 14, 2021
bb8a2fe
review feedback
JRahnama Jul 16, 2021
1a3545b
adding attributes to SqlCommand and SqlConnection in netcore
JRahnama Aug 17, 2021
abcebfd
commit
JRahnama Aug 17, 2021
a772e0d
commit
JRahnama Aug 17, 2021
58c51f2
Merge branch 'main' of https://github.com/JRahnama/SqlClient into add…
Aug 19, 2021
1f94de4
Review comments
Aug 19, 2021
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
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@
<Compile Include="..\..\src\Resources\ResCategoryAttribute.cs">
<Link>Resources\ResCategoryAttribute.cs</Link>
</Compile>
<Compile Include="..\..\src\Resources\ResDescriptionAttribute.cs">
<Link>Resources\ResDescriptionAttribute.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard' OR '$(TargetGroup)' == 'netcoreapp' OR '$(IsUAPAssembly)' == 'true'">
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
Expand Down Expand Up @@ -830,7 +833,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />

<Compile Include="Resources\Strings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
Expand Down
6 changes: 6 additions & 0 deletions ...a.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.NetCoreApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.ComponentModel;
using System.Data.Common;
using System.Diagnostics;
using Microsoft.Data.Common;
Expand All @@ -24,6 +26,10 @@ private static PoolBlockingPeriod ConvertToPoolBlockingPeriod(string keyword, ob
}

/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/PoolBlockingPeriod/*' />
[DisplayNameAttribute(DbConnectionStringKeywords.PoolBlockingPeriod)]
[ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Pooling)]
[ResDescriptionAttribute(StringsHelper.ResourceNames.DbConnectionString_PoolBlockingPeriod)]
[RefreshPropertiesAttribute(RefreshProperties.All)]
public PoolBlockingPeriod PoolBlockingPeriod
{
get { return _poolBlockingPeriod; }
Expand Down
Loading