Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Move Microsoft.Windows.Compatibility into windowsdesktop #3516

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
merged 3 commits into from
Mar 28, 2023
Merged

Move Microsoft.Windows.Compatibility into windowsdesktop #3516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73a6a91
Move Microsoft.Windows.Compatibility into windowsdesktop
ViktorHofer Mar 24, 2023
ccd393e
Merge branch 'main' into AddWindowsCompatibilityPackage
ViktorHofer Mar 28, 2023
afe3bc6
Update Version.Details.xml
ViktorHofer Mar 28, 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
Next Next commit
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.
  • Loading branch information
@ViktorHofer
ViktorHofer committed Mar 28, 2023
commit 73a6a91a00fb8256489358b1603cb49d43542f78
4 changes: 4 additions & 0 deletions Build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<Project Sdk="Microsoft.Build.Traversal">

<ItemGroup>
<!-- Microsoft.WindowsDesktop.App shared framework -->
<ProjectReference Include="src\windowsdesktop\src\sfx\**\*.sfxproj" />
<ProjectReference Include="src\windowsdesktop\src\bundle\**\*.bundleproj" />
<ProjectReference Include="src\windowsdesktop\tests\**\*.Tests.csproj" />

<!-- Microsoft.Windows.Compatibility nuget meta package -->
<ProjectReference Include="src\Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" />
</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
<PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</PackageReleaseNotes>

<!-- Floating TFM which is defined in Arcade -->
<TargetFramework>$(NetCurrent)</TargetFramework>

<!-- Set up handling of build warnings -->
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
112 changes: 112 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,118 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>08940fbba6aed7b0edafb00914691035cf71cc7d</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Composition" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Data.Odbc" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Data.OleDb" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices.AccountManagement" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.IO.Ports" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Management" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Reflection.Context" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Syndication" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Speech" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Composition.Registration" Version="8.0.0-preview.4.23172.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7500625bd9303a48d0500b6123cec604e49039ae</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.0-preview.4.23172.4" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>f777662b7d00d81e52255e3c3b699f401eaaea6c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23174.1">
Expand Down
52 changes: 48 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project>

<PropertyGroup>
<MajorVersion>8</MajorVersion>
<MinorVersion>0</MinorVersion>
Expand All @@ -9,25 +10,68 @@
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<!--Package versions-->

<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23174.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23174.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- corefx -->
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
<SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
<SystemReflectionEmitILGenerationVersion>4.7.0</SystemReflectionEmitILGenerationVersion>
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
<!-- nuget -->
<NugetPackagingVersion>4.9.4</NugetPackagingVersion>
<!-- runtime -->
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.0-preview.4.23172.1</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23172.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23172.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.0-preview.4.23172.1</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftWin32RegistryAccessControlVersion>8.0.0-preview.4.23172.1</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>8.0.0-preview.4.23172.1</MicrosoftWin32SystemEventsVersion>
<SystemCodeDomVersion>8.0.0-preview.4.23172.1</SystemCodeDomVersion>
<SystemComponentModelCompositionRegistrationVersion>8.0.0-preview.4.23172.1</SystemComponentModelCompositionRegistrationVersion>
<SystemComponentModelCompositionVersion>8.0.0-preview.4.23172.1</SystemComponentModelCompositionVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23172.1</SystemConfigurationConfigurationManagerVersion>
<SystemDataOdbcVersion>8.0.0-preview.4.23172.1</SystemDataOdbcVersion>
<SystemDataOleDbVersion>8.0.0-preview.4.23172.1</SystemDataOleDbVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23172.1</SystemDiagnosticsEventLogVersion>
<SystemDiagnosticsPerformanceCounterVersion>8.0.0-preview.4.23172.1</SystemDiagnosticsPerformanceCounterVersion>
<SystemDirectoryServicesAccountManagementVersion>8.0.0-preview.4.23172.1</SystemDirectoryServicesAccountManagementVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23172.1</SystemDirectoryServicesProtocolsVersion>
<SystemDirectoryServicesVersion>8.0.0-preview.4.23172.1</SystemDirectoryServicesVersion>
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>8.0.0-preview.4.23172.1</SystemIOPackagingVersion>
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
<SystemIOPortsVersion>8.0.0-preview.4.23172.1</SystemIOPortsVersion>
<SystemManagementVersion>8.0.0-preview.4.23172.1</SystemManagementVersion>
<SystemReflectionContextVersion>8.0.0-preview.4.23172.1</SystemReflectionContextVersion>
<SystemRuntimeCachingVersion>8.0.0-preview.4.23172.1</SystemRuntimeCachingVersion>
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23172.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyProtectedDataVersion>8.0.0-preview.4.23172.1</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23172.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23172.1</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemServiceModelSyndicationVersion>8.0.0-preview.4.23172.1</SystemServiceModelSyndicationVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23172.1</SystemServiceProcessServiceControllerVersion>
<SystemSpeechVersion>8.0.0-preview.4.23172.1</SystemSpeechVersion>
<SystemTextEncodingCodePagesVersion>8.0.0-preview.4.23172.1</SystemTextEncodingCodePagesVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23172.1</SystemThreadingAccessControlVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23172.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<!-- wcf -->
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
<!-- winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.0-preview.4.23172.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.0-preview.4.23172.4</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.0-preview.4.23172.4</SystemDrawingCommonVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>8.0.0-preview.4.23177.1</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.0-preview.4.23177.1</MicrosoftDotNetWpfProjectTemplatesVersion>
<!-- Not auto-updated. -->
<NugetPackagingVersion>4.9.4</NugetPackagingVersion>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23174.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.3.0"
"Microsoft.Build.Traversal": "3.4.0"
}
}
Loading