Skip to content

Remove new Microsoft.NETCore.App.Ref targeting pack assemblies from WindowsDesktop targeting pack #1747

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 1 commit into from
Jun 17, 2021
Merged

Remove new Microsoft.NETCore.App.Ref targeting pack assemblies from WindowsDesktop targeting pack #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
manually enabled by updating the metadata.
-->
<ItemGroup>
<ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="0" />
<ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="6.0.0" />
Copy link
Member

Choose a reason for hiding this comment

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

This is wrong. PatchVersion should not be the full version but just the last digit. AFAIK this setting is only relevant during servicing. @jkoritzinsky and @dagood should know more about it.

Copy link
Member

Choose a reason for hiding this comment

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

Viktor is right here.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like including ("major.minor.patch".) in the comment above this group might be confusing. Intended it to just be an example of where patch version is in a full version number, but easy to interpret differently. Probably clearer just to remove it and let the rest of the comment clarify that it should normally be the same as PatchVersion.

</ItemGroup>
<!--Package versions-->
<PropertyGroup>
Expand Down
6 changes: 0 additions & 6 deletions pkg/windowsdesktop/sfx/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,19 @@
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Wpf.GitHub" Version="$(MicrosoftDotNetWpfGitHubVersion)" />
<PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="$(MicrosoftWin32RegistryAccessControlVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsVersion)" />
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="$(SystemDiagnosticsPerformanceCounterVersion)" />
<PackageReference Include="System.DirectoryServices" Version="$(SystemDirectoryServicesVersion)" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" />
<PackageReference Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" />
<PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
<PackageReference Include="System.Threading.AccessControl" Version="$(SystemThreadingAccessControlVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
</ItemGroup>
Expand Down
6 changes: 0 additions & 6 deletions pkg/windowsdesktop/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,18 @@
-->
<ItemGroup>
<FrameworkListFileClass Include="Accessibility.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.Registry.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.Registry.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.SystemEvents.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.CodeDom.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Configuration.ConfigurationManager.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.EventLog.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.PerformanceCounter.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.DirectoryServices.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.IO.FileSystem.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.IO.Packaging.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.IO.Pipes.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Resources.Extensions.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Pkcs.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.ProtectedData.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Xml.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Permissions.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Principal.Windows.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Threading.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Windows.Extensions.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="WindowsFormsIntegration.dll" />
Expand Down