Skip to content

Commit 87b9b15

Browse files
ViktorHoferViktorHofer
authored
Consume transport pack from dotnet/runtime (#1936)
* Consume transport pack from dotnet/runtime dotnet/runtime packages don't contain reference assemblies anymore. As windowsdesktop distributes some of dotnet/runtime's reference assemblies in their targeting pack, consuming a transport package from dotnet/runtime which contains all the required assets (ref + lib + docs) Removing stale properties and subscriptions as well. * Update Version.Details.xml * Update Versions.props * Update Directory.Build.props
1 parent 03cad95 commit 87b9b15

File tree

4 files changed

+9
-123
lines changed

4 files changed

+9
-123
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.0-rc.1.21416.10">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
7-
</Dependency>
8-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
9-
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
11-
</Dependency>
12-
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
13-
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
15-
</Dependency>
16-
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
17-
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
19-
</Dependency>
20-
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
21-
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
23-
</Dependency>
24-
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
25-
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
27-
</Dependency>
28-
<Dependency Name="System.DirectoryServices" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
29-
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
31-
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
33-
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
35-
</Dependency>
36-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
37-
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
39-
</Dependency>
40-
<Dependency Name="System.IO.Packaging" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
41-
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
43-
</Dependency>
44-
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
45-
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
47-
</Dependency>
48-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
49-
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
51-
</Dependency>
52-
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
53-
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
55-
</Dependency>
56-
<Dependency Name="System.Security.Permissions" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
57-
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
59-
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
61-
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
63-
</Dependency>
64-
<Dependency Name="System.Text.Json" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
65-
<Uri>https://github.com/dotnet/runtime</Uri>
66-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
67-
</Dependency>
68-
<Dependency Name="System.Threading.AccessControl" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
69-
<Uri>https://github.com/dotnet/runtime</Uri>
70-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
71-
</Dependency>
72-
<Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
73-
<Uri>https://github.com/dotnet/runtime</Uri>
74-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
6+
<Sha>65e50657278f6a3af5ccb7ac6def8d5baa5dd490</Sha>
757
</Dependency>
768
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-rc.1.21416.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
779
<Uri>https://github.com/dotnet/winforms</Uri>
@@ -97,10 +29,6 @@
9729
<Uri>https://github.com/dotnet/runtime</Uri>
9830
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
9931
</Dependency>
100-
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21415.6" CoherentParentDependency="Microsoft.Private.Winforms">
101-
<Uri>https://github.com/dotnet/runtime</Uri>
102-
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
103-
</Dependency>
10432
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rc.1.21416.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
10533
<Uri>https://github.com/dotnet/winforms</Uri>
10634
<Sha>0b0fb72df7dd54ae0e155c0d9fc61c41181b7c1d</Sha>

‎eng/Versions.props‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,11 @@
4646
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21412.1</MicrosoftDotNetBuildTasksPackagingVersion>
4747
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21412.1</MicrosoftDotNetBuildTasksInstallersVersion>
4848
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21412.1</MicrosoftDotNetVersionToolsTasksVersion>
49-
<!-- core-setup -->
50-
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21415.6</MicrosoftNETCoreAppRefVersion>
51-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21415.6</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
52-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21415.6</MicrosoftNETCoreAppRuntimewinx64Version>
53-
<!-- corefx -->
54-
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21415.6</MicrosoftNETCorePlatformsVersion>
55-
<MicrosoftWin32RegistryAccessControlVersion>6.0.0-rc.1.21415.6</MicrosoftWin32RegistryAccessControlVersion>
56-
<MicrosoftWin32SystemEventsVersion>6.0.0-rc.1.21415.6</MicrosoftWin32SystemEventsVersion>
57-
<SystemCodeDomVersion>6.0.0-rc.1.21415.6</SystemCodeDomVersion>
58-
<SystemConfigurationConfigurationManagerVersion>6.0.0-rc.1.21415.6</SystemConfigurationConfigurationManagerVersion>
59-
<SystemDiagnosticsEventLogVersion>6.0.0-rc.1.21415.6</SystemDiagnosticsEventLogVersion>
60-
<SystemDiagnosticsPerformanceCounterVersion>6.0.0-rc.1.21415.6</SystemDiagnosticsPerformanceCounterVersion>
61-
<SystemDirectoryServicesVersion>6.0.0-rc.1.21415.6</SystemDirectoryServicesVersion>
62-
<SystemDrawingCommonVersion>6.0.0-rc.1.21415.6</SystemDrawingCommonVersion>
63-
<SystemIOPackagingVersion>6.0.0-rc.1.21415.6</SystemIOPackagingVersion>
64-
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21415.6</SystemResourcesExtensionsVersion>
65-
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.1.21415.6</SystemSecurityCryptographyPkcsVersion>
66-
<SystemSecurityCryptographyProtectedDataVersion>6.0.0-rc.1.21415.6</SystemSecurityCryptographyProtectedDataVersion>
67-
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.1.21415.6</SystemSecurityCryptographyXmlVersion>
68-
<SystemSecurityPermissionsVersion>6.0.0-rc.1.21415.6</SystemSecurityPermissionsVersion>
69-
<SystemTextEncodingsWebVersion>6.0.0-rc.1.21415.6</SystemTextEncodingsWebVersion>
70-
<SystemTextJsonVersion>6.0.0-rc.1.21415.6</SystemTextJsonVersion>
71-
<SystemThreadingAccessControlVersion>6.0.0-rc.1.21415.6</SystemThreadingAccessControlVersion>
72-
<SystemWindowsExtensionsVersion>6.0.0-rc.1.21415.6</SystemWindowsExtensionsVersion>
49+
<!-- runtime -->
50+
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21416.10</MicrosoftNETCoreAppRefVersion>
51+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21416.10</MicrosoftNETCoreAppRuntimewinx64Version>
52+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.0-rc.1.21416.10</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
53+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21416.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
7354
<!-- winforms -->
7455
<MicrosoftPrivateWinformsVersion>6.0.0-rc.1.21416.2</MicrosoftPrivateWinformsVersion>
7556
<!-- wpf -->
@@ -84,14 +65,6 @@
8465
<NugetPackagingVersion>4.9.4</NugetPackagingVersion>
8566
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
8667
</PropertyGroup>
87-
<!--Package names-->
88-
<PropertyGroup>
89-
<MicrosoftDotNetBuildTasksFeedPackage>Microsoft.DotNet.Build.Tasks.Feed</MicrosoftDotNetBuildTasksFeedPackage>
90-
<MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage>
91-
<MicrosoftNETCoreTargetsPackage>Microsoft.NETCore.Targets</MicrosoftNETCoreTargetsPackage>
92-
<MicrosoftBclJsonSourcesPackage>Microsoft.Bcl.Json.Sources</MicrosoftBclJsonSourcesPackage>
93-
<MicrosoftSymbolUploaderBuildTaskPackage>Microsoft.SymbolUploader.Build.Task</MicrosoftSymbolUploaderBuildTaskPackage>
94-
</PropertyGroup>
9568
<!-- Base runtime pack name (RID-less) for shared framework tooling. -->
9669
<PropertyGroup>
9770
<MicrosoftNETCoreAppRuntimePackage>Microsoft.NETCore.App.Runtime</MicrosoftNETCoreAppRuntimePackage>

‎pkg/windowsdesktop/sfx/Directory.Build.props‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,6 @@
1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.DotNet.Wpf.GitHub" Version="$(MicrosoftDotNetWpfGitHubVersion)" />
2121
<PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" GeneratePathProperty="true" />
22-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="$(MicrosoftWin32RegistryAccessControlVersion)" />
23-
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsVersion)" />
24-
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomVersion)" />
25-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
26-
<PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
27-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="$(SystemDiagnosticsPerformanceCounterVersion)" />
28-
<PackageReference Include="System.DirectoryServices" Version="$(SystemDirectoryServicesVersion)" />
29-
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
30-
<PackageReference Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" />
31-
<PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
32-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
33-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)" />
34-
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
35-
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
36-
<PackageReference Include="System.Threading.AccessControl" Version="$(SystemThreadingAccessControlVersion)" />
37-
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
22+
<PackageReference Include="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="$(MicrosoftInternalRuntimeWindowsDesktopTransportVersion)" />
3823
</ItemGroup>
3924
</Project>

‎publish/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="$(MicrosoftDotNetBuildTasksFeedPackage)" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
23+
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
2424
<PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
2525
</ItemGroup>
2626

0 commit comments

Comments
 (0)