FYI @AndrewKeepCoding
Do we need all these commits? Use Visual Studio tools!

I did. 🙂
However, I also reviewed all the files to check the changes, which is why there are separate commits. I've seen some cases that VS (or VS Code) doesn't apply this kind of changes correctly.

Are you planning to add a .git-blame-ignore-revs file for this PR?

@Marv51 You are right. Thanks.
TODO: Update the target commit id at the .git-blame-ignore-revs file.

When creating a new UserControl, the namespace is before the usings. Is that behavior also the case for you @AndrewKeepCoding ?

@marcelwgn No on my side. This is what I get:

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;

// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace WinUIApp5
{
    public sealed partial class UserControl1 : UserControl
    {
        public UserControl1()
        {
            this.InitializeComponent();
        }
    }
}

By the way, the item templates are being changed to file scoped namespaces in v1.7-exp2.

Huh thats very interesting. Would be good to know why the results differ when creating a new UserControl. But that will be fixed with the new templates anyway (though I would have preferred the namespace to preceed usings but thats a different story).

This topic aside, looks like there are some merge conflicts which are not surprising though with these changes though.

This topic aside, looks like there are some merge conflicts which are not surprising though with these changes though.

@marcelwgn Thanks! I fixed the conflicts.

/azp run