Skip to content

Fixing removal of None from Page under certain conditions #1790

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.

Sign up for GitHub

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

Jump to bottom
Merged
4 commits merged into from
Sep 6, 2019
Merged

Fixing removal of None from Page under certain conditions #1790

4 commits merged into from
Sep 6, 2019

Conversation

rladuca
Copy link
Member

@rladuca rladuca commented Sep 5, 2019 •
edited
Loading

Addresses #1758

Description

Fixing removal of None from Page under certain conditions

Issue Details

Under default circumstances, WindowsDesktop props will remove “***.xaml” from the None MSBuild Item in order to support Visual Studio. Items that are left in None are then removed from Page in the WindowsDesktop targets. This was a change made to address complaints here about more specific removal criteria that Visual Studio was unable to handle.

When a developer sets EnableDefaultApplicationDefinition to false, WindowsDesktop props will not remove “***.xaml” from None as it cannot only remove the automatically globbed XAML (as we’re no longer globbing all XAML). This causes issues in the WindowsDesktop targets since removing None from Page now causes compilation errors.

The solution is to guard the removal of None from Page with the same conditional as the removal of “***.xaml” from None so we only do this work in the same fully default configuration. This change exposes another issue with ApplicationDefinition being multiply included in compilation so we also unconditionally remove ApplicationDefinition from Pages as WPF’s PresentationBuildTasks treats ApplicationDefinition as a special singleton that shouldn’t exist in any other XAML compilation items.

Customer Impact

Severity: Medium

Customers using non-default ApplicationDefinitions (named something other than App.xaml or Application.xaml) will be unable to compile without explicitly adding back removed Page items. Essentially, this means turning off default ApplicationDefinitions turns off default Page includes as well. 

Regression?

Yes, from the work to support VS in #685

Risk: Low

Mitigations:

  • The None item hasn’t changed in semantics so VS still will see the same behavior there

  • The Page item has the same behavior in the default case and fixed behavior in the currently broken case

  • The Page item will no longer carry ApplicationDefinition under any scenario, which is desirable.

Validations

I’ve run builds against combinations of flags using a modified .NET Core 3 RC1 installation (See these tests). All pass as expected. I’ll add these tests to our manual test team validations for now and further work can be queued up for .NET 5 to automate these.

@rladuca rladuca added Bug Product bug (most likely) area-infrastructure labels Sep 5, 2019
@rladuca rladuca self-assigned this Sep 5, 2019
@ghost ghost requested review from vatsan-madhavan, ryalanms and stevenbrix September 6, 2019 00:00
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Sep 6, 2019
@ghost ghost requested a review from SamBent September 6, 2019 00:00
@rladuca rladuca added * NO MERGE * metadata: The PR is not ready for merge yet (see discussion for detailed reasons) ask-mode labels Sep 6, 2019
@rladuca rladuca added this to the 3.0 milestone Sep 6, 2019
@rladuca rladuca force-pushed the dev/roladuca/PageFixup3 branch from 0edda0b to fd39e54 Compare September 6, 2019 00:06
@rladuca rladuca removed the * NO MERGE * metadata: The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 6, 2019
@rladuca
Fixing removal of None from Page under certain conditions (EnableDefa…
f150eae 
…ultApplicationDefinition 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.
@rladuca
Fixing removal of ApplicationDefinition from Page to be unconditional.
9617084
@rladuca
Removing extraneous ApplicationDefinition
7e39fff
@rladuca
Clarifying comments
9f0878e
@rladuca rladuca force-pushed the dev/roladuca/PageFixup3 branch from fd39e54 to 9f0878e Compare September 6, 2019 15:40
@rladuca
Copy link
Member Author

rladuca commented Sep 6, 2019

Setting auto-merge as I rebased to resolve merge conflicts and this has been approved by tactics.

@rladuca rladuca added the auto_merge bot-command label Sep 6, 2019
@ghost
Copy link

ghost commented Sep 6, 2019

Hello @rladuca!

Because this pull request has the auto_merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit fa79fc6 into release/3.0 Sep 6, 2019
@ghost ghost deleted the dev/roladuca/PageFixup3 branch September 6, 2019 16:03
rladuca added a commit that referenced this pull request Sep 6, 2019
@rladuca
Fixing removal of None from Page under certain conditions (#1790)
a1d9465 
* 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
ghost pushed a commit that referenced this pull request Sep 6, 2019
@rladuca
Fixing removal of None from Page under certain conditions (#1790) (#1796
2b46eac 
)

* 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
ghost pushed a commit that referenced this pull request Sep 9, 2019
@dotnet-maestro-bot
[automated] Merge branch 'release/3.1' => 'master' (#1802)
c5cc730 
* 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
ghost pushed a commit that referenced this pull request Sep 10, 2019
@dotnet-maestro-bot
[automated] Merge branch 'release/3.1' => 'master' (#1829)
ac7f91f 
* 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://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190910.2 (#1832)

- Microsoft.DotNet.Wpf.DncEng - 5.0.0-alpha1.19460.2
ghost pushed a commit that referenced this pull request Sep 12, 2019
@dotnet-maestro-bot
[automated] Merge branch 'release/3.1' => 'master' (#1846)
11a8ba5 
* 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 dotnet/installer#4744
            .NET Core 3.1 SDK hasn't consumed the fix for NuGet/Home#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"
@ghost ghost locked as resolved and limited conversation to collaborators Apr 14, 2022
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vatsan-madhavan vatsan-madhavan vatsan-madhavan approved these changes

@ryalanms ryalanms Awaiting requested review from ryalanms

@stevenbrix stevenbrix Awaiting requested review from stevenbrix

@SamBent SamBent Awaiting requested review from SamBent

Assignees

@rladuca rladuca

Labels
area-infrastructure ask-mode auto_merge bot-command Bug Product bug (most likely) PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@rladuca @vatsan-madhavan