Skip to content

Commit bc968b3

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/winforms (#3647)
[master] Update dependencies from dotnet/winforms - Coherency Updates: - Microsoft.Win32.Registry: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.CodeDom: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Internal: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms) - .NET Core WPF Build error on custom BaseIntermediateOutputPath #1718 (#3120) * Use more robust relative path calculation in markup code generation - Do not reflow lines after measure - disconnect HostVisual on its own thread - Fix three scrolling hangs - remove useless Assert - handle re-entrant request to close ToolTip - Move StackTrace to error branch - FixedPage SOM bugs - Don't add null item peers - Use correct lock object for predefined packages - repair bad copy/paste - fix build break - remove AppContext switch - DataGrid.Copy: fail silently if clipboard is locked - update_intellisense_artifacts - Remove or replace Policheck violations in code comments (#3606) - Merge pull request #3542 from dotnet/rc2-askmode-BaseIntermediateOutputPath Ask-Mode: [release/5.0-rc2] Custom intermediate output paths shouldn't break markup compilation - Merge pull request #3564 from SamBent/VSPFreeze Vsp freeze - Merge pull request #3565 from SamBent/AutomationPeerNull Avoid null item AutomationPeers - Merge pull request #3566 from SamBent/TextReflow Avoid reflow of shaped text - Merge pull request #3567 from SamBent/HostVisualThreading HostVisual threading - Merge pull request #3568 from SamBent/PopupReentrancy Reentrancy when closing ToolTip - Merge pull request #3570 from SamBent/ClearTypeAntiAliasing ClearType anti-aliasing - Merge pull request #3574 from SamBent/NoisyStackTrace Move StackTrace to error branch - Merge pull request #3575 from SamBent/FixedPageOverlap FixedPage SOM bugs - Merge pull request #3576 from SamBent/LockedClipboard DataGrid.Copy: fail silently if clipboard is locked - Merge pull request #3577 from SamBent/PredefinedPackageSynch App resource threading issue - Revert "Merge pull request #3542 from dotnet/rc2-askmode-BaseIntermediateOutputPath" This reverts commit 3d4e91c, reversing changes made to ab840c4. - Merge branch 'release/5.0' of https://github.com/dotnet/wpf into release/5.0 - update intellisense version - missed a version - 1228498 [ wpf ][ PoliCheck ] - Defect : Term "nuked" - Merge pull request #3637 from dotnet/revertPath [release/5.0] Revert path change to markup compiler - Merge pull request #3642 from dotnet/policheck2 1228498 [ wpf ][ PoliCheck ] - Defect : Term "nuked" - Update arcade - Merge remote-tracking branch 'upstream/release/5.0' into darc-master-f9327a78-0358-4132-8625-923a71a6b121 - Update wpf-int dependencies - Replace null comparisons on non-nullable types that now cause compilation errors, due to the .NET SDK update. - PR feedback - PR feedback - Merge pull request #3640 from AdamYoblick/release/5.0 Update intellisense version - Merge remote-tracking branch 'upstream/release/5.0' into darc-master-f9327a78-0358-4132-8625-923a71a6b121 - Merge branch 'darc-master-f9327a78-0358-4132-8625-923a71a6b121' of https://github.com/dotnet/wpf into darc-master-f9327a78-0358-4132-8625-923a71a6b121 - Suppress obsolete API warnings. These must be fixed for 6.0.0. - Merge pull request #3659 from dotnet/fixdarcupdate Temporarily suppress obsolete API errors to get WPF master building - Merge branch 'master' into darc-master-f9327a78-0358-4132-8625-923a71a6b121
1 parent 77dc14d commit bc968b3

File tree

56 files changed

+894
-468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+894
-468
lines changed

