Skip to content

Commit 90cfb1a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#10810)
[main] Source code updates from dotnet/dotnet - Address Roslyn analyzer warnings IDE0031 and others These are showing up when building with a P4 .NET 10 SDK. This allows us to remove the warnAsError=false flag in the VMR when building wpf - Remove unnecessary dependencies - Fix a few more - Fix S.D.Common version - Build fix - Disable IDE0031 temporarily
1 parent 2a6fbf6 commit 90cfb1a

File tree

35 files changed

+146
-336
lines changed

35 files changed

+146
-336
lines changed

‎Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
66
<TargetFramework>net10.0</TargetFramework>
77
<TargetFrameworkVersion>10.0</TargetFrameworkVersion>
8+
<BuildWithNetFrameworkHostedCompiler>true</BuildWithNetFrameworkHostedCompiler>
9+
<!-- Temporarily disable IDE0031: Null check can be simplified warnings. -->
10+
<NoWarn>$(NoWarn);IDE0031</NoWarn>
811
</PropertyGroup>
912
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
1013
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">

‎eng/Version.Details.xml

Lines changed: 67 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -1,193 +1,112 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="58950550c5c2c7a2431595699b38fd0360fd63e9" BarId="265646" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.4.25223.119">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.5.25224.104">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
7+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.4.25223.119">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.5.25224.104">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
11+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.4.25221.6">
14-
<Uri>https://github.com/dotnet/runtime</Uri>
15-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.4.25224.104">
14+
<Uri>https://github.com/dotnet/dotnet</Uri>
15+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.4.25221.6">
18-
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.4.25224.104">
18+
<Uri>https://github.com/dotnet/dotnet</Uri>
19+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.4.25221.6">
22-
<Uri>https://github.com/dotnet/runtime</Uri>
23-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.4.25224.104">
22+
<Uri>https://github.com/dotnet/dotnet</Uri>
23+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.5.25222.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>462eb030906d5cfcbcbbe22126855da1073cda15</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.4.25221.6">
30-
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
32-
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.4.25221.6">
34-
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
36-
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25221.6">
38-
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
40-
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25221.6">
42-
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
44-
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25221.6">
46-
<Uri>https://github.com/dotnet/runtime</Uri>
47-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
48-
</Dependency>
49-
<!-- These dependencies are required by windowsdesktop for coherency. -->
50-
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-preview.4.25221.6">
51-
<Uri>https://github.com/dotnet/runtime</Uri>
52-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
53-
</Dependency>
54-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.4.25221.6">
55-
<Uri>https://github.com/dotnet/runtime</Uri>
56-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
57-
</Dependency>
58-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.4.25221.6">
59-
<Uri>https://github.com/dotnet/runtime</Uri>
60-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
61-
</Dependency>
62-
<Dependency Name="System.ComponentModel.Composition" Version="10.0.0-preview.4.25221.6">
63-
<Uri>https://github.com/dotnet/runtime</Uri>
64-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
65-
</Dependency>
66-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.4.25221.6">
67-
<Uri>https://github.com/dotnet/runtime</Uri>
68-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
69-
</Dependency>
70-
<Dependency Name="System.Data.Odbc" Version="10.0.0-preview.4.25221.6">
71-
<Uri>https://github.com/dotnet/runtime</Uri>
72-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
73-
</Dependency>
74-
<Dependency Name="System.Data.OleDb" Version="10.0.0-preview.4.25221.6">
75-
<Uri>https://github.com/dotnet/runtime</Uri>
76-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
77-
</Dependency>
78-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.4.25221.6">
79-
<Uri>https://github.com/dotnet/runtime</Uri>
80-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
81-
</Dependency>
82-
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="10.0.0-preview.4.25221.6">
83-
<Uri>https://github.com/dotnet/runtime</Uri>
84-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
85-
</Dependency>
86-
<Dependency Name="System.DirectoryServices.AccountManagement" Version="10.0.0-preview.4.25221.6">
87-
<Uri>https://github.com/dotnet/runtime</Uri>
88-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
89-
</Dependency>
90-
<Dependency Name="System.DirectoryServices.Protocols" Version="10.0.0-preview.4.25221.6">
91-
<Uri>https://github.com/dotnet/runtime</Uri>
92-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
93-
</Dependency>
94-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.4.25221.6">
95-
<Uri>https://github.com/dotnet/runtime</Uri>
96-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
97-
</Dependency>
98-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.4.25221.6">
99-
<Uri>https://github.com/dotnet/runtime</Uri>
100-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
101-
</Dependency>
102-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.4.25221.6">
103-
<Uri>https://github.com/dotnet/runtime</Uri>
104-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
105-
</Dependency>
106-
<Dependency Name="System.IO.Ports" Version="10.0.0-preview.4.25221.6">
107-
<Uri>https://github.com/dotnet/runtime</Uri>
108-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
109-
</Dependency>
110-
<Dependency Name="System.Management" Version="10.0.0-preview.4.25221.6">
111-
<Uri>https://github.com/dotnet/runtime</Uri>
112-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.4.25224.104">
30+
<Uri>https://github.com/dotnet/dotnet</Uri>
31+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
11332
</Dependency>
114-
<Dependency Name="System.Reflection.Context" Version="10.0.0-preview.4.25221.6">
115-
<Uri>https://github.com/dotnet/runtime</Uri>
116-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.4.25224.104">
34+
<Uri>https://github.com/dotnet/dotnet</Uri>
35+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
11736
</Dependency>
118-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.4.25221.6">
119-
<Uri>https://github.com/dotnet/runtime</Uri>
120-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25224.104">
38+
<Uri>https://github.com/dotnet/dotnet</Uri>
39+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
12140
</Dependency>
122-
<Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-preview.4.25221.6">
123-
<Uri>https://github.com/dotnet/runtime</Uri>
124-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
41+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25224.104">
42+
<Uri>https://github.com/dotnet/dotnet</Uri>
43+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
12544
</Dependency>
126-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-preview.4.25221.6">
127-
<Uri>https://github.com/dotnet/runtime</Uri>
128-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
45+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25224.104">
46+
<Uri>https://github.com/dotnet/dotnet</Uri>
47+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
12948
</Dependency>
130-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.4.25221.6">
131-
<Uri>https://github.com/dotnet/runtime</Uri>
132-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
49+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.4.25224.104">
50+
<Uri>https://github.com/dotnet/dotnet</Uri>
51+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
13352
</Dependency>
134-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.4.25221.6">
135-
<Uri>https://github.com/dotnet/runtime</Uri>
136-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
53+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.4.25224.104">
54+
<Uri>https://github.com/dotnet/dotnet</Uri>
55+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
13756
</Dependency>
138-
<Dependency Name="System.ServiceModel.Syndication" Version="10.0.0-preview.4.25221.6">
139-
<Uri>https://github.com/dotnet/runtime</Uri>
140-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
57+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.4.25224.104">
58+
<Uri>https://github.com/dotnet/dotnet</Uri>
59+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
14160
</Dependency>
142-
<Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-preview.4.25221.6">
143-
<Uri>https://github.com/dotnet/runtime</Uri>
144-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
61+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.4.25224.104">
62+
<Uri>https://github.com/dotnet/dotnet</Uri>
63+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
14564
</Dependency>
146-
<Dependency Name="System.Speech" Version="10.0.0-preview.4.25221.6">
147-
<Uri>https://github.com/dotnet/runtime</Uri>
148-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
65+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.4.25224.104">
66+
<Uri>https://github.com/dotnet/dotnet</Uri>
67+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
14968
</Dependency>
150-
<Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-preview.4.25221.6">
151-
<Uri>https://github.com/dotnet/runtime</Uri>
152-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
69+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.4.25224.104">
70+
<Uri>https://github.com/dotnet/dotnet</Uri>
71+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
15372
</Dependency>
154-
<Dependency Name="System.Threading.AccessControl" Version="10.0.0-preview.4.25221.6">
155-
<Uri>https://github.com/dotnet/runtime</Uri>
156-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
73+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.4.25224.104">
74+
<Uri>https://github.com/dotnet/dotnet</Uri>
75+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
15776
</Dependency>
158-
<Dependency Name="System.ComponentModel.Composition.Registration" Version="10.0.0-preview.4.25221.6">
159-
<Uri>https://github.com/dotnet/runtime</Uri>
160-
<Sha>c4bc9b0821921ec58eeaf0ab923d291259165dd9</Sha>
77+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.4.25224.104">
78+
<Uri>https://github.com/dotnet/dotnet</Uri>
79+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
16180
</Dependency>
162-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.4.25223.119">
81+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.5.25224.104">
16382
<Uri>https://github.com/dotnet/dotnet</Uri>
164-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
83+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
16584
</Dependency>
16685
</ProductDependencies>
16786
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.119">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25224.104">
16988
<Uri>https://github.com/dotnet/dotnet</Uri>
170-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
89+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
17190
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25223.119">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25224.104">
17392
<Uri>https://github.com/dotnet/dotnet</Uri>
174-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
93+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
17594
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25223.119">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25224.104">
17796
<Uri>https://github.com/dotnet/dotnet</Uri>
178-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
97+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
17998
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25223.119">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25224.104">
181100
<Uri>https://github.com/dotnet/dotnet</Uri>
182-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
101+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
183102
</Dependency>
184-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25223.119">
103+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25224.104">
185104
<Uri>https://github.com/dotnet/dotnet</Uri>
186-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
105+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
187106
</Dependency>
188-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25223.119">
107+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25224.104">
189108
<Uri>https://github.com/dotnet/dotnet</Uri>
190-
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
109+
<Sha>58950550c5c2c7a2431595699b38fd0360fd63e9</Sha>
191110
</Dependency>
192111
</ToolsetDependencies>
193112
</Dependencies>

0 commit comments

Comments
 (0)