Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/winforms (#3647)
Browse files Browse the repository at this point in the history 
[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
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] authored Oct 16, 2020
1 parent 77dc14d commit bc968b3
Show file tree
Hide file tree
Showing 56 changed files with 894 additions and 468 deletions.
108 changes: 54 additions & 54 deletions eng/Version.Details.xml
View file
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
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
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
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

0 comments on commit bc968b3

Please sign in to comment.