Skip to content

Cleanup | Remove GenerateResourceStringsSource MSBuild target #3639

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Cleanup | Remove GenerateResourceStringsSource MSBuild target #3639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbc47d9
Remove references to StringsHelper.ResourceNames
edwardneal Sep 25, 2025
2d8a875
Remove GenerateResourceStringsSource target and script
edwardneal Sep 25, 2025
ec957d8
Mopup: netfx resource strings, cleanup csproj, seal StringsHelper
edwardneal Sep 25, 2025
cfc6abb
Add test to verify behaviour of attributes
edwardneal Sep 26, 2025
58b0b53
Remove hardcoded resource string in applied via ResCategory
edwardneal Sep 26, 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
4 changes: 0 additions & 4 deletions ...ureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,8 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Condition="'$(TargetGroup)'=='netcoreapp' AND !$(ReferenceType.Contains('Package'))" Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />
Expand Down
1 change: 0 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 @@ -1078,5 +1078,4 @@
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
<Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
<Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />
</Project>
5 changes: 0 additions & 5 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,13 @@
<PropertyGroup>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)\$(TargetFramework)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup Condition="$(CDP_BUILD_TYPE)!=Official">
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>UnitTests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
</ItemGroup>
<PropertyGroup>
<!-- CSC Compiler Options -->
Expand Down Expand Up @@ -1048,7 +1044,6 @@
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.ValueTuple" />
</ItemGroup>
<Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
Expand Down
52 changes: 0 additions & 52 deletions src/Microsoft.Data.SqlClient/netfx/tools/scripts/GenerateResourceStringsSource.ps1
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateResourceStringsSource.targets
View file
Open in desktop

This file was deleted.

42 changes: 21 additions & 21 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ public sealed partial class SqlCommand : DbCommand, ICloneable
#region Events

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/StatementCompleted/*'/>
[ResCategory(StringsHelper.ResourceNames.DataCategory_StatementCompleted)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_StatementCompleted)]
[ResCategory(nameof(Strings.DataCategory_StatementCompleted))]
[ResDescription(nameof(Strings.DbCommand_StatementCompleted))]
public event StatementCompletedEventHandler StatementCompleted
{
add
Expand Down Expand Up @@ -242,13 +242,13 @@ private enum EXECTYPE
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ColumnEncryptionSetting/*'/>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
[ResDescription(StringsHelper.ResourceNames.TCE_SqlCommand_ColumnEncryptionSetting)]
[ResCategory(nameof(Strings.DataCategory_Data))]
[ResDescription(nameof(Strings.TCE_SqlCommand_ColumnEncryptionSetting))]
public SqlCommandColumnEncryptionSetting ColumnEncryptionSetting => _columnEncryptionSetting;

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/CommandTimeout/*'/>
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_CommandTimeout)]
[ResCategory(nameof(Strings.DataCategory_Data))]
[ResDescription(nameof(Strings.DbCommand_CommandTimeout))]
public override int CommandTimeout
{
get => _commandTimeout ?? DefaultCommandTimeout;
Expand Down Expand Up @@ -276,8 +276,8 @@ public override int CommandTimeout
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/CommandText/*'/>
[DefaultValue("")]
[RefreshProperties(RefreshProperties.All)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_CommandText)]
[ResCategory(nameof(Strings.DataCategory_Data))]
[ResDescription(nameof(Strings.DbCommand_CommandText))]
public override string CommandText
{
get => _commandText ?? string.Empty;
Expand All @@ -300,8 +300,8 @@ public override string CommandText
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/CommandType/*'/>
[DefaultValue(CommandType.Text)]
[RefreshProperties(RefreshProperties.All)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_CommandType)]
[ResCategory(nameof(Strings.DataCategory_Data))]
[ResDescription(nameof(Strings.DbCommand_CommandType))]
public override CommandType CommandType
{
get => _commandType != 0 ? _commandType : CommandType.Text;
Expand Down Expand Up @@ -334,8 +334,8 @@ public override CommandType CommandType

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Connection/*'/>
[DefaultValue(null)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_Connection)]
[ResCategory(nameof(Strings.DataCategory_Data))]
[ResDescription(nameof(Strings.DbCommand_Connection))]
public new SqlConnection Connection
{
get => _activeConnection;
Expand Down Expand Up @@ -417,8 +417,8 @@ public override bool DesignTimeVisible
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Notification/*'/>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Notification)]
[ResDescription(StringsHelper.ResourceNames.SqlCommand_Notification)]
[ResCategory(nameof(Strings.DataCategory_Notification))]
[ResDescription(nameof(Strings.SqlCommand_Notification))]
public SqlNotificationRequest Notification
{
get => _notification;
Expand All @@ -435,8 +435,8 @@ public SqlNotificationRequest Notification
#if NETFRAMEWORK
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/NotificationAutoEnlist/*'/>
[DefaultValue(true)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Notification)]
[ResDescription(StringsHelper.ResourceNames.SqlCommand_NotificationAutoEnlist)]
[ResCategory(nameof(Strings.DataCategory_Notification))]
[ResDescription(nameof(Strings.SqlCommand_NotificationAutoEnlist))]
public bool NotificationAutoEnlist
{
get => _notificationAutoEnlist;
Expand All @@ -446,8 +446,8 @@ public bool NotificationAutoEnlist

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Parameters/*'/>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_Parameters)]
[ResCategory(nameof(Strings.DataCategory_Data))]
[ResDescription(nameof(Strings.DbCommand_Parameters))]
public new SqlParameterCollection Parameters
{
get
Expand Down Expand Up @@ -475,7 +475,7 @@ public SqlRetryLogicBaseProvider RetryLogicProvider
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Transaction/*'/>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_Transaction)]
[ResDescription(nameof(Strings.DbCommand_Transaction))]
public new SqlTransaction Transaction
{
get
Expand Down Expand Up @@ -513,8 +513,8 @@ public SqlRetryLogicBaseProvider RetryLogicProvider

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/UpdatedRowSource/*'/>
[DefaultValue(UpdateRowSource.Both)]
[ResCategory(StringsHelper.ResourceNames.DataCategory_Update)]
[ResDescription(StringsHelper.ResourceNames.DbCommand_UpdatedRowSource)]
[ResCategory(nameof(Strings.DataCategory_Update))]
[ResDescription(nameof(Strings.DbCommand_UpdatedRowSource))]
public override UpdateRowSource UpdatedRowSource
{
get => _updatedRowSource;
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public override string CatalogSeparator
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommandBuilder.xml' path='docs/members[@name="SqlCommandBuilder"]/DataAdapter/*'/>
[
DefaultValue(null),
ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Update),
ResDescriptionAttribute(StringsHelper.ResourceNames.SqlCommandBuilder_DataAdapter),
ResCategoryAttribute(nameof(Strings.DataCategory_Update)),
ResDescriptionAttribute(nameof(Strings.SqlCommandBuilder_DataAdapter)),
]
public new SqlDataAdapter DataAdapter
{
Expand Down
Loading
Loading