Skip to content
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

Consolidation of localization #2110

Merged
merged 27 commits into from
Aug 14, 2023
Merged

Consolidation of localization #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5c505a1
Add SqlConnectionEncryptOptionConverter class which is used to conver…
arellegue Jun 8, 2023
9b9af7e
Merge branch 'main' of https://github.com/arellegue/SqlClient
arellegue Jun 8, 2023
cde0430
Fixed Issue #1126 .NET Core SqlConnection ConnectTimout 15 less than …
arellegue Jun 13, 2023
1f41e2d
Merge branch 'dotnet:main' into main
arellegue Jun 16, 2023
deac068
Revert "Add SqlConnectionEncryptOptionConverter class which is used t…
arellegue Jun 16, 2023
bf78858
Revert "Add SqlConnectionEncryptOptionConverter class which is used t…
arellegue Jun 16, 2023
2028759
Revert "Fixed Issue #1126 .NET Core SqlConnection ConnectTimout 15 le…
arellegue Jun 16, 2023
ede78dc
Merge branch 'main' of https://github.com/arellegue/SqlClient
arellegue Jun 16, 2023
cd55e44
Merge branch 'dotnet:main' into main
arellegue Jun 27, 2023
fb748b9
Merge branch 'dotnet:main' into main
arellegue Jun 27, 2023
5305cdf
Merge branch 'dotnet:main' into main
arellegue Jul 11, 2023
4ce5bd9
Moved Strings.resx to ../../src/Resources folder.
arellegue Jul 18, 2023
e2cad4c
Regenerate Strings.Designer.cs from netcore and netfx to ensure the …
arellegue Jul 18, 2023
ba3aed1
Added string resource for testing of Localization Pipeline
arellegue Jul 18, 2023
8bf2a47
Added test string.
arellegue Jul 19, 2023
907bc61
Testing for Pipeline.
arellegue Jul 19, 2023
b27d3bd
Add test string 3 for pipeline manual test.
arellegue Jul 19, 2023
af7297a
Add localization test string.
arellegue Jul 21, 2023
4a06b1b
Added one more string to localize.
arellegue Jul 26, 2023
b3a926e
Remove test strings to localize.
arellegue Jul 31, 2023
fea7335
Removed blank lines in the .netcore project file.
arellegue Aug 3, 2023
4d261ee
Consolidated netcore and netfx StringHelper class.
arellegue Aug 9, 2023
847e3ea
Add powershell command for linux environment in GenerateResourceStrin…
arellegue Aug 9, 2023
98281b9
Refactored LocalizationTest class to use Theory and InlineData.
arellegue Aug 10, 2023
be79f20
Remove unused using and sorted remaining.
arellegue Aug 10, 2023
dcc4693
Added if preprocessor for netcore merged code into StringsHelper.cs.
arellegue Aug 11, 2023
181c4bc
Replaced misplaced tabs with spaces instead in Directory.Build.props.
arellegue Aug 11, 2023
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
2 changes: 1 addition & 1 deletion build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@

<Target Name="BuildTools" Condition="'$(BuildTools)' == 'true'">
<PropertyGroup>
<DotnetBuildCmd>$(DotNetCmd) dotnet build -c Release -p:ReferenceType=$(ReferenceType)"</DotnetBuildCmd>
<DotnetBuildCmd>$(DotNetCmd) dotnet build -c Release -p:ReferenceType=$(ReferenceType)</DotnetBuildCmd>
</PropertyGroup>
<Exec Command="$(DotnetBuildCmd)" WorkingDirectory="$(GenAPISrcDir)Microsoft.DotNet.GenAPI\" />
</Target>
Expand Down
6 changes: 5 additions & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@
<ManagedSourceCode>$(ProjectDir)Microsoft.Data.SqlClient\</ManagedSourceCode>
<SqlServerSourceCode>$(ProjectDir)Microsoft.SqlServer.Server\</SqlServerSourceCode>
<NetCoreSource>$(ManagedSourceCode)netcore\</NetCoreSource>
<NetCoreResources>$(ManagedSourceCode)src\Resources\</NetCoreResources>
<ResxFileName>Strings</ResxFileName>
<ResourceFileName>SqlClient.Resources.$(ResxFileName)</ResourceFileName>
<GeneratedSourceFileName>$(ResxFileName).ResourceNames.cs</GeneratedSourceFileName>
<NetFxSource>$(ManagedSourceCode)netfx\</NetFxSource>
<NetFxResources>$(ManagedSourceCode)netfx\src\Resources\</NetFxResources>
<NetFxResources>$(ManagedSourceCode)src\Resources\</NetFxResources>
<AddOnsPath>$(ManagedSourceCode)add-ons\</AddOnsPath>
<SqlServerSource>$(RepoRoot)src\Microsoft.SqlServer.Server\</SqlServerSource>
<ObjFolder>$(Artifacts)obj\</ObjFolder>
Expand Down
26 changes: 16 additions & 10 deletions 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 @@ -495,15 +495,12 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStream.cs">
<Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
</Compile>
<Compile Include="..\..\src\Resources\ResCategoryAttribute.cs">
<Compile Include="..\..\src\Resources\ResCategoryAttribute.cs">
<Link>Resources\ResCategoryAttribute.cs</Link>
</Compile>
<Compile Include="..\..\src\Resources\ResDescriptionAttribute.cs">
<Link>Resources\ResDescriptionAttribute.cs</Link>
</Compile>
<Compile Include="..\..\src\Resources\StringsHelper.cs">
<Link>Resources\StringsHelper.cs</Link>
</Compile>
<Compile Include="..\..\src\System\Diagnostics\CodeAnalysis.cs">
<Link>Common\System\Diagnostics\CodeAnalysis.cs</Link>
</Compile>
Expand Down Expand Up @@ -570,20 +567,28 @@
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
</ItemGroup>
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
<Compile Include="Resources\StringsHelper.cs">
<Link>Resources\StringsHelper.NetCore.cs</Link>
</Compile>
<Compile Include="Resources\Strings.Designer.cs">
<ItemGroup>
<Compile Include="..\..\src\Resources\StringsHelper.cs">
<Link>Resources\StringsHelper.cs</Link>
</Compile>
<Compile Include="..\..\src\Resources\Strings.Designer.cs">
<Link>Resources\Strings.Designer.cs</Link>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
<EmbeddedResource Update="Resources\Strings.resx">
<EmbeddedResource Include="..\..\src\Resources\Strings.resx">
<Link>Resources\Strings.resx</Link>
<LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
<CustomToolNamespace>System</CustomToolNamespace>
</EmbeddedResource>
<EmbeddedResource Include="..\..\src\Resources\$(ResxFileName).*.resx">
<Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
<Compile Include="$(CommonPath)\CoreLib\System\Threading\Tasks\TaskToApm.cs">
<Link>Common\CoreLib\System\Threading\Tasks\TaskToApm.cs</Link>
</Compile>
Expand Down Expand Up @@ -985,4 +990,5 @@
<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="..\..\src\tools\targets\GenerateResourceStringsSource.targets" />
</Project>
Loading