Skip to content

Consolidate Design projects #2781

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

Merged
RussKie merged 2 commits into from
Jan 30, 2020
Merged

Consolidate Design projects #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07f916a
Consolidate design projects
RussKie Jan 29, 2020
4bf21f2
fixup! Consolidate design projects
RussKie Jan 29, 2020
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
14 changes: 0 additions & 14 deletions Winforms.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Tests", "src\System.Windows.Forms\tests\UnitTests\System.Windows.Forms.Tests.csproj", "{AB38E262-F206-4820-8F29-23C5F72A4A16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors", "src\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.csproj", "{B50AC96F-2655-4687-A404-16DF51882CBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors.Tests", "src\System.Windows.Forms.Design.Editors\tests\UnitTests\System.Windows.Forms.Design.Editors.Tests.csproj", "{27F24D0C-5F0A-472E-AE12-98B386A13D50}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Tests", "src\System.Windows.Forms.Design\tests\UnitTests\System.Windows.Forms.Design.Tests.csproj", "{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design", "src\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj", "{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}"
Expand Down Expand Up @@ -144,14 +140,6 @@ Global
{AB38E262-F206-4820-8F29-23C5F72A4A16}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB38E262-F206-4820-8F29-23C5F72A4A16}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB38E262-F206-4820-8F29-23C5F72A4A16}.Release|Any CPU.Build.0 = Release|Any CPU
{B50AC96F-2655-4687-A404-16DF51882CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B50AC96F-2655-4687-A404-16DF51882CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B50AC96F-2655-4687-A404-16DF51882CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B50AC96F-2655-4687-A404-16DF51882CBC}.Release|Any CPU.Build.0 = Release|Any CPU
{27F24D0C-5F0A-472E-AE12-98B386A13D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27F24D0C-5F0A-472E-AE12-98B386A13D50}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27F24D0C-5F0A-472E-AE12-98B386A13D50}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27F24D0C-5F0A-472E-AE12-98B386A13D50}.Release|Any CPU.Build.0 = Release|Any CPU
{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -256,8 +244,6 @@ Global
{657472B8-FDA3-49DF-B8BE-0246046A4348} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
{0D23A41B-2626-4703-9E4A-87C07F69B0B2} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
{AB38E262-F206-4820-8F29-23C5F72A4A16} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
{B50AC96F-2655-4687-A404-16DF51882CBC} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
{27F24D0C-5F0A-472E-AE12-98B386A13D50} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
{A2B1148A-1747-47BD-8048-416C2C2AF14C} = {434C00C3-E498-4BA7-9764-9F0FC8CFE457}
Expand Down
1 change: 0 additions & 1 deletion pkg/Microsoft.Private.Winforms/FrameworkListFiles.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<FrameworkListFileClass Include="System.Drawing.Design.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Drawing.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Windows.Forms.Design.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Windows.Forms.Design.Editors.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Windows.Forms.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Windows.Forms.Primitives.dll" Profile="WindowsForms" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
<ProjectReference Include="..\..\src\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />

<!-- Reference and Source System.Windows.Forms.Design.Editors includes -->
<ProjectReference Include="..\..\src\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.csproj" />

<!-- Facade for Microsoft.VisualBasic include -->
<ProjectReference Include="..\..\src\Microsoft.VisualBasic\src\Microsoft.VisualBasic.Facade.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/System.Design/src/System.Design.Facade.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.csproj" />
<ProjectReference Include="..\..\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/System.Drawing.Design/src/System.Drawing.Design.Facade.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.csproj" />
<ProjectReference Include="..\..\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />
<ProjectReference Include="..\..\System.Windows.Forms\src\System.Windows.Forms.csproj" />
</ItemGroup>

Expand Down
7 changes: 0 additions & 7 deletions src/System.Windows.Forms.Design.Editors/Directory.Build.props
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/System.Windows.Forms.Design.Editors/src/Properties/InternalsVisibleTo.cs
View file
Open in desktop

This file was deleted.

Loading