Skip to content

Commit d6f1b19

Browse files
edwardnealedwardneal
authored
Cleanup | Remove GenerateResourceStringsSource MSBuild target (#3639)
1 parent 12c76f6 commit d6f1b19

File tree

16 files changed

+254
-316
lines changed

16 files changed

+254
-316
lines changed

‎src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@
2626
<PropertyGroup>
2727
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
2828
</PropertyGroup>
29-
<PropertyGroup>
30-
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>
31-
</PropertyGroup>
3229
<ItemGroup>
3330
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
34-
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
3531
</ItemGroup>
3632
<ItemGroup>
3733
<ProjectReference Condition="'$(TargetGroup)'=='netcoreapp' AND !$(ReferenceType.Contains('Package'))" Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,5 +1097,4 @@
10971097
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
10981098
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
10991099
<Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
1100-
<Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />
11011100
</Project>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,13 @@
2828
<PropertyGroup>
2929
<DebugType>full</DebugType>
3030
</PropertyGroup>
31-
<PropertyGroup>
32-
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)\$(TargetFramework)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>
33-
</PropertyGroup>
3431
<ItemGroup Condition="$(CDP_BUILD_TYPE)!=Official">
3532
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
3633
<_Parameter1>UnitTests</_Parameter1>
3734
</AssemblyAttribute>
3835
</ItemGroup>
3936
<ItemGroup>
4037
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
41-
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
4238
</ItemGroup>
4339
<PropertyGroup>
4440
<!-- CSC Compiler Options -->
@@ -1071,7 +1067,6 @@
10711067
<PackageReference Include="System.ValueTuple" />
10721068
<PackageReference Include="System.Threading.Channels" />
10731069
</ItemGroup>
1074-
<Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />
10751070
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
10761071
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
10771072
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />

‎src/Microsoft.Data.SqlClient/netfx/tools/scripts/GenerateResourceStringsSource.ps1‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateResourceStringsSource.targets‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ private SqlCommand(SqlCommand from)
456456
#region Events
457457

