Skip to content

Commit 73a6a91

Browse files
ViktorHoferViktorHofer
committed
Move Microsoft.Windows.Compatibility into windowsdesktop
Now that System.Drawing.Common is part of winforms, the Microsoft.Windows.Compatibility meta package needs to be moved into a higher layer as runtime can't depend on winforms' product dependencies. Moving TargetFramework property into the respective project files to allow this repository to have multi-targeting projects.
1 parent 62f733f commit 73a6a91

File tree

10 files changed

+255
-8
lines changed

10 files changed

+255
-8
lines changed

‎Build.proj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<Project Sdk="Microsoft.Build.Traversal">
22

33
<ItemGroup>
4+
<!-- Microsoft.WindowsDesktop.App shared framework -->
45
<ProjectReference Include="src\windowsdesktop\src\sfx\**\*.sfxproj" />
56
<ProjectReference Include="src\windowsdesktop\src\bundle\**\*.bundleproj" />
67
<ProjectReference Include="src\windowsdesktop\tests\**\*.Tests.csproj" />
8+
9+
<!-- Microsoft.Windows.Compatibility nuget meta package -->
10+
<ProjectReference Include="src\Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" />
711
</ItemGroup>
812

913
</Project>

‎Directory.Build.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
1717
<PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</PackageReleaseNotes>
1818

19-
<!-- Floating TFM which is defined in Arcade -->
20-
<TargetFramework>$(NetCurrent)</TargetFramework>
21-
2219
<!-- Set up handling of build warnings -->
2320
<WarningLevel>4</WarningLevel>
2421
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎eng/Version.Details.xml‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,118 @@
3737
<Uri>https://github.com/dotnet/wpf</Uri>
3838
<Sha>08940fbba6aed7b0edafb00914691035cf71cc7d</Sha>
3939
</Dependency>
40+
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
41+
<Uri>https://github.com/dotnet/runtime</Uri>
42+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
43+
</Dependency>
44+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
45+
<Uri>https://github.com/dotnet/runtime</Uri>
46+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
47+
</Dependency>
48+
<Dependency Name="System.CodeDom" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
49+
<Uri>https://github.com/dotnet/runtime</Uri>
50+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
51+
</Dependency>
52+
<Dependency Name="System.ComponentModel.Composition" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
53+
<Uri>https://github.com/dotnet/runtime</Uri>
54+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
55+
</Dependency>
56+
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
57+
<Uri>https://github.com/dotnet/runtime</Uri>
58+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
59+
</Dependency>
60+
<Dependency Name="System.Data.Odbc" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
61+
<Uri>https://github.com/dotnet/runtime</Uri>
62+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
63+
</Dependency>
64+
<Dependency Name="System.Data.OleDb" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
65+
<Uri>https://github.com/dotnet/runtime</Uri>
66+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
67+
</Dependency>
68+
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
69+
<Uri>https://github.com/dotnet/runtime</Uri>
70+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
71+
</Dependency>
72+
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
73+
<Uri>https://github.com/dotnet/runtime</Uri>
74+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
75+
</Dependency>
76+
<Dependency Name="System.DirectoryServices.AccountManagement" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
77+
<Uri>https://github.com/dotnet/runtime</Uri>
78+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
79+
</Dependency>
80+
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
81+
<Uri>https://github.com/dotnet/runtime</Uri>
82+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
83+
</Dependency>
84+
<Dependency Name="System.DirectoryServices" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
85+
<Uri>https://github.com/dotnet/runtime</Uri>
86+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
87+
</Dependency>
88+
<Dependency Name="System.IO.Packaging" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
89+
<Uri>https://github.com/dotnet/runtime</Uri>
90+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
91+
</Dependency>
92+
<Dependency Name="System.IO.Ports" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
93+
<Uri>https://github.com/dotnet/runtime</Uri>
94+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
95+
</Dependency>
96+
<Dependency Name="System.Management" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
97+
<Uri>https://github.com/dotnet/runtime</Uri>
98+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
99+
</Dependency>
100+
<Dependency Name="System.Reflection.Context" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
101+
<Uri>https://github.com/dotnet/runtime</Uri>
102+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
103+
</Dependency>
104+
<Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
105+
<Uri>https://github.com/dotnet/runtime</Uri>
106+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
107+
</Dependency>
108+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
109+
<Uri>https://github.com/dotnet/runtime</Uri>
110+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
111+
</Dependency>
112+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
113+
<Uri>https://github.com/dotnet/runtime</Uri>
114+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
115+
</Dependency>
116+
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
117+
<Uri>https://github.com/dotnet/runtime</Uri>
118+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
119+
</Dependency>
120+
<Dependency Name="System.Security.Permissions" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
121+
<Uri>https://github.com/dotnet/runtime</Uri>
122+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
123+
</Dependency>
124+
<Dependency Name="System.ServiceModel.Syndication" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
125+
<Uri>https://github.com/dotnet/runtime</Uri>
126+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
127+
</Dependency>
128+
<Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
129+
<Uri>https://github.com/dotnet/runtime</Uri>
130+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
131+
</Dependency>
132+
<Dependency Name="System.Speech" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
133+
<Uri>https://github.com/dotnet/runtime</Uri>
134+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
135+
</Dependency>
136+
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
137+
<Uri>https://github.com/dotnet/runtime</Uri>
138+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
139+
</Dependency>
140+
<Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
141+
<Uri>https://github.com/dotnet/runtime</Uri>
142+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
143+
</Dependency>
144+
<Dependency Name="System.ComponentModel.Composition.Registration" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
145+
<Uri>https://github.com/dotnet/runtime</Uri>
146+
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
147+
</Dependency>
148+
<Dependency Name="System.Drawing.Common" Version="8.0.0-preview.4.23172.4" CoherentParentDependency="Microsoft.Private.Winforms">
149+
<Uri>https://github.com/dotnet/winforms</Uri>
150+
<Sha>f777662b7d00d81e52255e3c3b699f401eaaea6c</Sha>
151+
</Dependency>
40152
</ProductDependencies>
41153
<ToolsetDependencies>
42154
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23174.1">

