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

Fix System.Drawing.Configurations to be netstandard compatible #24758

Merged
merged 4 commits into from
Oct 27, 2017

Conversation

safern
Copy link
Member

@safern safern commented Oct 19, 2017

This depends on: #24736 to be merged.

Fixes: https://github.com/dotnet/corefx/issues/24675

cc: @danmosemsft @weshaggard

<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_Drawing</GeneratePlatformNotSupportedAssemblyMessage>
<!-- Although we have a netstandard configuration, we know we are not currently UAP compatible-->
<UWPCompatible>false</UWPCompatible>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this actually needed? It should pass pinvoke checks with the netstandard build.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, it's not needed now because it won't scan netcoreapp ocnfiguration.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. I will remove it.

@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Drawing.Common.csproj">
<SupportedFramework>netcoreapp2.0</SupportedFramework>
<SupportedFramework>net461;netcoreapp2.0</SupportedFramework>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weshaggard should I add any other supported frameworks? Like AllXamarinFrameworks?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe so. We generally only add those when the Xamarin folks ask us to because they put this assembly inbox. @marek-safar @akoeplinger can correct me if I'm wrong.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding @ericstj as well because your CI error does seem to be pointing out the fact that you didn't list those target frameworks but they are supported now by your netstandard2.0 builds.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weshaggard is this a new netstandard assembly/package?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is a new package that targets netstandard. We have a few new packages that we should provide you a list of so you know what is coming.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've talked to @marek-safar offline and I shared a list of what packages that target netstandard are coming.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weshaggard @marek-safar I've added AllXamarinFrameworks to the pkgproj and added them as inbox in the package index as well. Please let me know if looks good.

@safern safern mentioned this pull request Oct 25, 2017
@safern safern force-pushed the FixDrawingConfigurations branch from f51ec74 to ceea736 Compare October 25, 2017 18:21
@safern
Copy link
Member Author

safern commented Oct 27, 2017

@weshaggard looks good?

@safern safern merged commit 46ea605 into dotnet:master Oct 27, 2017
@safern safern deleted the FixDrawingConfigurations branch October 27, 2017 20:27
@safern
Copy link
Member Author

safern commented Oct 27, 2017

thanks @weshaggard @danmosemsft

@karelz karelz added this to the 2.1.0 milestone Oct 28, 2017
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
…t/corefx#24758)

* Fix System.Drawing.Configurations to be netstandard compatible

* PR Feedback and Add net461 to pkgproj supported frameworks

* Add xamarin frameworks as inbox

* Change InboxOnTargetFramework to include $(AllXamarinFrameworks)


Commit migrated from dotnet/corefx@46ea605
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants