Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

[release/3.0] Fix TypeConverter for IComponent (#40837) #40883

Merged
merged 1 commit into from
Sep 10, 2019
Merged

[release/3.0] Fix TypeConverter for IComponent (#40837) #40883

merged 1 commit into from
Sep 10, 2019

Conversation

RussKie
Copy link
Member

@RussKie RussKie commented Sep 6, 2019 •
edited
Loading

A cherry pick of the #40837 fix to unblock dotnet/winforms#1553 for 3.0-GA.

/cc: @danmosemsft @hughbe @zsd4yr @ericstj

Customer Impact

Windows Forms customers using PropertyGrid control in their apps won't be able to drill down into object trees and expand complex objects.

Regression?

Yes

Risk

Risk is very small; just adding the missing interface registration for the type converter.

@RussKie
Copy link
Member Author

RussKie commented Sep 6, 2019

@safern

@ericstj
Copy link
Member

ericstj commented Sep 6, 2019

Any tests for this? Sorry we should have asked on the master PR.

@safern
Copy link
Member

safern commented Sep 6, 2019 •
edited
Loading

Yes my bad I merged to early.

We should add the converter to this test:

corefx/src/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs

Line 122 in d391103

public static void GetConverter(Type targetType, Type resultConverterType)

@danmoseley
Copy link
Member

@safern please send the usual mail to tactics for Steve when you're ready. I'm fine with the port.

@safern
Copy link
Member

safern commented Sep 6, 2019

@safern please send the usual mail to tactics for Steve when you're ready. I'm fine with the port.

Sure. I will add tests for this in master and cherry pick it into this PR.

@stephentoub stephentoub changed the title Fix TypeConverter for IComponent (#40837) [release/3.0] Fix TypeConverter for IComponent (#40837) Sep 6, 2019
@RussKie
Copy link
Member Author

RussKie commented Sep 7, 2019

Thank you

@danmoseley danmoseley added this to the 3.0 milestone Sep 9, 2019
@danmoseley danmoseley merged commit 174e366 into dotnet:release/3.0 Sep 10, 2019
@danmoseley
Copy link
Member

Santi will port test separately

@RussKie RussKie deleted the Fix_TypeConverter_for_IComponent branch September 10, 2019 07:12
ViktorHofer pushed a commit that referenced this pull request Sep 13, 2019
@dotnet-maestro-bot @ViktorHofer
[automated] Merge branch 'release/3.0' => 'release/3.1' (#41079)
3cba68f 
* Disable SDL validation (#40903)

SDL validation is too expensive to run on a per-build basis. Disable for now

* [release/3.0] Update dependencies from dotnet/standard (#40911)

* Update dependencies from https://github.com/dotnet/standard build 20190907.2

- NETStandard.Library - 2.1.0-prerelease.19457.2

* Update dependencies from https://github.com/dotnet/standard build 20190907.1

- NETStandard.Library - 2.1.0-prerelease.19457.1

* [release/3.0] Update dependencies from 3 repositories (#40915)

* Update dependencies from https://github.com/dotnet/core-setup build 20190907.02

- Microsoft.NETCore.App - 3.0.0-rc2-19457-02
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19457-02
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19457-02

* Update dependencies from https://github.com/dotnet/arcade build 20190906.10

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19456.10
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19456.10
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19456.10
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19456.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19456.10
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19456.10
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19456.10
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19456.10
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19456.10
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19456.10
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19456.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19456.10
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19456.10

* Update dependencies from https://github.com/dotnet/standard build 20190907.5

- NETStandard.Library - 2.1.0-prerelease.19457.5

* Disable ToolboxBitmatAttribute test in netfx (#40901) (#40908)

* [release/3.0] Update dependencies from 4 repositories (#40929)

* Update dependencies from https://github.com/dotnet/core-setup build 20190907.15

- Microsoft.NETCore.App - 3.0.0-rc2-19457-15
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19457-15
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19457-15

* Update dependencies from https://github.com/dotnet/arcade build 20190907.1

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19457.1
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19457.1
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19457.1
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19457.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.1
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19457.1
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19457.1
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19457.1
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19457.1
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19457.1
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19457.1
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19457.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19457.1
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19457.1

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190908.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190908.1

* Update dependencies from https://github.com/dotnet/standard build 20190908.3

- NETStandard.Library - 2.1.0-prerelease.19458.3

* [release/3.0] Update dependencies from 4 repositories (#40940)

* Update dependencies from https://github.com/dotnet/core-setup build 20190908.11

- Microsoft.NETCore.App - 3.0.0-rc2-19458-11
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19458-11
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19458-11

* Update dependencies from https://github.com/dotnet/arcade build 20190908.2

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19458.2
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19458.2
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19458.2
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19458.2
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19458.2
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19458.2
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19458.2
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19458.2
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19458.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19458.2
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19458.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19458.2
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19458.2

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190909.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190909.1

* Update dependencies from https://github.com/dotnet/standard build 20190909.3

- NETStandard.Library - 2.1.0-prerelease.19459.3

* Add missing IAsyncDisposable interfaces to System.Data (#40872)

Part of #35012

* Update dependencies from https://github.com/dotnet/coreclr build 20190909.3 (#40956)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19459.3
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19459.3
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19459.3

* Fix TypeConverter for IComponent (#40837) (#40883)

* .NET Core 3.0 Prev9 Intellisense nupkg version bump (#40963) (#40965)

* [release/3.0] Update dependencies from 4 repositories (#40951)

* Update dependencies from https://github.com/dotnet/standard build 20190909.4

- NETStandard.Library - 2.1.0-prerelease.19459.4

* Update dependencies from https://github.com/dotnet/core-setup build 20190909.40

- Microsoft.NETCore.App - 3.0.0-rc2-19459-40
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19459-40
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19459-40

* Update dependencies from https://github.com/dotnet/arcade build 20190909.10

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19459.10
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19459.10
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19459.10
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19459.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19459.10
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19459.10
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19459.10
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19459.10
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19459.10
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19459.10
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19459.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19459.10

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190910.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190910.1

* Add test for IComponent typeconverter register in TypeDescriptor (#40959) (#40977)

* Update dependencies from https://github.com/dotnet/coreclr build 20190910.2 (#40984)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.2
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.2

* Update dependencies from https://github.com/dotnet/coreclr build 20190910.4 (#41006)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.4
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.4
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.4

* [release/3.0] Update dependencies from dotnet/arcade dotnet/standard (#40986)

* Update dependencies from https://github.com/dotnet/arcade build 20190910.3

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19460.3
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19460.3
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19460.3
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19460.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19460.3
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19460.3
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19460.3
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19460.3
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19460.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19460.3
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19460.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19460.3
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19460.3

* Update dependencies from https://github.com/dotnet/standard build 20190910.4

- NETStandard.Library - 2.1.0-prerelease.19460.4

* Update dependencies from https://github.com/dotnet/standard build 20190910.5

- NETStandard.Library - 2.1.0-prerelease.19460.5

* [release/3.0] Avoid MemoryMarshal.Cast when transcoding from UTF-16 to UTF-8 while escaping in Utf8JsonWriter. (#40997)

* Avoid MemoryMarshal.Cast when transcoding from UTF-16 to UTF-8 while
escaping in Utf8JsonWriter.

* Fix a typo in spacing within the test.

* Guard against empty spans where an implementation of JavascriptEncoder
might not handle null ptrs correctly.

* Cleanup tests to avoid some duplication.

* Some more test clean up.

* Update dependencies from https://github.com/dotnet/coreclr build 20190910.8 (#41011)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.8
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.8
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.8

* Update dependencies from https://github.com/dotnet/coreclr build 20190910.11 (#41014)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.11
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.11
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.11

* [release/3.0] Update dependencies from 3 repositories (#41022)

* Update dependencies from https://github.com/dotnet/core-setup build 20190910.02

- Microsoft.NETCore.App - 3.0.0-rc2-19460-02
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19460-02
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19460-02

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190911.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190911.1

* Update dependencies from https://github.com/dotnet/standard build 20190911.3

- NETStandard.Library - 2.1.0-prerelease.19461.3

* Update dependencies from https://github.com/dotnet/coreclr build 20190911.3 (#41035)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19461.3
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19461.3
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19461.3

* adding version suffix as non empty for building release package versions

* Update dependencies from https://github.com/dotnet/coreclr build 20190911.5 (#41045)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19461.5
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19461.5
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19461.5

* [release/3.0] Update dependencies from 3 repositories (#41052)

* Update dependencies from https://github.com/dotnet/arcade build 20190911.7

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19461.7
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19461.7
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19461.7
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19461.7
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19461.7
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19461.7
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19461.7
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19461.7
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19461.7
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19461.7
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19461.7
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19461.7
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19461.7

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190912.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190912.1

* Update dependencies from https://github.com/dotnet/standard build 20190912.2

- NETStandard.Library - 2.1.0-prerelease.19462.2

* Update dependencies from https://github.com/dotnet/standard build 20190912.4

- NETStandard.Library - 2.1.0-prerelease.19462.4

* Update dependencies from https://github.com/dotnet/coreclr build 20190912.2 (#41062)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19462.2
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19462.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.2

* Update dependencies from https://github.com/dotnet/standard build 20190912.5

- NETStandard.Library - 2.1.0

* Stabilize package versions (#41076)

* Update dependencies from https://github.com/dotnet/coreclr build 20190912.5 (#41081)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19462.5
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19462.5
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
area-System.ComponentModel
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.
7 participants
@RussKie @ericstj @safern @danmoseley @stephentoub @Dotnet-GitSync-Bot @hughbe