458458
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/StatementCompleted/*'/>
459-
[ResCategory(StringsHelper.ResourceNames.DataCategory_StatementCompleted)]
460-
[ResDescription(StringsHelper.ResourceNames.DbCommand_StatementCompleted)]
459+
[ResCategory(nameof(Strings.DataCategory_StatementCompleted))]
460+
[ResDescription(nameof(Strings.DbCommand_StatementCompleted))]
461461
public event StatementCompletedEventHandler StatementCompleted
462462
{
463463
add
@@ -520,13 +520,13 @@ private enum ProcParamsColIndex
520520
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ColumnEncryptionSetting/*'/>
521521
[Browsable(false)]
522522
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
523-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
524-
[ResDescription(StringsHelper.ResourceNames.TCE_SqlCommand_ColumnEncryptionSetting)]
523+
[ResCategory(nameof(Strings.DataCategory_Data))]
524+
[ResDescription(nameof(Strings.TCE_SqlCommand_ColumnEncryptionSetting))]
525525
public SqlCommandColumnEncryptionSetting ColumnEncryptionSetting => _columnEncryptionSetting;
526526

527527
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/CommandTimeout/*'/>
528-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
529-
[ResDescription(StringsHelper.ResourceNames.DbCommand_CommandTimeout)]
528+
[ResCategory(nameof(Strings.DataCategory_Data))]
529+
[ResDescription(nameof(Strings.DbCommand_CommandTimeout))]
530530
public override int CommandTimeout
531531
{
532532
get => _commandTimeout ?? DefaultCommandTimeout;
@@ -554,8 +554,8 @@ public override int CommandTimeout
554554
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/CommandText/*'/>
555555
[DefaultValue("")]
556556
[RefreshProperties(RefreshProperties.All)]
557-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
558-
[ResDescription(StringsHelper.ResourceNames.DbCommand_CommandText)]
557+
[ResCategory(nameof(Strings.DataCategory_Data))]
558+
[ResDescription(nameof(Strings.DbCommand_CommandText))]
559559
public override string CommandText
560560
{
561561
get => _commandText ?? string.Empty;
@@ -578,8 +578,8 @@ public override string CommandText
578578
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/CommandType/*'/>
579579
[DefaultValue(CommandType.Text)]
580580
[RefreshProperties(RefreshProperties.All)]
581-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
582-
[ResDescription(StringsHelper.ResourceNames.DbCommand_CommandType)]
581+
[ResCategory(nameof(Strings.DataCategory_Data))]
582+
[ResDescription(nameof(Strings.DbCommand_CommandType))]
583583
public override CommandType CommandType
584584
{
585585
get => _commandType != 0 ? _commandType : CommandType.Text;
@@ -612,8 +612,8 @@ public override CommandType CommandType
612612

613613
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Connection/*'/>
614614
[DefaultValue(null)]
615-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
616-
[ResDescription(StringsHelper.ResourceNames.DbCommand_Connection)]
615+
[ResCategory(nameof(Strings.DataCategory_Data))]
616+
[ResDescription(nameof(Strings.DbCommand_Connection))]
617617
public new SqlConnection Connection
618618
{
619619
get => _activeConnection;
@@ -695,8 +695,8 @@ public override bool DesignTimeVisible
695695
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Notification/*'/>
696696
[Browsable(false)]
697697
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
698-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Notification)]
699-
[ResDescription(StringsHelper.ResourceNames.SqlCommand_Notification)]
698+
[ResCategory(nameof(Strings.DataCategory_Notification))]
699+
[ResDescription(nameof(Strings.SqlCommand_Notification))]
700700
public SqlNotificationRequest Notification
701701
{
702702
get => _notification;
@@ -713,8 +713,8 @@ public SqlNotificationRequest Notification
713713
#if NETFRAMEWORK
714714
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/NotificationAutoEnlist/*'/>
715715
[DefaultValue(true)]
716-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Notification)]
717-
[ResDescription(StringsHelper.ResourceNames.SqlCommand_NotificationAutoEnlist)]
716+
[ResCategory(nameof(Strings.DataCategory_Notification))]
717+
[ResDescription(nameof(Strings.SqlCommand_NotificationAutoEnlist))]
718718
public bool NotificationAutoEnlist
719719
{
720720
get => _notificationAutoEnlist;
@@ -724,8 +724,8 @@ public bool NotificationAutoEnlist
724724

725725
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Parameters/*'/>
726726
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
727-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Data)]
728-
[ResDescription(StringsHelper.ResourceNames.DbCommand_Parameters)]
727+
[ResCategory(nameof(Strings.DataCategory_Data))]
728+
[ResDescription(nameof(Strings.DbCommand_Parameters))]
729729
public new SqlParameterCollection Parameters
730730
{
731731
get
@@ -753,7 +753,7 @@ public SqlRetryLogicBaseProvider RetryLogicProvider
753753
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/Transaction/*'/>
754754
[Browsable(false)]
755755
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
756-
[ResDescription(StringsHelper.ResourceNames.DbCommand_Transaction)]
756+
[ResDescription(nameof(Strings.DbCommand_Transaction))]
757757
public new SqlTransaction Transaction
758758
{
759759
get
@@ -791,8 +791,8 @@ public SqlRetryLogicBaseProvider RetryLogicProvider
791791

792792
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/UpdatedRowSource/*'/>
793793
[DefaultValue(UpdateRowSource.Both)]
794-
[ResCategory(StringsHelper.ResourceNames.DataCategory_Update)]
795-
[ResDescription(StringsHelper.ResourceNames.DbCommand_UpdatedRowSource)]
794+
[ResCategory(nameof(Strings.DataCategory_Update))]
795+
[ResDescription(nameof(Strings.DbCommand_UpdatedRowSource))]
796796
public override UpdateRowSource UpdatedRowSource
797797
{
798798
get => _updatedRowSource;

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public override string CatalogSeparator
8080
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommandBuilder.xml' path='docs/members[@name="SqlCommandBuilder"]/DataAdapter/*'/>
8181
[
8282
DefaultValue(null),
83-
ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Update),
84-
ResDescriptionAttribute(StringsHelper.ResourceNames.SqlCommandBuilder_DataAdapter),
83+
ResCategoryAttribute(nameof(Strings.DataCategory_Update)),
84+
ResDescriptionAttribute(nameof(Strings.SqlCommandBuilder_DataAdapter)),
8585
]
8686
public new SqlDataAdapter DataAdapter
8787
{

0 commit comments

Comments
 (0)