Merge branch 'master' into wasm-updates

# Conflicts:
#	src/Web/Avalonia.Web.Blazor/webapp/modules/Avalonia/CaretHelper.ts

src/Avalonia.Base/Input/Cursor.cs

@@ -33,7 +33,7 @@ namespace Avalonia.Input
         DragLink,
         None,
         
-        // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/ 
+        // Not available in GTK directly, see https://www.pixelbeat.org/programming/x_cursors/
         // We might enable them later, preferably, by loading pixmax directly from theme with fallback image
         // SizeNorthWestSouthEast,
         // SizeNorthEastSouthWest,

src/Avalonia.Base/Media/PreciseEllipticArcHelper.cs

@@ -1081,7 +1081,7 @@ namespace Avalonia.Media
 
                 Point c = rest * (cs) + translation;
 
-                // See "http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter" to understand
+                // See "https://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter" to understand
                 // how the ellipse center is calculated 
 
 

src/Avalonia.Base/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs

@@ -5,7 +5,7 @@
 // not use this product except in compliance with the License. You may obtain 
 // a copy of the License at
 // 
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://www.apache.org/licenses/LICENSE-2.0
 // 
 // Unless required by applicable law or agreed to in writing, software 
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 

src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs

@@ -104,7 +104,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         
         /// <summary>
         /// Gets the canonical representation of a given codepoint.
-        /// <see href="http://www.unicode.org/L2/L2013/13123-norm-and-bpa.pdf"/>
+        /// <see href="https://www.unicode.org/L2/L2013/13123-norm-and-bpa.pdf"/>
         /// </summary>
         /// <param name="codePoint">The code point to be mapped.</param>
         /// <returns>The mapped canonical code point, or the passed <paramref name="codePoint"/>.</returns>

src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreak.cs

@@ -5,7 +5,7 @@
 // not use this product except in compliance with the License. You may obtain 
 // a copy of the License at
 // 
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://www.apache.org/licenses/LICENSE-2.0
 // 
 // Unless required by applicable law or agreed to in writing, software 
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 

src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrie.cs

@@ -5,7 +5,7 @@
 // not use this product except in compliance with the License. You may obtain 
 // a copy of the License at
 // 
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://www.apache.org/licenses/LICENSE-2.0
 // 
 // Unless required by applicable law or agreed to in writing, software 
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 

src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.Constants.cs

@@ -5,7 +5,7 @@
 // not use this product except in compliance with the License. You may obtain 
 // a copy of the License at
 // 
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://www.apache.org/licenses/LICENSE-2.0
 // 
 // Unless required by applicable law or agreed to in writing, software 
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 

src/Avalonia.Base/Media/TextFormatting/Unicode/UnicodeTrieBuilder.cs

@@ -5,7 +5,7 @@
 // not use this product except in compliance with the License. You may obtain 
 // a copy of the License at
 // 
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://www.apache.org/licenses/LICENSE-2.0
 // 
 // Unless required by applicable law or agreed to in writing, software 
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 

src/Avalonia.Base/Utilities/BinarySearchExtension.cs

@@ -5,7 +5,7 @@
 // not use this product except in compliance with the License. You may obtain 
 // a copy of the License at
 // 
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://www.apache.org/licenses/LICENSE-2.0
 // 
 // Unless required by applicable law or agreed to in writing, software 
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 

src/Avalonia.Controls/AutoCompleteBox.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/Calendar.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/CalendarButton.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using Avalonia.Controls.Metadata;

src/Avalonia.Controls/Calendar/CalendarDateRange.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/CalendarDayButton.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/CalendarExtensions.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using Avalonia.Input;

src/Avalonia.Controls/Calendar/CalendarItem.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/DateTimeHelper.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using Avalonia.Threading;

src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 namespace Avalonia.Controls

src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs

@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 
 The above is the version of the MIT "Expat" License used by X.org:
 
-    http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
+    https://cgit.freedesktop.org/xorg/xserver/tree/COPYING
     
     
 Adjustments for Avalonia needs:

src/Avalonia.Controls/Utils/ISelectionAdapter.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs

@@ -1,6 +1,6 @@
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
 using System;

src/Avalonia.Native/IconLoader.cs

@@ -6,7 +6,7 @@ namespace Avalonia.Native
     // OSX doesn't have a concept of *window* icon. 
     // Icons in the title bar are only shown if there is 
     // an opened file (on disk) associated with the current window
-    // see http://stackoverflow.com/a/7038671/2231814
+    // see https://stackoverflow.com/a/7038671/2231814
     class IconLoader : IPlatformIconLoader
     {
         class IconStub : IWindowIconImpl

src/Avalonia.Themes.Fluent/Controls/Calendar.xaml

@@ -1,7 +1,7 @@
 <!--
     // (c) Copyright Microsoft Corporation.
     // This source is subject to the Microsoft Public License (Ms-PL).
-    // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+    // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
     // All other rights reserved.
 -->
 

src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml

@@ -1,7 +1,7 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 <ResourceDictionary xmlns="https://github.com/avaloniaui"

src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml

@@ -1,7 +1,7 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 <ResourceDictionary xmlns="https://github.com/avaloniaui"

src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml

@@ -1,7 +1,7 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 <ResourceDictionary xmlns="https://github.com/avaloniaui"

src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml

@@ -1,7 +1,7 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 

src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml

@@ -1,7 +1,7 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 

src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml

@@ -1,7 +1,7 @@
 <!--
 // (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
 

src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml

@@ -1,7 +1,7 @@
 <!--
   // (c) Copyright Microsoft Corporation.
   // This source is subject to the Microsoft Public License (Ms-PL).
-  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
   // All other rights reserved.
 -->
 

src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml

@@ -1,7 +1,7 @@
 <!--
   // (c) Copyright Microsoft Corporation.
   // This source is subject to the Microsoft Public License (Ms-PL).
-  // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+  // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
   // All other rights reserved.
 -->
 

src/Avalonia.X11/X11Atoms.cs

@@ -17,7 +17,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2006 Novell, Inc. (https://www.novell.com)
 //
 //