Merge pull request #10 from LogoFX/develop

Develop
LogoFX · Apr 15, 2022 · 49e28f0 · 49e28f0
2 parents 8f6c120 + 9d319db
commit 49e28f0
Show file tree

Hide file tree

Showing 44 changed files with 86 additions and 1,901 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.5.{build}
+version: 2.2.6.{build}
 init:
 - dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
 configuration: Release

diff --git a/devops/deploy/deploy-all.bat b/devops/deploy/deploy-all.bat
@@ -1,5 +1,5 @@
 rem TODO: Use common source for all version instances
-SET version=2.2.5
+SET version=2.2.6
 rem TODO: Refactor using loop and automatic discovery
 call deploy-single.bat LogoFX.Core %version% 
 call deploy-single.bat LogoFX.Practices.IoC %version%

diff --git a/devops/pack/LogoFX.Client.Core.Core/contents/LogoFX.Client.Core.Core.nuspec b/devops/pack/LogoFX.Client.Core.Core/contents/LogoFX.Client.Core.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Core.Core</id>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <title>LogoFX.Client.Core.Core</title>
     <authors>Gennady Verdel, David Kossoglyad, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -14,7 +14,7 @@
     <summary>LogoFX Client Core Core containing core facilities for client applications development, including implementation of INotifyPropertyChanged and ambient context for the dispatcher.</summary>
     <releaseNotes>Added SetProperty functionality</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.5" />
+      <dependency id="LogoFX.Core" version="2.2.6" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/core" />

diff --git a/devops/pack/LogoFX.Client.Core/contents/LogoFX.Client.Core.nuspec b/devops/pack/LogoFX.Client.Core/contents/LogoFX.Client.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Core</id>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <title>LogoFX.Client.Core</title>
     <authors>Gennady Verdel, David Kossoglyad, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -14,7 +14,7 @@
     <summary>LogoFX Client Core containing platform-specific utilities for client applications, including dispatcher.</summary>
     <releaseNotes>Added .NET 5 support</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.6" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/core" />

diff --git a/devops/pack/LogoFX.Client.Core/pack.bat b/devops/pack/LogoFX.Client.Core/pack.bat
@@ -11,8 +11,6 @@ rmdir /Q /S ref
 cd ..
 mkdir netcoreapp3.1
 robocopy ../../../../../src/Bin/netcore/Release netcoreapp3.1 LogoFX.Client.Core.Platform.* /E
-mkdir uap10.0
-robocopy ../../../../../src/Bin/uwp/Release uap10.0 LogoFX.Client.Core.Platform.* /E
 mkdir monoandroid403
 robocopy ../../../../../src/Bin/android/Release monoandroid403 LogoFX.Client.Core.Platform.* /E
 mkdir xamarin.ios10

diff --git a/devops/pack/LogoFX.Client.Modularity/contents/LogoFX.Client.Modularity.nuspec b/devops/pack/LogoFX.Client.Modularity/contents/LogoFX.Client.Modularity.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Modularity</id>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <title>LogoFX.Client.Modularity</title>
     <authors>Gennady Verdel, David Kossoglyad, Dmitry Bublik</authors>
     <owners>Gennady Verdel</owners>
@@ -15,7 +15,7 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Solid.Core" version="2.3.3" />
+      <dependency id="Solid.Core" version="2.3.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/core" />

diff --git a/devops/pack/LogoFX.Client.Theming/contents/LogoFX.Client.Theming.nuspec b/devops/pack/LogoFX.Client.Theming/contents/LogoFX.Client.Theming.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Theming</id>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <title>LogoFX.Client.Theming</title>
     <authors>Dmitry Bublik, David Kossoglyad, Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>

diff --git a/devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec b/devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Core</id>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <authors>Gennady Verdel, David Kossoglyad, Vlad Spivak, Dmitry Bublik</authors>
     <owners>Gennady Verdel</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/devops/pack/LogoFX.Practices.IoC/contents/LogoFX.Practices.IoC.nuspec b/devops/pack/LogoFX.Practices.IoC/contents/LogoFX.Practices.IoC.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Practices.IoC</id>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <title>LogoFX.Practices.IoC</title>
     <authors>Gennady Verdel, David Kossoglyad, Dmitry Bublik, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.5" />
-      <dependency id="Solid.Practices.Modularity" version="2.3.3" />
+      <dependency id="LogoFX.Core" version="2.2.6" />
+      <dependency id="Solid.Practices.Modularity" version="2.3.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/core" />

diff --git a/devops/publish/publish-all.bat b/devops/publish/publish-all.bat
@@ -2,7 +2,7 @@ cd ../../src
 nuget restore
 cd ../devops/publish
 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '../build/build-all.ps1'"
-SET package_version=2.2.5
+SET package_version=2.2.6
 cd ../test
 call test-all
 cd ../pack