‎eng/Versions.props‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project>
2+
23
<PropertyGroup>
34
<MajorVersion>8</MajorVersion>
45
<MinorVersion>0</MinorVersion>
@@ -9,25 +10,68 @@
910
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1011
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1112
</PropertyGroup>
12-
<!--Package versions-->
13+
1314
<PropertyGroup>
1415
<!-- arcade -->
1516
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksFeedVersion>
1617
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksArchivesVersion>
1718
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksInstallersVersion>
1819
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23174.1</MicrosoftDotNetVersionToolsTasksVersion>
20+
<!-- corefx -->
21+
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
22+
<SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>
23+
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
24+
<SystemReflectionEmitILGenerationVersion>4.7.0</SystemReflectionEmitILGenerationVersion>
25+
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
26+
<!-- nuget -->
27+
<NugetPackagingVersion>4.9.4</NugetPackagingVersion>
1928
<!-- runtime -->
29+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.0-preview.4.23172.1</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
2030
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23172.1</MicrosoftNETCoreAppRefVersion>
2131
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23172.1</MicrosoftNETCoreAppRuntimewinx64Version>
22-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.0-preview.4.23172.1</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
32+
<MicrosoftWin32RegistryAccessControlVersion>8.0.0-preview.4.23172.1</MicrosoftWin32RegistryAccessControlVersion>
33+
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
34+
<MicrosoftWin32SystemEventsVersion>8.0.0-preview.4.23172.1</MicrosoftWin32SystemEventsVersion>
35+
<SystemCodeDomVersion>8.0.0-preview.4.23172.1</SystemCodeDomVersion>
36+
<SystemComponentModelCompositionRegistrationVersion>8.0.0-preview.4.23172.1</SystemComponentModelCompositionRegistrationVersion>
37+
<SystemComponentModelCompositionVersion>8.0.0-preview.4.23172.1</SystemComponentModelCompositionVersion>
38+
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23172.1</SystemConfigurationConfigurationManagerVersion>
39+
<SystemDataOdbcVersion>8.0.0-preview.4.23172.1</SystemDataOdbcVersion>
40+
<SystemDataOleDbVersion>8.0.0-preview.4.23172.1</SystemDataOleDbVersion>
41+
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23172.1</SystemDiagnosticsEventLogVersion>
42+
<SystemDiagnosticsPerformanceCounterVersion>8.0.0-preview.4.23172.1</SystemDiagnosticsPerformanceCounterVersion>
43+
<SystemDirectoryServicesAccountManagementVersion>8.0.0-preview.4.23172.1</SystemDirectoryServicesAccountManagementVersion>
44+
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23172.1</SystemDirectoryServicesProtocolsVersion>
45+
<SystemDirectoryServicesVersion>8.0.0-preview.4.23172.1</SystemDirectoryServicesVersion>
46+
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
47+
<SystemIOPackagingVersion>8.0.0-preview.4.23172.1</SystemIOPackagingVersion>
48+
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
49+
<SystemIOPortsVersion>8.0.0-preview.4.23172.1</SystemIOPortsVersion>
50+
<SystemManagementVersion>8.0.0-preview.4.23172.1</SystemManagementVersion>
51+
<SystemReflectionContextVersion>8.0.0-preview.4.23172.1</SystemReflectionContextVersion>
52+
<SystemRuntimeCachingVersion>8.0.0-preview.4.23172.1</SystemRuntimeCachingVersion>
53+
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
54+
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
55+
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23172.1</SystemSecurityCryptographyPkcsVersion>
56+
<SystemSecurityCryptographyProtectedDataVersion>8.0.0-preview.4.23172.1</SystemSecurityCryptographyProtectedDataVersion>
57+
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23172.1</SystemSecurityCryptographyXmlVersion>
58+
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23172.1</SystemSecurityPermissionsVersion>
59+
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
60+
<SystemServiceModelSyndicationVersion>8.0.0-preview.4.23172.1</SystemServiceModelSyndicationVersion>
61+
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23172.1</SystemServiceProcessServiceControllerVersion>
62+
<SystemSpeechVersion>8.0.0-preview.4.23172.1</SystemSpeechVersion>
63+
<SystemTextEncodingCodePagesVersion>8.0.0-preview.4.23172.1</SystemTextEncodingCodePagesVersion>
64+
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23172.1</SystemThreadingAccessControlVersion>
2365
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23172.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
66+
<!-- wcf -->
67+
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
2468
<!-- winforms -->
2569
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.0-preview.4.23172.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
2670
<MicrosoftPrivateWinformsVersion>8.0.0-preview.4.23172.4</MicrosoftPrivateWinformsVersion>
71+
<SystemDrawingCommonVersion>8.0.0-preview.4.23172.4</SystemDrawingCommonVersion>
2772
<!-- wpf -->
2873
<MicrosoftDotNetWpfGitHubVersion>8.0.0-preview.4.23177.1</MicrosoftDotNetWpfGitHubVersion>
2974
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.0-preview.4.23177.1</MicrosoftDotNetWpfProjectTemplatesVersion>
30-
<!-- Not auto-updated. -->
31-
<NugetPackagingVersion>4.9.4</NugetPackagingVersion>
3275
</PropertyGroup>
76+
3377
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1",
77
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23174.1",
88
"Microsoft.Build.NoTargets": "3.7.0",
9-
"Microsoft.Build.Traversal": "3.3.0"
9+
"Microsoft.Build.Traversal": "3.4.0"
1010
}
1111
}

0 commit comments

Comments
 (0)