-
Notifications
You must be signed in to change notification settings - Fork 286
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.
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
Move into Shared for SqlCommandBuilder.cs #1284
Move into Shared for SqlCommandBuilder.cs #1284
Conversation
…e in the netfx csproj
I'm pretty sure we want the designer attributes in all builds. The difference may have come from the early version of netcore not having those attributes but since we don't support anything before 3.1 now if those attributes are present we should keep them. The only problem you might have is if the resources they use are localized and in that case we'll have to see what the MS team want to do, I know there's a long term goal for getting the netfx localized resources working in netcore. |
That's good to know. In that case, I should wait for #1272 and merge those in this PR before I remove the ifdefs for the designer attributes |
It'll depend on the attribute, if you check them on apisof.net for example DesignerSerializationVisibilityAttribute you can see it's in NS2.0 and netcore 2 onwards so it should be ok to do now. Perhaps just take out the iffdefs locally and see if it compiles? |
…utes as it is included in .NET Standard 2.0. Add the resource string SqlCommandBuilder_DataAdapter in StringHelper so it compiles on netcore as well without the ifdef NETFX
Thanks @Wraith2 , it looks like majority of the attributes builds fine with the exception of |
Hmm, have a look at #1152 and see if there's any precedent there that can help. I'd say just add the resource. |
…ist in the netfx csporj
src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
Outdated
Show resolved
Hide resolved
…rings.resx in netcore" This reverts commit 38ba56e.
… the subtype in the csproj
Relates to #1261 . I merged the SqlCommandBuilder.cs from netfx into netcore and then move it into the shared src. The netfx version uses
System.ComponentModel
and some attributes from it, which I assume were for WPF or WinForms and there were some DEBUG ifdefs, so I ifdef'ed them for NETFX.