Skip to content

Commit da3c547

Browse files
ViktorHoferViktorHofer
authored
Add dependencies required by windowsdesktop (#8909)
* Add dependencies required by windowsdesktop Unblocks dotnet/windowsdesktop#3516 Microsoft.Windows.Compatibility is being migrated from runtime to windowsdesktop and depends on packages from dotnet/runtime. As there's already a subscription from runtime -> winforms, a new one can't be added directly between runtime -> windowsdesktop as that would cause coherency issues. Instead, we need to flow the dependencies through winforms and wpf. * Update Version.Details.xml * Remove Windows.Compatiblity dependency
1 parent 39d44c2 commit da3c547

File tree

2 files changed

+78
-24
lines changed

2 files changed

+78
-24
lines changed

‎eng/Version.Details.xml‎

Lines changed: 77 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,75 +15,125 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
1515
<Uri>https://github.com/dotnet/runtime</Uri>
1616
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0-preview.4.23177.1">
18+
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.4.23177.1">
1919
<Uri>https://github.com/dotnet/runtime</Uri>
2020
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.Windows.Compatibility" Version="8.0.0-preview.4.23177.1">
22+
<Dependency Name="System.Windows.Extensions" Version="8.0.0-preview.4.23177.1">
2323
<Uri>https://github.com/dotnet/runtime</Uri>
2424
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
2525
</Dependency>
26-
<Dependency Name="System.CodeDom" Version="8.0.0-preview.4.23177.1">
26+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-preview.4.23177.1">
2727
<Uri>https://github.com/dotnet/runtime</Uri>
2828
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
2929
</Dependency>
30-
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.4.23177.1">
30+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-preview.4.23177.1">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
3232
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
3333
</Dependency>
34-
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.4.23177.1">
34+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.4.23177.1">
3535
<Uri>https://github.com/dotnet/runtime</Uri>
3636
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Security.Permissions" Version="8.0.0-preview.4.23177.1">
38+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.4.23177.1">
3939
<Uri>https://github.com/dotnet/runtime</Uri>
4040
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
4141
</Dependency>
42-
<Dependency Name="System.Windows.Extensions" Version="8.0.0-preview.4.23177.1">
42+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.4.23177.1">
4343
<Uri>https://github.com/dotnet/runtime</Uri>
4444
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-preview.4.23177.1">
46+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.0-preview.4.23177.1">
4747
<Uri>https://github.com/dotnet/runtime</Uri>
4848
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-preview.4.23177.1">
50+
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.4.23177.1">
5151
<Uri>https://github.com/dotnet/runtime</Uri>
5252
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
5353
</Dependency>
54-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.4.23177.1">
54+
<Dependency Name="System.Text.Json" Version="8.0.0-preview.4.23177.1">
5555
<Uri>https://github.com/dotnet/runtime</Uri>
5656
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
5757
</Dependency>
58-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.4.23177.1">
58+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23177.1">
59+
<Uri>https://github.com/dotnet/runtime</Uri>
60+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
61+
</Dependency>
62+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23177.1">
63+
<Uri>https://github.com/dotnet/runtime</Uri>
64+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
65+
</Dependency>
66+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.0-preview.4.23177.1">
67+
<Uri>https://github.com/dotnet/runtime</Uri>
68+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
69+
</Dependency>
70+
71+
<!-- These dependencies are required by windowsdesktop for coherency. -->
72+
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.4.23177.1">
73+
<Uri>https://github.com/dotnet/runtime</Uri>
74+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
75+
</Dependency>
76+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0-preview.4.23177.1">
77+
<Uri>https://github.com/dotnet/runtime</Uri>
78+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
79+
</Dependency>
80+
<Dependency Name="System.CodeDom" Version="8.0.0-preview.4.23177.1">
81+
<Uri>https://github.com/dotnet/runtime</Uri>
82+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
83+
</Dependency>
84+
<Dependency Name="System.ComponentModel.Composition" Version="8.0.0-preview.4.23177.1">
85+
<Uri>https://github.com/dotnet/runtime</Uri>
86+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
87+
</Dependency>
88+
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.4.23177.1">
89+
<Uri>https://github.com/dotnet/runtime</Uri>
90+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
91+
</Dependency>
92+
<Dependency Name="System.Data.Odbc" Version="8.0.0-preview.4.23177.1">
93+
<Uri>https://github.com/dotnet/runtime</Uri>
94+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
95+
</Dependency>
96+
<Dependency Name="System.Data.OleDb" Version="8.0.0-preview.4.23177.1">
5997
<Uri>https://github.com/dotnet/runtime</Uri>
6098
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
6199
</Dependency>
62100
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.4.23177.1">
63101
<Uri>https://github.com/dotnet/runtime</Uri>
64102
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
65103
</Dependency>
66-
<Dependency Name="System.DirectoryServices" Version="8.0.0-preview.4.23177.1">
104+
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.4.23177.1">
67105
<Uri>https://github.com/dotnet/runtime</Uri>
68106
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
69107
</Dependency>
70-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.4.23177.1">
108+
<Dependency Name="System.DirectoryServices.AccountManagement" Version="8.0.0-preview.4.23177.1">
71109
<Uri>https://github.com/dotnet/runtime</Uri>
72110
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
73111
</Dependency>
74-
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.4.23177.1">
112+
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0-preview.4.23177.1">
113+
<Uri>https://github.com/dotnet/runtime</Uri>
114+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
115+
</Dependency>
116+
<Dependency Name="System.DirectoryServices" Version="8.0.0-preview.4.23177.1">
75117
<Uri>https://github.com/dotnet/runtime</Uri>
76118
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
77119
</Dependency>
78120
<Dependency Name="System.IO.Packaging" Version="8.0.0-preview.4.23177.1">
79121
<Uri>https://github.com/dotnet/runtime</Uri>
80122
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
81123
</Dependency>
82-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.0-preview.4.23177.1">
124+
<Dependency Name="System.IO.Ports" Version="8.0.0-preview.4.23177.1">
83125
<Uri>https://github.com/dotnet/runtime</Uri>
84126
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
85127
</Dependency>
86-
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.4.23177.1">
128+
<Dependency Name="System.Management" Version="8.0.0-preview.4.23177.1">
129+
<Uri>https://github.com/dotnet/runtime</Uri>
130+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
131+
</Dependency>
132+
<Dependency Name="System.Reflection.Context" Version="8.0.0-preview.4.23177.1">
133+
<Uri>https://github.com/dotnet/runtime</Uri>
134+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
135+
</Dependency>
136+
<Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.4.23177.1">
87137
<Uri>https://github.com/dotnet/runtime</Uri>
88138
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
89139
</Dependency>
@@ -95,31 +145,35 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
95145
<Uri>https://github.com/dotnet/runtime</Uri>
96146
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
97147
</Dependency>
98-
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.4.23177.1">
148+
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.4.23177.1">
99149
<Uri>https://github.com/dotnet/runtime</Uri>
100150
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
101151
</Dependency>
102-
<Dependency Name="System.Text.Json" Version="8.0.0-preview.4.23177.1">
152+
<Dependency Name="System.Security.Permissions" Version="8.0.0-preview.4.23177.1">
103153
<Uri>https://github.com/dotnet/runtime</Uri>
104154
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
105155
</Dependency>
106-
<Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.4.23177.1">
156+
<Dependency Name="System.ServiceModel.Syndication" Version="8.0.0-preview.4.23177.1">
107157
<Uri>https://github.com/dotnet/runtime</Uri>
108158
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
109159
</Dependency>
110-
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.4.23177.1">
160+
<Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-preview.4.23177.1">
111161
<Uri>https://github.com/dotnet/runtime</Uri>
112162
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
113163
</Dependency>
114-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23177.1">
164+
<Dependency Name="System.Speech" Version="8.0.0-preview.4.23177.1">
115165
<Uri>https://github.com/dotnet/runtime</Uri>
116166
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
117167
</Dependency>
118-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23177.1">
168+
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.4.23177.1">
119169
<Uri>https://github.com/dotnet/runtime</Uri>
120170
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
121171
</Dependency>
122-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.0-preview.4.23177.1">
172+
<Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.4.23177.1">
173+
<Uri>https://github.com/dotnet/runtime</Uri>
174+
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
175+
</Dependency>
176+
<Dependency Name="System.ComponentModel.Composition.Registration" Version="8.0.0-preview.4.23177.1">
123177
<Uri>https://github.com/dotnet/runtime</Uri>
124178
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
125179
</Dependency>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<InputSimulatorPlusVersion>1.0.7</InputSimulatorPlusVersion>
7474
<MicrosoftVisualStudioThreadingVersion>17.0.15-alpha</MicrosoftVisualStudioThreadingVersion>
7575
<!-- This is needed for Verify.Xunit to pull correct version of System.Speech -->
76-
<MicrosoftWindowsCompatibilityVersion>8.0.0-preview.4.23177.1</MicrosoftWindowsCompatibilityVersion>
76+
<MicrosoftWindowsCompatibilityVersion>7.0.0</MicrosoftWindowsCompatibilityVersion>
7777
<MoqPackageVersion>4.10.0</MoqPackageVersion>
7878
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.23107.1</SystemComponentModelTypeConverterTestDataVersion>
7979
<SystemDrawingCommonTestDataVersion>8.0.0-beta.23107.1</SystemDrawingCommonTestDataVersion>

0 commit comments

Comments
 (0)