• D
    [automated] Merge branch 'release/3.1' => 'master' (#1802) · c5cc730a
    dotnet-maestro-bot 提交于
    * Update global.json to use tools.dotnet from net5
    
    * 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 project TargetFramework(s) to netcoreapp5.0 and set TargetFrameworkVersion=v5.0
    
    * Update dependencies from ".NET Core 5 Dev" and ".NET Tools - Latest" channels
    
    * Add constants for 3.1 and 5.0
    
    * Update netcore version specific conditions
    
    * Add System.Resources.Extensions references to PresentationUI
    
    * Include "ResolveTargetingPackAssets" in AfterTargets; Remove unused Targets
    
    * Make projecttemplates and ArchNeutral use 5.x versionprefix
    
    * Update project templatest for netcoreapp5.0 & re-enable  VB templates
    
    * Remove AssemblyVersion - it will get automatically set to 5.0.0.0. This is important for WindowsBase. During conflict resolution, WindowsBase/5.0.0.0 will win over WindowsBase/4.0.0.0 from NetCore.App
    
    * Update dependencies from ".NET Tools - Latest"
    
    * 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
    c5cc730a
build.ps1 5.1 KB