Skip to content
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

[master] Update dependencies from dotnet/winforms #3647

Merged
merged 76 commits into from
Oct 16, 2020
Merged

[master] Update dependencies from dotnet/winforms #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
8733ef2
.NET Core WPF Build error on custom BaseIntermediateOutputPath #1718 …
ryalanms Sep 17, 2020
17ed1f6
Do not reflow lines after measure
SamBent Sep 22, 2020
5be1d2f
disconnect HostVisual on its own thread
SamBent Sep 23, 2020
83d1840
Fix three scrolling hangs
SamBent Sep 23, 2020
daf9cec
remove useless Assert
SamBent Sep 23, 2020
c11c420
handle re-entrant request to close ToolTip
SamBent Sep 23, 2020
ace56f6
Move StackTrace to error branch
SamBent Sep 23, 2020
bf4c466
FixedPage SOM bugs
SamBent Sep 23, 2020
01dd8de
Don't add null item peers
SamBent Sep 23, 2020
8158a49
Use correct lock object for predefined packages
SamBent Sep 23, 2020
7d20243
repair bad copy/paste
SamBent Sep 23, 2020
c042ba0
fix build break
SamBent Sep 23, 2020
e628574
remove AppContext switch
SamBent Sep 24, 2020
1e18880
DataGrid.Copy: fail silently if clipboard is locked
SamBent Sep 24, 2020
58b2daa
update_intellisense_artifacts
AdamYoblick Oct 1, 2020
84338ca
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 2, 2020
ab840c4
Remove or replace Policheck violations in code comments (#3606)
ryalanms Oct 2, 2020
3d4e91c
Merge pull request #3542 from dotnet/rc2-askmode-BaseIntermediateOutp…
ryalanms Oct 6, 2020
f7eeebf
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 6, 2020
c01a204
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 7, 2020
ec587c0
Merge pull request #3564 from SamBent/VSPFreeze
SamBent Oct 7, 2020
ddda258
Merge pull request #3565 from SamBent/AutomationPeerNull
SamBent Oct 7, 2020
45f3f33
Merge pull request #3566 from SamBent/TextReflow
SamBent Oct 7, 2020
cf8bd1f
Merge pull request #3567 from SamBent/HostVisualThreading
SamBent Oct 7, 2020
7a0306a
Merge pull request #3568 from SamBent/PopupReentrancy
SamBent Oct 7, 2020
911b3c9
Merge pull request #3570 from SamBent/ClearTypeAntiAliasing
SamBent Oct 7, 2020
f84d22a
Merge pull request #3574 from SamBent/NoisyStackTrace
SamBent Oct 7, 2020
ab605d1
Merge pull request #3575 from SamBent/FixedPageOverlap
SamBent Oct 7, 2020
33c216d
Merge pull request #3576 from SamBent/LockedClipboard
SamBent Oct 7, 2020
1b0d3c4
Merge pull request #3577 from SamBent/PredefinedPackageSynch
SamBent Oct 7, 2020
f4219da
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Oct 8, 2020
cc0bab3
Update dependencies from https://github.com/dotnet/arcade build 20201…
dotnet-maestro[bot] Oct 8, 2020
85bea91
[release/5.0] Update dependencies from dotnet/winforms (#3615)
dotnet-maestro[bot] Oct 8, 2020
534e15e
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 8, 2020
3f2f364
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 9, 2020
de7e5a3
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 9, 2020
c720853
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 9, 2020
847a413
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 11, 2020
b540d98
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Oct 12, 2020
3ede9e2
Revert "Merge pull request #3542 from dotnet/rc2-askmode-BaseIntermed…
ryalanms Oct 12, 2020
1b26bef
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 13, 2020
0ece7ad
Merge branch 'release/5.0' of https://github.com/dotnet/wpf into rele…
AdamYoblick Oct 13, 2020
f2577e0
update intellisense version
AdamYoblick Oct 13, 2020
eb07a62
missed a version
AdamYoblick Oct 13, 2020
5f3f31d
1228498 [ wpf ][ PoliCheck ] - Defect : Term "nuked"
ryalanms Oct 13, 2020
7dbe561
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 13, 2020
5800b00
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 13, 2020
85c890f
Merge pull request #3637 from dotnet/revertPath
ryalanms Oct 13, 2020
5766949
Merge pull request #3642 from dotnet/policheck2
ryalanms Oct 13, 2020
4f8e90d
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
f352442
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
d33db7f
Update arcade
mmitche Oct 14, 2020
fba660b
Merge remote-tracking branch 'upstream/release/5.0' into darc-master-…
mmitche Oct 14, 2020
ddeacc8
Update wpf-int dependencies
mmitche Oct 14, 2020
8ac8fc3
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
6c4051a
[release/5.0] Update dependencies from dotnet/arcade (#3635)
dotnet-maestro[bot] Oct 14, 2020
e025683
Replace null comparisons on non-nullable types that now cause compila…
ryalanms Oct 14, 2020
05cbb0e
PR feedback
ryalanms Oct 14, 2020
0c63f2f
PR feedback
ryalanms Oct 14, 2020
a03ddbc
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
75ac545
Merge pull request #3640 from AdamYoblick/release/5.0
ryalanms Oct 14, 2020
bfd8669
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
569436d
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
4714d5c
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 14, 2020
469542f
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 15, 2020
8c2cdd6
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 15, 2020
2d719ef
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 15, 2020
12b57df
Merge remote-tracking branch 'upstream/release/5.0' into darc-master-…
mmitche Oct 15, 2020
f953a8e
Merge branch 'darc-master-f9327a78-0358-4132-8625-923a71a6b121' of ht…
mmitche Oct 15, 2020
c9c6136
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 15, 2020
c8849fd
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 16, 2020
51b2282
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 16, 2020
86421a9
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Oct 16, 2020
372724f
Suppress obsolete API warnings. These must be fixed for 6.0.0.
ryalanms Oct 16, 2020
10626bf
Merge pull request #3659 from dotnet/fixdarcupdate
ryalanms Oct 16, 2020
e0d19bf
Merge branch 'master' into darc-master-f9327a78-0358-4132-8625-923a71…
ryalanms Oct 16, 2020
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
108 changes: 54 additions & 54 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,127 +1,127 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-alpha.1.20466.4">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-alpha.1.20516.2">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>6b20c21512a696a383a673e1411793846610000c</Sha>
<Sha>da4cd35695fc7fbd19adfc3067f7b44ac90bc9e0</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-alpha.1.20466.4">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-alpha.1.20516.2">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>6b20c21512a696a383a673e1411793846610000c</Sha>
<Sha>da4cd35695fc7fbd19adfc3067f7b44ac90bc9e0</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.AccessControl" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-alpha.1.20516.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>193292b151b87389f43db4bde1d47a000afa266a</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19562.1">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>d5bb8bf2437d447750cf0203dd55bb5160ff36b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20428.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20515.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6b9b48f3466c25e17509137e3931229f406b425</Sha>
<Sha>722b8a660e7e0c59419196be102784244883ff08</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20464.13">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20464.13">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20464.13">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20464.13">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20464.13">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
57 changes: 24 additions & 33 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,48 @@
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-alpha.1.20428.2</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-alpha.1.20428.2</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>6.0.0-alpha.1.20515.8</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-alpha.1.20515.8</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-alpha.1.20466.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-alpha.1.20516.2</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppInternalVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20428.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-alpha.1.20428.2</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-alpha.1.20428.2</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-alpha.1.20428.2</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-alpha.1.20428.2</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppInternalVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20515.8</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-alpha.1.20515.8</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-alpha.1.20515.8</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-alpha.1.20515.8</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-alpha.1.20515.8</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>6.0.0-alpha.1.20428.2</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20428.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-alpha.1.20428.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-alpha.1.20428.2</SystemDiagnosticsEventLogPackageVersion>
<MicrosoftWin32RegistryPackageVersion>6.0.0-alpha.1.20515.8</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20515.8</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-alpha.1.20515.8</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-alpha.1.20515.8</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-alpha.1.20428.2</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-alpha.1.20428.2</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-alpha.1.20515.8</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-alpha.1.20515.8</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20464.13</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20464.13</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20464.13</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20509.12</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.20509.12</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20509.12</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
Expand Down Expand Up @@ -78,15 +78,6 @@
<NetFramework48RefAssembliesVersion>0.0.0.1</NetFramework48RefAssembliesVersion>
<NetFramework472IlToolsVersion>0.0.0.1</NetFramework472IlToolsVersion>
</PropertyGroup>
<PropertyGroup>
<RestoreSources>
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
</RestoreSources>
</PropertyGroup>
<!--Package names-->
<PropertyGroup>
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
Expand Down
2 changes: 1 addition & 1 deletion eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
Outputs="$(IntellisenseXmlDir)$(AssemblyName).xml">
<PropertyGroup>
<!-- Also in global.json -->
<DotNetApiDocsNet50>0.0.0.2</DotNetApiDocsNet50>
<DotNetApiDocsNet50>0.0.0.3</DotNetApiDocsNet50>

<!--
This blob lives in Azure storage at https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/dotnet-api-docs_net5.0/
Expand Down
1 change: 1 addition & 0 deletions eng/common/performance/performance-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ if [[ "$wasm_runtime_loc" != "" ]]; then
fi

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

Expand Down
Loading