Skip to content

Merging missing commits from release/3.0 -> release/3.1 #1787

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.

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

Merged
merged 18 commits into from
Sep 5, 2019

Conversation

vatsan-madhavan
Copy link
Member

@vatsan-madhavan vatsan-madhavan commented Sep 5, 2019

Merging missing commits from release/3.0 -> release/3.1

dotnet-wpf-int PR: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int/pullrequest/2935?_a=overview

Description

Merging changes from release/3.0 that were not ported onto release/3.1 branch.

Customer Impact

Regressions will be introduced in 3.1 preview if the branches are not kept in sync

Risk

Low

Severity

High

Workaround

None

vatsan-madhavan and others added 17 commits August 28, 2019 22:32
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
* 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 ghost requested review from rladuca, ryalanms and stevenbrix September 5, 2019 21:17
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Sep 5, 2019
@ghost ghost requested a review from SamBent September 5, 2019 21:17
@vatsan-madhavan vatsan-madhavan added this to the 3.1 milestone Sep 5, 2019
@vatsan-madhavan vatsan-madhavan added the tell-mode Issues and PR's that require notice to .NET Core Shiproom label Sep 5, 2019
@vatsan-madhavan vatsan-madhavan merged commit 3bf961a into release/3.1 Sep 5, 2019
@vatsan-madhavan vatsan-madhavan deleted the merge-rel30-into-rel31 branch September 5, 2019 23:16
@ghost ghost locked as resolved and limited conversation to collaborators Apr 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
PR metadata: Label to tag PRs, to facilitate with triage tell-mode Issues and PR's that require notice to .NET Core Shiproom
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants