[automated] Merge branch 'release/3.1' => 'master' (#1846)
* Update dependencies from https://github.com/dotnet/arcade build 20190905.21 (#1794) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19455.21 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19455.21 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19455.21 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19455.21 * Fixing removal of None from Page under certain conditions (#1790) (#1796) * Fixing removal of None from Page under certain conditions (EnableDefaultApplicationDefinition or EnableDefaultPageItems is false). Further adding a fix to ensure this doesn't result in ApplicationDefinition being included in Page as well when EnableDefaultApplicationDefinition is false. * Fixing removal of ApplicationDefinition from Page to be unconditional. * Removing extraneous ApplicationDefinition * Clarifying comments * Update dependencies from https://github.com/dotnet/winforms build 20190906.5 (#1801) - Microsoft.Private.Winforms - 4.8.1-preview1.19456.5 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc1-19429-05 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#1810) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19456.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19456.10 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19456.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19456.10 * Update dependencies from https://github.com/dotnet/winforms build 20190907.5 (#1812) - Microsoft.Private.Winforms - 4.8.1-preview1.19457.5 * Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#1815) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19457.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19457.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19457.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19457.1 * Update dependencies from https://github.com/dotnet/winforms build 20190908.4 (#1816) - Microsoft.Private.Winforms - 4.8.1-preview1.19458.4 * Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#1821) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19458.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19458.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19458.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19458.2 * Update dependencies from https://github.com/dotnet/winforms build 20190909.6 (#1822) - Microsoft.Private.Winforms - 4.8.1-preview1.19459.6 * Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#1828) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19459.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19459.10 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19459.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10 * Update dependencies from https://github.com/dotnet/winforms build 20190910.5 (#1830) - Microsoft.Private.Winforms - 4.8.1-preview1.19460.5 * Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#1843) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19460.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19460.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19460.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19460.3 * Update dependencies from https://github.com/dotnet/winforms build 20190911.5 (#1847) - Microsoft.Private.Winforms - 4.8.1-preview1.19461.5 * Update dependencies from https://github.com/dotnet/winforms build 20190911.6 (#1848) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.6 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.4 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190911.7 (#1850) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.7 * Update dependencies from https://github.com/dotnet/winforms build 20190911.9 (#1851) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.9 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.8 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190911.11 (#1853) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.11 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.9 (parent: Microsoft.Private.Winforms) * Update project TargetFramework(s) to netcoreapp3.1 and set TargetFrameworkVersion=v3.1 * Add constant for 3.1 * Update netcore version specific conditions * Add System.Resources.Extensions references to PresentationUI * Make projecttemplates and ArchNeutral use 3.1 versionprefix * Update project templates for netcoreapp3.1 * Update global.json tools.dotnet with SDK with netcoreapp3.1 support * Include "ResolveTargetingPackAssets" in AfterTargets; Remove unused Targets * Update dependencies from ".NET Tools - Latest" channel darc update-dependencies --channel ".NET Tools - Latest" * darc update-dependencies --channel ".NET Core 3.1 Dev" * Update dependencies from https://github.com/dotnet/winforms build 20190911.16 (#1855) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.16 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Workaround for https://github.com/dotnet/core-sdk/issues/4744 .NET Core 3.1 SDK hasn't consumed the fix for https://github.com/NuGet/Home/issues/8467 yet. Suppress these warnings temporarily * No not overwrite NoWarn - append to it * Update dependencies from https://github.com/dotnet/winforms build 20190911.18 (#1857) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.18 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 5.0.0-alpha1.19461.26 (parent: Microsoft.Private.Winforms) - System.CodeDom - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) * Update dependencies from https://github.com/dotnet/winforms build 20190911.19 (#1858) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.19 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 5.0.0-alpha1.19461.33 (parent: Microsoft.Private.Winforms) - System.CodeDom - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) * Update dependencies from https://github.com/dotnet/winforms build 20190911.20 (#1859) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.20 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 5.0.0-alpha1.19461.40 (parent: Microsoft.Private.Winforms) - System.CodeDom - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) * Update dependencies from https://github.com/dotnet/winforms build 20190912.1 (#1861) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.1 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.47 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Update dependencies from https://github.com/dotnet/winforms build 20190912.2 (#1862) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.2 * Update dependencies from https://github.com/dotnet/winforms build 20190912.3 (#1863) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.3 * Update dependencies from https://github.com/dotnet/arcade build 20190911.7 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19461.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19461.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19461.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19461.7 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190912.4 (#1866) - Microsoft.DotNet.Wpf.DncEng - 5.0.0-alpha1.19462.4 * [master] Update dependencies from dotnet/winforms (#1870) * Update dependencies from https://github.com/dotnet/winforms build 20190912.5 - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.5 * Update dependencies from https://github.com/dotnet/winforms build 20190912.4 - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.4 * Update dependencies from https://github.com/dotnet/winforms build 20190912.6 (#1871) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.6 * Update dependencies from https://github.com/dotnet/winforms build 20190912.8 (#1872) - Microsoft.Private.Winforms - 4.8.1-preview1.19462.8 * Update dependencies from https://github.com/dotnet/winforms build 20190912.9 (#1876) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.9 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19462.1 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190912.11 (#1877) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.11 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19462.5 (parent: Microsoft.Private.Winforms) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190911.39 (#1869) - Microsoft.DotNet.Wpf.DncEng - 4.8.1-preview1.19461.39 * darc update-dependencies --channel ".NET Tools - Latest"
Showing
eng/common/performance/performance-setup.sh
100644 → 100755
文件模式从 100644 更改为 100755
想要评论请 注册 或 登录