Skip to content

Fix issues with template files #3324

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

Merged
Bob Pulliam (bpulliam) merged 2 commits into from
Jan 11, 2023
Merged

Fix issues with template files #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e51762
Remove copyright notice and license. Set xaml files to utf-8.
bpulliam Jan 10, 2023
e179f1c
Merge branch 'develop' into user/bpulliam/template
bpulliam Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="$rootnamespace$.$safeitemname$"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="$rootnamespace$.$safeitemname$"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/BlankPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Page
x:Class="$rootnamespace$.$safeitemname$"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/BlankPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Neutral/CSharp/ResourceDictionary/ResourceDictionary.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ItemTemplates/Neutral/CSharp/TemplatedControl/CustomControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/UserControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<UserControl
x:Class="$rootnamespace$.$safeitemname$"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/UserControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Page
x:Class="$rootnamespace$.$safeitemname$"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Neutral/CppWinRT/ResourceDictionary/ResourceDictionary.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<UserControl
x:Class="$rootnamespace$.$safeitemname$"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/Class1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Application
x:Class="$safeprojectname$.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
5 changes: 1 addition & 4 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="$safeprojectname$.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Application
x:Class="$safeprojectname$.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
5 changes: 1 addition & 4 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="$safeprojectname$.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 0 additions & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Application
x:Class="$safeprojectname$.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="$safeprojectname$.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Application
x:Class="$safeprojectname$.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
4 changes: 1 addition & 3 deletions dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="$safeprojectname$.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
2 changes: 1 addition & 1 deletion tools/VerifyCopyrightHeaders.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $copyrightHeaderText = (
)

$include = ('*.cs', '*.cpp', '*.h', '*.idl', '*.xaml')
$exclude = [RegEx]'\\dev\\Detours\\|\\BuildOutput\\|\\obj\\|\\localpackages\\|\\packages\\|\\specs\\|\\temp\\|\\Debug\\|\\Release\\'
$exclude = [RegEx]'\\dev\\Detours\\|\\BuildOutput\\|\\obj\\|\\localpackages\\|\\packages\\|\\specs\\|\\temp\\|\\Debug\\|\\Release\\|\\ItemTemplates\\|\\ProjectTemplates\\'
$files = dir $PSScriptRoot\..\* -recurse -include $include | Where FullName -notmatch $exclude

$errorCount = 0
Expand Down