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

Remove System.Drawing.Common from runtime #83356

Merged
merged 4 commits into from
Mar 16, 2023
Merged

Remove System.Drawing.Common from runtime #83356

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c34b7b
Remove System.Drawing.Common from runtime
ViktorHofer Mar 13, 2023
08edb01
Remove dependency and fix tests
ViktorHofer Mar 14, 2023
607cce2
Fix shim S.D.C reference
ViktorHofer Mar 15, 2023
c4a3861
Remove runtime test which causes failures
ViktorHofer Mar 15, 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 docs/area-owners.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
| area-System.Diagnostics.Tracing | @tommcdon | @noahfalk @tommcdon @tarekgh | Included:<ul><li>System.Diagnostics.DiagnosticSource</li></ul> |
| area-System.Diagnostics.TraceSource | @ericstj | @dotnet/area-system-diagnostics-tracesource | |
| area-System.DirectoryServices | @ericstj | @dotnet/area-system-directoryservices | Consultants: @BRDPM @grubioe @jay98014 |
| area-System.Drawing | @ericstj | @dotnet/area-system-drawing | |
| area-System.Drawing | @ericstj | @dotnet/area-system-drawing | Excluded:<ul><li>System.Drawing.Common -> winforms</li></ul> |
| area-System.Dynamic.Runtime | @jaredpar | @cston @333fred | Archived component - limited churn/contributions (see [#27790](https://github.com/dotnet/runtime/issues/27790)) |
| area-System.Formats.Asn1 | @jeffhandley | @dotnet/area-system-formats-asn1 | |
| area-System.Formats.Cbor | @jeffhandley | @dotnet/area-system-formats-cbor | |
Expand Down
4 changes: 0 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@
<Sha>352d64e0ce9b99a8cff6207621432a986920ffd9</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.0-preview.3.23163.8">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>f941e8818a55393e65c38770e33a58721687e3d6</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23159.1">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
<SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
<SystemDrawingCommonVersion>8.0.0-preview.3.23163.8</SystemDrawingCommonVersion>
<SystemDrawingCommonVersion>7.0.0</SystemDrawingCommonVersion>
Copy link
Member

Choose a reason for hiding this comment

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

@oleksandr-didyk This will require a new SBRP I think.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes and we agree that this isn't ideal but we doubt that we can come up with a better solution before Preview 3 code-complete. We will likely need to add System.Drawing.Common/7.0.0 to SBRP but we don't need the net7.0 asset in it (to avoid bringing in the net7.0 targeting pack) as we can just use the net6.0 asset instead.

<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
Expand Down
2 changes: 2 additions & 0 deletions src/tests/Common/test_dependencies/test_dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Tools.RuntimeClient" Version="$(MicrosoftDiagnosticsToolsRuntimeClientVersion)" />
<!-- Required by the GitHub_25468 test project. -->
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

<Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
Expand Down