Updated

2020-03-19 23:12:23 +01:00 · 2020-03-19 23:12:23 +01:00 · ac1536938f
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -22,7 +22,7 @@ jobs:
    - name: Setup .NET Core
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: 3.0.100
+        dotnet-version: 3.1.102
    - name: Build Release
      run: dotnet build --configuration Release
    - name: Test Release
--- a/PanAndZoom.sln
+++ b/PanAndZoom.sln
@ -34,6 +34,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{D83B9ECD-F143-4A6C-AFD7-F961174D824C}"
 	ProjectSection(SolutionItems) = preProject
 		build\Avalonia.Desktop.props = build\Avalonia.Desktop.props
+		build\Avalonia.Diagnostics.props = build\Avalonia.Diagnostics.props
 		build\Avalonia.props = build\Avalonia.props
 		build\Base.props = build\Base.props
 		build\EmbedXaml.props = build\EmbedXaml.props
--- a/build/Avalonia.Desktop.props
+++ b/build/Avalonia.Desktop.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.4" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.999-cibuild*" />
    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1" />
  </ItemGroup>
--- a/build/Avalonia.Diagnostics.props
+++ b/build/Avalonia.Diagnostics.props
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.9.999-cibuild*" />
+  </ItemGroup>
+</Project>
--- a/build/Avalonia.props
+++ b/build/Avalonia.props
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.4" />
+    <PackageReference Include="Avalonia" Version="0.9.999-cibuild*" />
  </ItemGroup>
 </Project>
--- a/build/Base.props
+++ b/build/Base.props
@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <VersionPrefix>2.3.2</VersionPrefix>
+    <VersionPrefix>2.3.999</VersionPrefix>
    <VersionSuffix></VersionSuffix>
    <Authors>Wiesław Šoltés</Authors>
    <Company>Wiesław Šoltés</Company>
--- a/build/build/Build.cs
+++ b/build/build/Build.cs
@ -6,6 +6,7 @@ using Nuke.Common.Git;
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tools.DotNet;
 using static Nuke.Common.EnvironmentInfo;
+using Nuke.Common.IO;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
--- a/build/build/_build.csproj
+++ b/build/build/_build.csproj
@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="0.23.4" />
+    <PackageReference Include="Nuke.Common" Version="0.24.4" />
  </ItemGroup>

  <ItemGroup>
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "3.0.100",
+    "version": "3.1.100",
    "rollForward": "latestMajor"
  }
 }
--- a/samples/AvaloniaDemo/AvaloniaDemo.csproj
+++ b/samples/AvaloniaDemo/AvaloniaDemo.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
    <OutputType>WinExe</OutputType>
    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@ -24,6 +24,7 @@
  <Import Project="..\..\build\ReferenceAssemblies.props" />
  <Import Project="..\..\build\Avalonia.props" />
  <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />

  <ItemGroup>
    <Compile Include="**\*.cs" Exclude="obj\**" />
--- a/samples/WpfDemo/WpfDemo.csproj
+++ b/samples/WpfDemo/WpfDemo.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
    <OutputType>WinExe</OutputType>
    <UseWPF>True</UseWPF>
    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
--- a/src/Avalonia.Controls.PanAndZoom/ZoomBorder.cs
+++ b/src/Avalonia.Controls.PanAndZoom/ZoomBorder.cs
@ -169,19 +169,19 @@ namespace Avalonia.Controls.PanAndZoom
        /// <summary>
        /// Identifies the <seealso cref="PanButton"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<ButtonName> PanButtonProperty =