‎eng/Version.Details.xml

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,127 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-alpha.1.20466.4">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-alpha.1.20516.2">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>6b20c21512a696a383a673e1411793846610000c</Sha>
6+
<Sha>da4cd35695fc7fbd19adfc3067f7b44ac90bc9e0</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-alpha.1.20466.4">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-alpha.1.20516.2">
99
<Uri>https://github.com/dotnet/winforms</Uri>
10-
<Sha>6b20c21512a696a383a673e1411793846610000c</Sha>
10+
<Sha>da4cd35695fc7fbd19adfc3067f7b44ac90bc9e0</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
12+
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
14+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
1515
</Dependency>
16-
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
16+
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
18+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
1919
</Dependency>
20-
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
22+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
2323
</Dependency>
24-
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
26+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
2727
</Dependency>
28-
<Dependency Name="System.DirectoryServices" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="System.DirectoryServices" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
30+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
3131
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="System.Drawing.Common" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
34+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
3535
</Dependency>
3636
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
3737
<Uri>https://github.com/dotnet/corefx</Uri>
3838
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
42+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Security.AccessControl" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
44+
<Dependency Name="System.Security.AccessControl" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
46+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
4747
</Dependency>
48-
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
50+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
5151
</Dependency>
52-
<Dependency Name="System.Security.Permissions" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
52+
<Dependency Name="System.Security.Permissions" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
54+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
56+
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
58+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Windows.Extensions" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="System.Windows.Extensions" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
62+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://github.com/dotnet/runtime</Uri>
66-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
66+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
6767
</Dependency>
6868
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-alpha.1.20516.2">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
7070
<Sha>193292b151b87389f43db4bde1d47a000afa266a</Sha>
7171
</Dependency>
72-
<Dependency Name="System.IO.Packaging" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="System.IO.Packaging" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://github.com/dotnet/runtime</Uri>
74-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
74+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
7575
</Dependency>
7676
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19562.1">
7777
<Uri>https://github.com/dotnet/coreclr</Uri>
7878
<Sha>d5bb8bf2437d447750cf0203dd55bb5160ff36b8</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://github.com/dotnet/runtime</Uri>
82-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
82+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://github.com/dotnet/runtime</Uri>
86-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
86+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
8787
</Dependency>
88-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
88+
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
8989
<Uri>https://github.com/dotnet/runtime</Uri>
90-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
90+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://github.com/dotnet/runtime</Uri>
94-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
94+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
96+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
9797
<Uri>https://github.com/dotnet/runtime</Uri>
98-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
98+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
9999
</Dependency>
100-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
100+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
101101
<Uri>https://github.com/dotnet/runtime</Uri>
102-
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
102+
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>
106-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20464.13">
106+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20509.12">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
108+
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20464.13">
110+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20509.12">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
112+
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20464.13">
114+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20509.12">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
116+
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20464.13">
118+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20509.12">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
120+
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20464.13">
122+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20509.12">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
124+
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

