Change SQL Server codenames to version names #1334
Conversation
|
It seems there are syntax errors: Please fix and check-in.. |
|
Fixed. |
Wraith2
force-pushed
the
rename-codenames
branch
from
8f09c72 to
10acb18
Compare
|
CI doesn't like this but as far as I can see none of the errors are due to my changes. |
Wraith2
force-pushed
the
rename-codenames
branch
from
10acb18 to
9712da3
Compare
DavoudEshtehari
requested review from
DavoudEshtehari,
JRahnama and
Kaur-Parminder
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBuffer.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
Outdated
Show resolved
Hide resolved
|
Can you address the conflict here please? |
Wraith2
force-pushed
the
rename-codenames
branch
from
9712da3 to
a848bbc
Compare
src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
Outdated
Show resolved
Hide resolved
|
I changed SqlCommandBuilder to have the |
| @@ -39,7 +39,7 @@ internal class Strings { | |||
| internal static global::System.Resources.ResourceManager ResourceManager { | |||
| get { | |||
| if (object.ReferenceEquals(resourceMan, null)) { | |||
| global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", typeof(Strings).Assembly); | |||
| global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SqlClient.Resources.Strings", typeof(Strings).Assembly); | |||
There was a problem hiding this comment.
Failures should came from these change!
| global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SqlClient.Resources.Strings", typeof(Strings).Assembly); | |
| global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", typeof(Strings).Assembly); |
There was a problem hiding this comment.
Fixed. The resource naming needs to be looked at sometime in a far future when we have time for such small issues.
There was a problem hiding this comment.
Seems it hasn't been fixed! 😉
There was a problem hiding this comment.
Nope. And I don't understand why it's broken or how i broke it in this PR. I may have to close and start again on a clean branch.
|
I don't understand the source of problems in this PR so I'm going to close and rework clearly on a new branch. Was there any comment or issue on the renames themselves? |
|
As my understanding if you follow my code suggestion and revert the last commit it'll be fixed. Please, give it a try before making a new PR. |
|
I tried, it didn't. That combined with the earlier changes that were resolved by rebasing concerned me enough that I'd rather do it again cleanly than risk an unclean branch causing later issues. |
This changes the sql server codenames found in the code to the released version numbers as found at https://en.wikipedia.org/wiki/List_of_Microsoft_codenames#SQL_Server_family
I thought this would be a fairly small set of changes when i started but it has ended up touching a lot of files. There are no functional changes.