+        public static StyledProperty<ButtonName> PanButtonProperty =
            AvaloniaProperty.Register<ZoomBorder, ButtonName>(nameof(PanButton), ButtonName.Left, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="ZoomSpeed"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> ZoomSpeedProperty =
+        public static StyledProperty<double> ZoomSpeedProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(ZoomSpeed), 1.2, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="Stretch"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<StretchMode> StretchProperty =
+        public static StyledProperty<StretchMode> StretchProperty =
            AvaloniaProperty.Register<ZoomBorder, StretchMode>(nameof(Stretch), StretchMode.Uniform, false, BindingMode.TwoWay);

        /// <summary>
@ -227,79 +227,79 @@ namespace Avalonia.Controls.PanAndZoom
        /// <summary>
        /// Identifies the <seealso cref="EnableConstrains"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<bool> EnableConstrainsProperty =
+        public static StyledProperty<bool> EnableConstrainsProperty =
            AvaloniaProperty.Register<ZoomBorder, bool>(nameof(EnableConstrains), true, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MinZoomX"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MinZoomXProperty =
+        public static StyledProperty<double> MinZoomXProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MinZoomX), double.NegativeInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MaxZoomX"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MaxZoomXProperty =
+        public static StyledProperty<double> MaxZoomXProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MaxZoomX), double.PositiveInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MinZoomY"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MinZoomYProperty =
+        public static StyledProperty<double> MinZoomYProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MinZoomY), double.NegativeInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MaxZoomY"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MaxZoomYProperty =
+        public static StyledProperty<double> MaxZoomYProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MaxZoomY), double.PositiveInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MinOffsetX"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MinOffsetXProperty =
+        public static StyledProperty<double> MinOffsetXProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MinOffsetX), double.NegativeInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MaxOffsetX"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MaxOffsetXProperty =
+        public static StyledProperty<double> MaxOffsetXProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MaxOffsetX), double.PositiveInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MinOffsetY"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MinOffsetYProperty =
+        public static StyledProperty<double> MinOffsetYProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MinOffsetY), double.NegativeInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="MaxOffsetY"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<double> MaxOffsetYProperty =
+        public static StyledProperty<double> MaxOffsetYProperty =
            AvaloniaProperty.Register<ZoomBorder, double>(nameof(MaxOffsetY), double.PositiveInfinity, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="EnableInput"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<bool> EnableInputProperty =
+        public static StyledProperty<bool> EnableInputProperty =
            AvaloniaProperty.Register<ZoomBorder, bool>(nameof(EnableInput), true, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="EnableGestureZoom"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<bool> EnableGestureZoomProperty =
+        public static StyledProperty<bool> EnableGestureZoomProperty =
            AvaloniaProperty.Register<ZoomBorder, bool>(nameof(EnableGestureZoom), true, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="EnableGestureRotation"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<bool> EnableGestureRotationProperty =
+        public static StyledProperty<bool> EnableGestureRotationProperty =
            AvaloniaProperty.Register<ZoomBorder, bool>(nameof(EnableGestureRotation), true, false, BindingMode.TwoWay);

        /// <summary>
        /// Identifies the <seealso cref="EnableGestureTranslation"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<bool> EnableGestureTranslationProperty =
+        public static StyledProperty<bool> EnableGestureTranslationProperty =
            AvaloniaProperty.Register<ZoomBorder, bool>(nameof(EnableGestureTranslation), true, false, BindingMode.TwoWay);

        static ZoomBorder()
--- a/src/Avalonia.Controls.ViewBox/ViewBox.cs
+++ b/src/Avalonia.Controls.ViewBox/ViewBox.cs
@ -23,7 +23,7 @@ namespace Avalonia.Controls
        /// <summary>
        /// Identifies the <seealso cref="Stretch"/> avalonia property.
        /// </summary>
-        public static AvaloniaProperty<Stretch> StretchProperty =
+        public static StyledProperty<Stretch> StretchProperty =
            AvaloniaProperty.Register<ViewBox, Stretch>(nameof(Stretch), Stretch.Uniform, false, BindingMode.TwoWay);

        static ViewBox()
--- a/src/Wpf.Controls.PanAndZoom/Wpf.Controls.PanAndZoom.csproj
+++ b/src/Wpf.Controls.PanAndZoom/Wpf.Controls.PanAndZoom.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
    <OutputType>Library</OutputType>
    <UseWPF>True</UseWPF>
    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
--- a/src/Wpf.MatrixExtensions/Wpf.MatrixExtensions.csproj
+++ b/src/Wpf.MatrixExtensions/Wpf.MatrixExtensions.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
    <OutputType>Library</OutputType>
    <UseWPF>True</UseWPF>
    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
--- a/tests/Avalonia.Controls.PanAndZoom.UnitTests/Avalonia.Controls.PanAndZoom.UnitTests.csproj
+++ b/tests/Avalonia.Controls.PanAndZoom.UnitTests/Avalonia.Controls.PanAndZoom.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <OutputType>Library</OutputType>
    <IsPackable>False</IsPackable>
    <Nullable>enable</Nullable>
--- a/tests/Avalonia.Controls.ViewBox.UnitTests/Avalonia.Controls.ViewBox.UnitTests.csproj
+++ b/tests/Avalonia.Controls.ViewBox.UnitTests/Avalonia.Controls.ViewBox.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <OutputType>Library</OutputType>
    <IsPackable>False</IsPackable>
    <Nullable>enable</Nullable>
--- a/tests/Avalonia.MatrixExtensions.UnitTests/Avalonia.MatrixExtensions.UnitTests.csproj
+++ b/tests/Avalonia.MatrixExtensions.UnitTests/Avalonia.MatrixExtensions.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <OutputType>Library</OutputType>
    <IsPackable>False</IsPackable>
    <Nullable>enable</Nullable>
--- a/tests/PanAndZoom.UnitTests/PanAndZoom.UnitTests.csproj
+++ b/tests/PanAndZoom.UnitTests/PanAndZoom.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <OutputType>Library</OutputType>
    <IsPackable>False</IsPackable>
    <Nullable>enable</Nullable>
--- a/tests/Wpf.Controls.PanAndZoom.UnitTests/Wpf.Controls.PanAndZoom.UnitTests.csproj
+++ b/tests/Wpf.Controls.PanAndZoom.UnitTests/Wpf.Controls.PanAndZoom.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
    <OutputType>Library</OutputType>
    <IsPackable>False</IsPackable>
    <Nullable>enable</Nullable>
--- a/tests/Wpf.MatrixExtensions.UnitTests/Wpf.MatrixExtensions.UnitTests.csproj
+++ b/tests/Wpf.MatrixExtensions.UnitTests/Wpf.MatrixExtensions.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
    <OutputType>Library</OutputType>
    <IsPackable>False</IsPackable>
    <Nullable>enable</Nullable>