Merge branch 'develop' into main

GitVersion.yml

@@ -1,9 +1,10 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
 mode: ContinuousDeployment
-next-version: 2.1.0
+next-version: 2.2.0
 branches:
   master:
+    regex: ^main
     mode: ContinuousDeployment
     tag: rc
     prevent-increment-of-merged-branch-version: true

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 MahApps
+Copyright (c) .NET Foundation and Contributors. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NOTICE.md

@@ -0,0 +1,171 @@
+# MahApps.Metro
+
+MIT License
+
+Copyright (c) 2011 - 2020 MahApps and Contributors.
+
+Copyright (c) 2020 .NET Foundation and Contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+# Third party notice
+
+MahApps.Metro contains third party open source code and uses third party open source libraries.
+
+Unless indicated otherwise on a per-file basis all source and documentation herein is licensed under the MIT license.
+
+## AvalonControlsLibrary (RangeSlider)
+
+- [Source (Codeplex)](http://avaloncontrolslib.codeplex.com)
+- [Source (GitHub)](https://github.com/MahApps/AvalonControlLibrary)
+- [Microsoft Public License (Ms-PL)](https://github.com/MahApps/AvalonControlLibrary/blob/master/LICENSE)
+
+## Caliburn.Micro
+
+- [Source](https://github.com/Caliburn-Micro/Caliburn.Micro)
+- [MIT License](https://github.com/Caliburn-Micro/Caliburn.Micro/blob/master/License.txt)
+
+## Callisto
+
+- Copyright (c) 2012,2013 Tim Heuer
+- [Source](https://github.com/timheuer/callisto)
+- [Microsoft Public License (Ms-PL)](https://github.com/timheuer/callisto/blob/master/License.txt)
+
+## ControlzEx
+
+- Copyright (c) Jan Karger, Bastian Schmidt, James Willock
+- [Source](https://github.com/ControlzEx/ControlzEx)
+- [MIT License](https://github.com/ControlzEx/ControlzEx/blob/develop/LICENSE)
+
+## Costura
+
+- Copyright (c) 2012 Simon Cropp and contributors
+- [Source](https://github.com/Fody/Costura)
+- [MIT License](https://github.com/Fody/Costura/blob/develop/LICENSE)
+
+## ExposedObject
+
+- [Source](https://github.com/skolima/ExposedObject)
+- [MIT License](https://opensource.org/licenses/MIT)
+
+## Fody
+
+- Copyright (c) Simon Cropp
+- [Source](https://github.com/Fody/Fody)
+- [MIT License](https://github.com/Fody/Fody/blob/master/License.txt)
+
+## InfragisticsThemesForMicrosoftControls
+
+- The standard `CheckBox` and `RadioButton` styles adapted from styles created by [Brian Lagunas](https://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/)
+- Copyright (c) 2015 Infragistics
+- [Source](https://github.com/Infragistics/InfragisticsThemesForMicrosoftControls)
+- [MIT License](https://github.com/Infragistics/InfragisticsThemesForMicrosoftControls/blob/master/LICENSE.txt)
+
+## JetBrains.Annotations
+
+- [NuGet](https://www.nuget.org/packages/JetBrains.Annotations)
+- [Info](https://www.jetbrains.com/help/resharper/Code_Analysis__Code_Annotations.html)
+- [MIT License](https://opensource.org/licenses/MIT)
+
+## MahApps.Metro.IconPacks
+
+- Copyright (c) MahApps, Jan Karger
+- [Source](https://github.com/MahApps/MahApps.Metro.IconPacks)
+- [MIT License](https://github.com/MahApps/MahApps.Metro.IconPacks/blob/develop/LICENSE)
+
+## MaterialDesignColors
+
+- Copyright (c) James Willock, Mulholland Software and Contributors
+- [NuGet](https://www.nuget.org/packages/MaterialDesignColors/)
+- [Source](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit)
+- [MIT License](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/master/LICENSE)
+
+## MaterialDesignThemes
+
+- Copyright (c) James Willock, Mulholland Software and Contributors
+- [NuGet](https://www.nuget.org/packages/MaterialDesignThemes)
+- [Source](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit)
+- [MIT License](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/master/LICENSE)
+
+## Microsoft.NET.Test.Sdk
+
+- Copyright (c) Microsoft Corporation. All rights reserved.
+- [NuGet](https://www.nuget.org/packages/Microsoft.NET.Test.Sdk)
+- [Source](https://github.com/microsoft/vstest/)
+- [MIT License](https://github.com/microsoft/vstest/blob/master/LICENSE)
+
+## Microsoft.SourceLink.GitHub
+
+- [NuGet](https://www.nuget.org/packages/Microsoft.SourceLink.GitHub)
+- [Source](https://github.com/dotnet/sourcelink)
+- [Apache License 2.0](https://github.com/dotnet/sourcelink/blob/master/License.txt)
+
+## Newtonsoft.Json
+
+- Copyright (c) 2007 James Newton-King
+- [NuGet](https://www.nuget.org/packages/Newtonsoft.Json)
+- [Source](https://github.com/JamesNK/Newtonsoft.Json)
+- [MIT License](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md)
+
+## NHotkey.Wpf
+
+- [NuGet](https://www.nuget.org/packages/NHotkey.Wpf)
+- [Source](https://github.com/thomaslevesque/NHotkey)
+- [Apache License v2.0](https://github.com/thomaslevesque/NHotkey/blob/master/LICENSE.md)
+
+## Silverlight Toolkit 5
+
+- `TransitioningContentControl`
+- [Source](https://github.com/microsoftarchive/SilverlightToolkit)
+- [Microsoft Public License (MS-PL)](https://github.com/microsoftarchive/SilverlightToolkit/blob/master/LICENSE)
+
+## WpfAnalyzers
+
+- Copyright (c) 2016 .NET Analyzers
+- [NuGet](https://www.nuget.org/packages/WpfAnalyzers)
+- [Source](https://github.com/DotNetAnalyzers/WpfAnalyzers)
+- [MIT License](https://github.com/DotNetAnalyzers/WpfAnalyzers/blob/master/LICENSE)
+
+## WPFSpark
+
+- `ClipBorder`
+- Copyright (c) 2017 Ratish Philip
+- [Source](https://github.com/ratishphilip/wpfspark)
+- [MIT License](https://github.com/ratishphilip/wpfspark/blob/master/LICENSE)
+
+## XamlColorSchemeGenerator
+
+- Copyright (c) 2017 - 2020 Bastian Schmidt
+- [NuGet](https://www.nuget.org/packages/XamlColorSchemeGenerator)
+- [Source](https://github.com/batzen/XamlColorSchemeGenerator)
+- [MIT License](https://github.com/batzen/XamlColorSchemeGenerator/blob/master/LICENSE)
+
+## xunit
+
+- Copyright (c) .NET Foundation and Contributors. All Rights Reserved.
+- [NuGet](https://www.nuget.org/packages/xunit)
+- [Source](https://github.com/xunit/xunit)
+- [License](https://github.com/xunit/xunit/blob/main/LICENSE)
+
+## xunit.runner.visualstudio
+
+- Copyright (c) .NET Foundation and Contributors. All Rights Reserved.
+- [NuGet](https://www.nuget.org/packages/xunit.runner.visualstudio)
+- [Source](https://github.com/xunit/visualstudio.xunit)
+- [License](https://github.com/xunit/visualstudio.xunit/blob/master/License.txt)

appveyor.yml

@@ -1,11 +1,9 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
-# configuration for develop/CI and master/Release branch
-
 branches:
   only:
     - develop
-    - master
+    - main
 
 environment:
   azure-key-vault-url:

build.cake

@@ -6,7 +6,7 @@
 #tool "dotnet:?package=NuGetKeyVaultSignTool&version=1.2.18"
 #tool "dotnet:?package=AzureSignTool&version=2.0.17"
 
-#tool GitVersion.CommandLine&version=5.0.1
+#tool GitVersion.CommandLine&version=5.3.7
 #tool gitreleasemanager
 #tool xunit.runner.console
 #tool vswhere
@@ -37,7 +37,7 @@ GitVersion gitVersion = GitVersion(new GitVersionSettings { OutputType = GitVers
 var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
 var branchName = gitVersion.BranchName;
 var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchName);
-var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("master", branchName);
+var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("main", branchName);
 var isTagged = AppVeyor.Environment.Repository.Tag.IsTag;
 
 var latestInstallationPath = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = true });