Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</PropertyGroup>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="$(MSBuildThisFileDirectory)eng\ReferenceAssemblies.props" />
<Import Project="$(MSBuildThisFileDirectory)eng\FacadeAssemblies.props" />

<!-- Make sure the pdb is a separate file, and not embedded inside the dll (which is the ArcadeSDK default behavior) -->
<!-- Note that this MUST COME AFTER the import of Sdk.props -->
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="$(RepositoryEngineeringDir)versioning.targets" />
</Project>
64 changes: 0 additions & 64 deletions System.Windows.Forms.sln

This file was deleted.

129 changes: 129 additions & 0 deletions Winforms.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28222.4001
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms", "src\System.Windows.Forms\src\System.Windows.Forms.csproj", "{0D23A41B-2626-4703-9E4A-87C07F69B0B2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Ref", "src\System.Windows.Forms\ref\System.Windows.Forms.Ref.csproj", "{334C343B-9D39-498E-89D8-B6526028FD5C}"
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}") = "WinformsControlsTest", "src\System.Windows.Forms\tests\functests\WinformsControlsTest\WinformsControlsTest.csproj", "{657472B8-FDA3-49DF-B8BE-0246046A4348}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Winforms.Common.TestHelper", "src\System.Windows.Forms\tests\Common\Winforms.Common.TestHelper.csproj", "{576BE796-A475-4AC7-9664-ABBEF132E1C7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Private.Winforms", "pkg\Microsoft.Private.Winforms.csproj", "{F133342A-3040-4005-A2F0-7685AA7CB82D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors.Ref", "src\System.Windows.Forms.Design.Editors\ref\System.Windows.Forms.Design.Editors.Ref.csproj", "{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}"
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\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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Ref", "src\System.Windows.Forms.Design\ref\System.Windows.Forms.Design.Ref.csproj", "{351EA462-BCB8-42E7-8595-A4FE55E3B25D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Design.Facade", "src\System.Drawing.Design\src\System.Drawing.Design.Facade.csproj", "{A2B1148A-1747-47BD-8048-416C2C2AF14C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Design.Facade", "src\System.Design\src\System.Design.Facade.csproj", "{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{989F376E-AE19-43B0-A3E6-96A7E22B4E80}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D5951C9D-146A-4F80-9451-B7AED28254F1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DF68A171-D27B-4E6A-8A7E-63A651622355}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "facade", "facade", "{434C00C3-E498-4BA7-9764-9F0FC8CFE457}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Release|Any CPU.Build.0 = Release|Any CPU
{334C343B-9D39-498E-89D8-B6526028FD5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{334C343B-9D39-498E-89D8-B6526028FD5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{334C343B-9D39-498E-89D8-B6526028FD5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{334C343B-9D39-498E-89D8-B6526028FD5C}.Release|Any CPU.Build.0 = Release|Any CPU
{AB38E262-F206-4820-8F29-23C5F72A4A16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{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
{657472B8-FDA3-49DF-B8BE-0246046A4348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{657472B8-FDA3-49DF-B8BE-0246046A4348}.Debug|Any CPU.Build.0 = Debug|Any CPU
{657472B8-FDA3-49DF-B8BE-0246046A4348}.Release|Any CPU.ActiveCfg = Release|Any CPU
{657472B8-FDA3-49DF-B8BE-0246046A4348}.Release|Any CPU.Build.0 = Release|Any CPU
{F133342A-3040-4005-A2F0-7685AA7CB82D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F133342A-3040-4005-A2F0-7685AA7CB82D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F133342A-3040-4005-A2F0-7685AA7CB82D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F133342A-3040-4005-A2F0-7685AA7CB82D}.Release|Any CPU.Build.0 = Release|Any CPU
{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.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
{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E}.Release|Any CPU.Build.0 = Release|Any CPU
{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Release|Any CPU.Build.0 = Release|Any CPU
{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Release|Any CPU.Build.0 = Release|Any CPU
{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Release|Any CPU.Build.0 = Release|Any CPU
{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}.Release|Any CPU.Build.0 = Release|Any CPU
{576BE796-A475-4AC7-9664-ABBEF132E1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{576BE796-A475-4AC7-9664-ABBEF132E1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{576BE796-A475-4AC7-9664-ABBEF132E1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{576BE796-A475-4AC7-9664-ABBEF132E1C7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0D23A41B-2626-4703-9E4A-87C07F69B0B2} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
{334C343B-9D39-498E-89D8-B6526028FD5C} = {D5951C9D-146A-4F80-9451-B7AED28254F1}
{AB38E262-F206-4820-8F29-23C5F72A4A16} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
{657472B8-FDA3-49DF-B8BE-0246046A4348} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
{F133342A-3040-4005-A2F0-7685AA7CB82D} = {989F376E-AE19-43B0-A3E6-96A7E22B4E80}
{5A619DC4-854A-450E-8F9A-AC72D2F5B59A} = {D5951C9D-146A-4F80-9451-B7AED28254F1}
{B50AC96F-2655-4687-A404-16DF51882CBC} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
{27F24D0C-5F0A-472E-AE12-98B386A13D50} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
{351EA462-BCB8-42E7-8595-A4FE55E3B25D} = {D5951C9D-146A-4F80-9451-B7AED28254F1}
{A2B1148A-1747-47BD-8048-416C2C2AF14C} = {434C00C3-E498-4BA7-9764-9F0FC8CFE457}
{9BEC2806-D8E0-443B-8B58-9D344E0C2D24} = {434C00C3-E498-4BA7-9764-9F0FC8CFE457}
{576BE796-A475-4AC7-9664-ABBEF132E1C7} = {DF68A171-D27B-4E6A-8A7E-63A651622355}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}
EndGlobalSection
EndGlobal
38 changes: 38 additions & 0 deletions eng/FacadeAssemblies.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<IsFacadeAssembly Condition="'$(IsFacadeAssembly)'=='' AND ($(MSBuildProjectName.EndsWith('.Facade')))">true</IsFacadeAssembly>
</PropertyGroup>

<PropertyGroup Condition="'$(IsFacadeAssembly)'=='true'">
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>

<!-- allow desktop references -->
<AssetTargetFallback>net472</AssetTargetFallback>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<MicrosoftTargetingPackNETFrameworkv472Package>Microsoft.TargetingPack.NETFramework.v4.7.2</MicrosoftTargetingPackNETFrameworkv472Package>
</PropertyGroup>

<ItemGroup Condition="'$(IsFacadeAssembly)'=='true'">

<PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" />
<PackageReference Include="$(MicrosoftTargetingPackNETFrameworkv472Package)" Version="$(MicrosoftTargetingPackNETFrameworkv472PackageVersion)" />
</ItemGroup>

<Target Condition="'$(IsFacadeAssembly)'=='true'" Name="ResolveMatchingContract" AfterTargets="ResolvePackageDependenciesForBuild">
<ItemGroup>
<_desktopReference Include="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == '$(MicrosoftTargetingPackNETFrameworkv472Package)'" />
<Reference Remove="@(_desktopReference)" />
<ResolvedMatchingContract Include="@(_desktopReference)" Condition="'%(FileName)%(Extension)' == '$(AssemblyName).dll'" />

<!-- in case we're regenerating a facade that is already referenced -->
<Reference Remove="@(Reference)" Condition="'%(FileName)%(Extension)' == '$(AssemblyName).dll'"/>
</ItemGroup>
</Target>

<!-- https://github.com/dotnet/arcade/issues/1374 -->
<Target Condition="'$(IsFacadeAssembly)'=='true'" Name="EnsureBuildToolsRuntime" />

</Project>
Loading