‎eng/Versions.props

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,48 @@
44
<VersionPrefix>6.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
7-
<SystemIOPackagingVersion>6.0.0-alpha.1.20428.2</SystemIOPackagingVersion>
8-
<SystemResourcesExtensionsVersion>6.0.0-alpha.1.20428.2</SystemResourcesExtensionsVersion>
7+
<SystemIOPackagingVersion>6.0.0-alpha.1.20515.8</SystemIOPackagingVersion>
8+
<SystemResourcesExtensionsVersion>6.0.0-alpha.1.20515.8</SystemResourcesExtensionsVersion>
99
</PropertyGroup>
1010
<!-- NuGet Package Versions -->
1111
<PropertyGroup>
12-
<MicrosoftPrivateWinformsVersion>6.0.0-alpha.1.20466.4</MicrosoftPrivateWinformsVersion>
12+
<MicrosoftPrivateWinformsVersion>6.0.0-alpha.1.20516.2</MicrosoftPrivateWinformsVersion>
1313
</PropertyGroup>
1414
<!-- Packages that come from https://github.com/dotnet/coreclr -->
1515
<PropertyGroup>
1616
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
17-
<MicrosoftNETCoreILDAsmVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreILDAsmVersion>
18-
<MicrosoftNETCoreILAsmVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreILAsmVersion>
17+
<MicrosoftNETCoreILDAsmVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreILDAsmVersion>
18+
<MicrosoftNETCoreILAsmVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreILAsmVersion>
1919
</PropertyGroup>
2020
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2121
<PropertyGroup>
22-
<MicrosoftNETCoreAppInternalVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreAppInternalVersion>
23-
<MicrosoftNETCoreAppRefVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreAppRefVersion>
24-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20428.2</MicrosoftNETCoreAppRuntimewinx64Version>
25-
<MicrosoftNETCorePlatformsVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCorePlatformsVersion>
26-
<SystemDrawingCommonVersion>6.0.0-alpha.1.20428.2</SystemDrawingCommonVersion>
27-
<SystemDirectoryServicesVersion>6.0.0-alpha.1.20428.2</SystemDirectoryServicesVersion>
28-
<SystemReflectionMetadataLoadContextVersion>6.0.0-alpha.1.20428.2</SystemReflectionMetadataLoadContextVersion>
22+
<MicrosoftNETCoreAppInternalVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreAppInternalVersion>
23+
<MicrosoftNETCoreAppRefVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreAppRefVersion>
24+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20515.8</MicrosoftNETCoreAppRuntimewinx64Version>
25+
<MicrosoftNETCorePlatformsVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCorePlatformsVersion>
26+
<SystemDrawingCommonVersion>6.0.0-alpha.1.20515.8</SystemDrawingCommonVersion>
27+
<SystemDirectoryServicesVersion>6.0.0-alpha.1.20515.8</SystemDirectoryServicesVersion>
28+
<SystemReflectionMetadataLoadContextVersion>6.0.0-alpha.1.20515.8</SystemReflectionMetadataLoadContextVersion>
2929
</PropertyGroup>
3030
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
3131
<PropertyGroup>
32-
<MicrosoftWin32RegistryPackageVersion>6.0.0-alpha.1.20428.2</MicrosoftWin32RegistryPackageVersion>
33-
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20428.2</SystemCodeDomPackageVersion>
34-
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-alpha.1.20428.2</SystemConfigurationConfigurationManagerPackageVersion>
35-
<SystemDiagnosticsEventLogPackageVersion>6.0.0-alpha.1.20428.2</SystemDiagnosticsEventLogPackageVersion>
32+
<MicrosoftWin32RegistryPackageVersion>6.0.0-alpha.1.20515.8</MicrosoftWin32RegistryPackageVersion>
33+
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20515.8</SystemCodeDomPackageVersion>
34+
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-alpha.1.20515.8</SystemConfigurationConfigurationManagerPackageVersion>
35+
<SystemDiagnosticsEventLogPackageVersion>6.0.0-alpha.1.20515.8</SystemDiagnosticsEventLogPackageVersion>
3636
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
3737
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
38-
<SystemSecurityAccessControlPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityAccessControlPackageVersion>
39-
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityCryptographyXmlPackageVersion>
40-
<SystemSecurityPermissionsPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityPermissionsPackageVersion>
41-
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityPrincipalWindowsPackageVersion>
42-
<SystemWindowsExtensionsPackageVersion>6.0.0-alpha.1.20428.2</SystemWindowsExtensionsPackageVersion>
38+
<SystemSecurityAccessControlPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityAccessControlPackageVersion>
39+
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityCryptographyXmlPackageVersion>
40+
<SystemSecurityPermissionsPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityPermissionsPackageVersion>
41+
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityPrincipalWindowsPackageVersion>
42+
<SystemWindowsExtensionsPackageVersion>6.0.0-alpha.1.20515.8</SystemWindowsExtensionsPackageVersion>
4343
</PropertyGroup>
4444
<!-- Packages that come from https://github.com/dotnet/arcade -->
4545
<PropertyGroup>
46-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20464.13</MicrosoftDotNetApiCompatVersion>
47-
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20464.13</MicrosoftDotNetCodeAnalysisPackageVersion>
48-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20464.13</MicrosoftDotNetGenAPIVersion>
46+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20509.12</MicrosoftDotNetApiCompatVersion>
47+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.20509.12</MicrosoftDotNetCodeAnalysisPackageVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20509.12</MicrosoftDotNetGenAPIVersion>
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
5151
<PropertyGroup>
@@ -78,15 +78,6 @@
7878
<NetFramework48RefAssembliesVersion>0.0.0.1</NetFramework48RefAssembliesVersion>
7979
<NetFramework472IlToolsVersion>0.0.0.1</NetFramework472IlToolsVersion>
8080
</PropertyGroup>
81-
<PropertyGroup>
82-
<RestoreSources>
83-
$(RestoreSources);
84-
https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json;
85-
https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json;
86-
https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
87-
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
88-
</RestoreSources>
89-
</PropertyGroup>
9081
<!--Package names-->
9182
<PropertyGroup>
9283
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>

‎eng/WpfArcadeSdk/tools/ReferenceAssembly.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
Outputs="$(IntellisenseXmlDir)$(AssemblyName).xml">
4747
<PropertyGroup>
4848
<!-- Also in global.json -->
49-
<DotNetApiDocsNet50>0.0.0.2</DotNetApiDocsNet50>
49+
<DotNetApiDocsNet50>0.0.0.3</DotNetApiDocsNet50>
5050

5151
<!--
5252
This blob lives in Azure storage at https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/dotnet-api-docs_net5.0/

‎eng/common/performance/performance-setup.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ if [[ "$wasm_runtime_loc" != "" ]]; then
210210
fi
211211

212212
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then
213+
configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
213214
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono"
214215
fi
215216

0 commit comments

Comments
 (0)