Merge release/3.0 into release/3.0-preview9 #1779
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix typo (missing newline) in yml file
* Update branding to RC1 * Re-enable release/3.0 branch in triggers * Update dependencies
…90821.3 (#1689) - Microsoft.Private.Winforms - 4.8.0-rc1.19421.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19421-07 (parent: Microsoft.Private.Winforms)
…90821.4 (#1691) - Microsoft.Private.Winforms - 4.8.0-rc1.19421.4
…90822.2 (#1701) - Microsoft.Private.Winforms - 4.8.0-rc1.19422.2
…90822.3 (#1704) - Microsoft.Private.Winforms - 4.8.0-rc1.19422.3
…90823.2 (#1709) - Microsoft.Private.Winforms - 4.8.0-rc1.19423.2
…90823.3 (#1710) - Microsoft.Private.Winforms - 4.8.0-rc1.19423.3 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc1-19422-14 (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.19422.4 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19422.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19422.4 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90823.4 (#1715) - Microsoft.Private.Winforms - 4.8.0-rc1.19423.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19423-11 (parent: Microsoft.Private.Winforms)
…90824.2 (#1719) - Microsoft.Private.Winforms - 4.8.0-rc1.19424.2
…90825.2 (#1723) - Microsoft.Private.Winforms - 4.8.0-rc1.19425.2
…90825.3 (#1724) - Microsoft.Private.Winforms - 4.8.0-rc1.19425.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19425-03 (parent: Microsoft.Private.Winforms)
…90826.2 (#1725) - Microsoft.Private.Winforms - 4.8.0-rc1.19426.2
…Core.dll's missing Version resource (#1714) * Preserve version resource in PresentationCore.dll by ensuring that ILAsm incorporates PresentationCore.res file if one is found * Add Version resource to all C++ assemblies. * - Include winres.h - Remove string based resources that do the same work as the filever info * use ifndef instead of if defined
* Update dependencies from https://github.com/dotnet/winforms build 20190826.3 - Microsoft.Private.Winforms - 4.8.0-rc1.19426.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19426-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19426.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19426.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19426.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Update dependencies from https://github.com/dotnet/winforms build 20190826.4 - Microsoft.Private.Winforms - 4.8.0-rc1.19426.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19426-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19426.4 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19426.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19426.4 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…thoutV being undefined sometimes (#1713) * Add _TargetFrameworkVersionValue * Define _UndefinedTargetFrameworkVersion * Update conditions using _TargetFrameworkVersionValue & _UndefinedTargetFrameworkVersion * Format conditions * Add a default value for _TargetFrameworkVersionValue in .props file, and fixup the default value in .targets file. Fixup an incorrect comment * Add _UndefinedTargetFrameworkVersion and _TargetFrameworkVersionValue to Pbt.targets (used for dotnet/wpf builds only)
…90827.1 (#1729) - Microsoft.Private.Winforms - 4.8.0-rc1.19427.1
…90827.3 (#1730) - Microsoft.Private.Winforms - 4.8.0-rc1.19427.3
…90827.4 (#1732) - Microsoft.Private.Winforms - 4.8.0-rc1.19427.4
…90827.5 (#1733) - Microsoft.Private.Winforms - 4.8.0-rc1.19427.5 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19427-07 (parent: Microsoft.Private.Winforms)
…90827.6 (#1736) - Microsoft.Private.Winforms - 4.8.0-rc1.19427.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19427-09 (parent: Microsoft.Private.Winforms)
…90828.1 (#1737) - Microsoft.Private.Winforms - 4.8.0-rc1.19428.1 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19427-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19427.10 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19427.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19427.10 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90828.3 (#1738) - Microsoft.Private.Winforms - 4.8.0-rc1.19428.3
…90828.4 (#1740) - Microsoft.Private.Winforms - 4.8.0-rc1.19428.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19428-05 (parent: Microsoft.Private.Winforms)
…90828.5 (#1741) - Microsoft.Private.Winforms - 4.8.0-rc1.19428.5 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19428-07 (parent: Microsoft.Private.Winforms)
…90828.6 (#1742) - Microsoft.Private.Winforms - 4.8.0-rc1.19428.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19428-08 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19428.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19428.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19428.2 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90828.7 (#1746) - Microsoft.Private.Winforms - 4.8.0-rc1.19428.7 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19428-14 (parent: Microsoft.Private.Winforms) - 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)
…90829.2 (#1749) - Microsoft.Private.Winforms - 4.8.0-rc1.19429.2
Fix DebuggableAttribute in InjectModuleInitializer post-build targets so we don't disable JIT optimizations.
…90829.3 (#1751) - Microsoft.Private.Winforms - 4.8.0-rc1.19429.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19429-05 (parent: Microsoft.Private.Winforms)
…90829.6 (#1753) - Microsoft.Private.Winforms - 4.8.0-rc1.19429.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19429-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19429.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19429.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19429.2 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90830.2 (#1755) - Microsoft.Private.Winforms - 4.8.0-rc1.19430.2
…90830.6 (#1756) - Microsoft.Private.Winforms - 4.8.0-rc1.19430.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19430-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19430.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19430.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19430.2 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90830.7 (#1757) - Microsoft.Private.Winforms - 4.8.0-rc1.19430.7 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-rc1-19430-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19430.3 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19430.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19430.3 (parent: Microsoft.NETCore.Runtime.CoreCLR)
…90831.2 (#1759) - Microsoft.Private.Winforms - 4.8.0-rc1.19431.2
…90903.2 (#1762) - Microsoft.Private.Winforms - 4.8.0-rc1.19453.2
…90903.3 (#1765) - Microsoft.Private.Winforms - 4.8.0-rc1.19453.3 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc1-19453-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-rc1.19453.4 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-rc1.19453.4 (parent: Microsoft.NETCore.App)
* Update dotnet-api-docs_netcoreapp3.0 to v2 which contains WindowsBase intellisense files * Update dotnet-api-docs_netcoreapp3.0 to v2 which contains WindowsBase intellisense files
ghost
requested review from
ghost
added
the
rladuca
approved these changes
Sep 5, 2019
2 tasks
zsd4yr
approved these changes
Sep 5, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note: Do not squash when completing this PR
Part of #1777