diff --git a/devops/publish/publish-single.bat b/devops/publish/publish-single.bat
@@ -1,5 +1,5 @@
 SET package_name=%1
-SET package_version=2.2.5
+SET package_version=2.2.6
 SET target=../../../../packages/Tests-All
 cd ../build
 call build-all

diff --git a/devops/update/UpdateUtil/Properties/launchSettings.json b/devops/update/UpdateUtil/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "UpdateUtil": {
       "commandName": "Project",
-      "commandLineArgs": "Solid 2.3.2"
+      "commandLineArgs": "Solid 2.3.5"
     }
   }
 }
diff --git a/src/LogoFX.Client.Core.Platform.NETCore.Specs/Invocation.feature.cs b/src/LogoFX.Client.Core.Platform.NETCore.Specs/Invocation.feature.cs
diff --git a/...ogoFX.Client.Core.Platform.NETCore.Specs/LogoFX.Client.Core.Platform.NETCore.Specs.csproj b/...ogoFX.Client.Core.Platform.NETCore.Specs/LogoFX.Client.Core.Platform.NETCore.Specs.csproj
@@ -6,12 +6,12 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="SpecFlow" Version="3.9.40" />
+    <PackageReference Include="FluentAssertions" Version="6.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="SpecFlow" Version="3.9.58" />
     <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
-    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
-    <PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
+    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.58" />
+    <PackageReference Include="SpecFlow.xUnit" Version="3.9.58" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/LogoFX.Client.Core.Platform/android/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/android/Properties/AssemblyInfo.cs
@@ -21,5 +21,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.5")]
-[assembly: AssemblyFileVersion("2.2.5")]
+[assembly: AssemblyVersion("2.2.6")]
+[assembly: AssemblyFileVersion("2.2.6")]
diff --git a/src/LogoFX.Client.Core.Platform/iOS/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/iOS/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.5")]
-[assembly: AssemblyFileVersion("2.2.5")]
+[assembly: AssemblyVersion("2.2.6")]
+[assembly: AssemblyFileVersion("2.2.6")]
diff --git a/src/LogoFX.Client.Core.Platform/net/LogoFX.Client.Core.Platform.NET.csproj b/src/LogoFX.Client.Core.Platform/net/LogoFX.Client.Core.Platform.NET.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>LogoFX.Client.Core.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Core</RootNamespace>
     <UseWPF>true</UseWPF>
-    <Version>2.2.5</Version>
+    <Version>2.2.6</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\net\Release</OutputPath>

diff --git a/src/LogoFX.Client.Core.Platform/netcore/LogoFX.Client.Core.Platform.NETCore.csproj b/src/LogoFX.Client.Core.Platform/netcore/LogoFX.Client.Core.Platform.NETCore.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>LogoFX.Client.Core.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Core</RootNamespace>
     <UseWPF>true</UseWPF>
-    <Version>2.2.5</Version>
+    <Version>2.2.6</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\netcore\Release</OutputPath>

diff --git a/src/LogoFX.Client.Core.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.5")]
-[assembly: AssemblyFileVersion("2.2.5")]
+[assembly: AssemblyVersion("2.2.6")]
+[assembly: AssemblyFileVersion("2.2.6")]
diff --git a/src/LogoFX.Client.Core.Platform/src/CommonProperties.cs b/src/LogoFX.Client.Core.Platform/src/CommonProperties.cs
@@ -1,9 +1,6 @@
 #if NET || NETCORE
 using System.Windows;
 #endif
-#if NETFX_CORE || WINDOWS_UWP
-using Windows.UI.Xaml;
-#endif
 
 namespace LogoFX.Client.Core
 {

diff --git a/src/LogoFX.Client.Core.Platform/src/Consts.cs b/src/LogoFX.Client.Core.Platform/src/Consts.cs
@@ -1,8 +1,4 @@
-#if NETFX_CORE || WINDOWS_UWP
-using Windows.UI.Core;
-#endif
-
-namespace LogoFX.Client.Core
+namespace LogoFX.Client.Core
 {
     /// <summary>
     /// Dispatcher-related constants.
@@ -12,20 +8,7 @@ public static class Consts
         /// <summary>
         /// The dispatcher priority
         /// </summary>
-        public const
-#if NET || NETCORE
-            System.Windows.Threading.DispatcherPriority
-#endif
-#if NETFX_CORE || WINDOWS_UWP
-            CoreDispatcherPriority
-#endif
-            DispatcherPriority =
-#if NET || NETCORE
-            System.Windows.Threading.DispatcherPriority.DataBind
-#endif
-#if NETFX_CORE || WINDOWS_UWP
-            CoreDispatcherPriority.Normal
-#endif
-        ;
+        public const System.Windows.Threading.DispatcherPriority
+            DispatcherPriority = System.Windows.Threading.DispatcherPriority.DataBind;
     }
 }