From 1df81c9d178df18c8dab94e433b20a26ceb9b7d7 Mon Sep 17 00:00:00 2001 From: Gennady Verdel Date: Fri, 21 Oct 2022 12:55:10 +0300 Subject: [PATCH] Develop (#14) * chore: targeting .NET 6 --- .gitignore | 8 +++++++- appveyor.yml | 2 +- devops/deploy/deploy-all.bat | 2 +- .../contents/LogoFX.Client.Core.Core.nuspec | 7 ++++--- .../contents/LogoFX.Client.Core.nuspec | 7 ++++--- devops/pack/LogoFX.Client.Core/pack.bat | 6 +++--- .../contents/LogoFX.Client.Modularity.nuspec | 4 ++-- .../contents/LogoFX.Client.Theming.nuspec | 5 +++-- devops/pack/LogoFX.Client.Theming/pack.bat | 6 +++--- .../LogoFX.Core/contents/LogoFX.Core.nuspec | 5 +++-- .../contents/LogoFX.Practices.IoC.nuspec | 6 +++--- devops/publish/publish-all.bat | 2 +- devops/publish/publish-single.bat | 2 +- .../UpdateUtil/Properties/launchSettings.json | 2 +- .../UpdateUtil/SdkProjectFileTypeHandler.cs | 2 +- ....Client.Core.Platform.NETCore.Specs.csproj | 14 ++++++------- .../android/Properties/AssemblyInfo.cs | 4 ++-- .../android/Resources/Resource.Designer.cs | 2 +- .../iOS/Properties/AssemblyInfo.cs | 4 ++-- .../LogoFX.Client.Core.Platform.NET.csproj | 2 +- ...LogoFX.Client.Core.Platform.NETCore.csproj | 2 +- .../netframework/Properties/AssemblyInfo.cs | 4 ++-- .../uwp/Properties/AssemblyInfo.cs | 4 ++-- .../LogoFX.Client.Core.Specs.Common.csproj | 4 ++-- .../LogoFX.Client.Core.Specs.csproj | 16 +++++++-------- .../LogoFX.Client.Core.csproj | 2 +- .../LogoFX.Client.Modularity.csproj | 4 ++-- .../LogoFX.Client.Theming.Platform.NET.csproj | 2 +- ...oFX.Client.Theming.Platform.NETCore.csproj | 2 +- .../netframework/Properties/AssemblyInfo.cs | 4 ++-- .../LogoFX.Client.Theming.csproj | 2 +- .../LogoFX.Core.Specs.Common.csproj | 6 +++--- .../LogoFX.Core.Specs.csproj | 16 +++++++-------- .../LogoFX.Core.Tests.csproj | 20 ++++++++++--------- src/LogoFX.Core/LogoFX.Core.csproj | 2 +- .../LogoFX.Practices.IoC.Modularity.csproj | 4 ++-- .../LogoFX.Practices.IoC.Specs.csproj | 16 +++++++-------- .../LogoFX.Practices.IoC.csproj | 2 +- 38 files changed, 108 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index 30c73fd..e2dedde 100644 --- a/.gitignore +++ b/.gitignore @@ -346,6 +346,12 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ +#Generated SpecFlow feature.cs files +*.feature.cs # Generated packages and intermediate output output -devops/pack/**/contents/lib \ No newline at end of file +devops/pack/**/contents/lib +!devops/build/ +**/secret.json +**/FeatureData.json +**/TestExecution.json \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index f0e1936..6f90792 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.6.{build} +version: 2.2.7.{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 index d31a31b..30873bb 100644 --- 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.6 +SET version=2.2.7 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 index 2934212..99257f5 100644 --- 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 @@ LogoFX.Client.Core.Core - 2.2.6 + 2.2.7 LogoFX.Client.Core.Core Gennady Verdel, David Kossoglyad, Vlad Spivak Gennady Verdel @@ -12,9 +12,10 @@ https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true LogoFX Client Core Core containing core facilities for client applications development, including implementation of INotifyPropertyChanged and ambient context for the dispatcher. LogoFX Client Core Core containing core facilities for client applications development, including implementation of INotifyPropertyChanged and ambient context for the dispatcher. - Added SetProperty functionality + + - + framework logofx dotnet diff --git a/devops/pack/LogoFX.Client.Core/contents/LogoFX.Client.Core.nuspec b/devops/pack/LogoFX.Client.Core/contents/LogoFX.Client.Core.nuspec index 44bf0f1..20f21d2 100644 --- 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 @@ LogoFX.Client.Core - 2.2.6 + 2.2.7 LogoFX.Client.Core Gennady Verdel, David Kossoglyad, Vlad Spivak Gennady Verdel @@ -12,9 +12,10 @@ https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true LogoFX Client Core containing platform-specific utilities for client applications, including dispatcher. LogoFX Client Core containing platform-specific utilities for client applications, including dispatcher. - Added .NET 5 support + + - + framework logofx dotnet diff --git a/devops/pack/LogoFX.Client.Core/pack.bat b/devops/pack/LogoFX.Client.Core/pack.bat index ebf05a2..68160bf 100644 --- a/devops/pack/LogoFX.Client.Core/pack.bat +++ b/devops/pack/LogoFX.Client.Core/pack.bat @@ -4,9 +4,9 @@ mkdir lib cd lib mkdir net461\ robocopy ../../../../../src/Bin/netframework/Release net461 LogoFX.Client.Core.Platform.* /E -mkdir net5.0 -robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Core.Platform.* /E -cd net5.0 +mkdir net6.0 +robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Core.Platform.* /E +cd net6.0 rmdir /Q /S ref cd .. mkdir netcoreapp3.1 diff --git a/devops/pack/LogoFX.Client.Modularity/contents/LogoFX.Client.Modularity.nuspec b/devops/pack/LogoFX.Client.Modularity/contents/LogoFX.Client.Modularity.nuspec index 4834b78..638f648 100644 --- 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 @@ LogoFX.Client.Modularity - 2.2.6 + 2.2.7 LogoFX.Client.Modularity Gennady Verdel, David Kossoglyad, Dmitry Bublik Gennady Verdel @@ -15,7 +15,7 @@ - + framework logofx dotnet diff --git a/devops/pack/LogoFX.Client.Theming/contents/LogoFX.Client.Theming.nuspec b/devops/pack/LogoFX.Client.Theming/contents/LogoFX.Client.Theming.nuspec index b1f4d6e..5d0e9fc 100644 --- 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 @@ LogoFX.Client.Theming - 2.2.6 + 2.2.7 LogoFX.Client.Theming Dmitry Bublik, David Kossoglyad, Gennady Verdel Gennady Verdel @@ -12,7 +12,8 @@ https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true LogoFX Client Theming containing rich theming infrastructure LogoFX Client Theming containing rich theming infrastructure - Initial release + + framework logofx dotnet diff --git a/devops/pack/LogoFX.Client.Theming/pack.bat b/devops/pack/LogoFX.Client.Theming/pack.bat index 0ec3504..3fabf75 100644 --- a/devops/pack/LogoFX.Client.Theming/pack.bat +++ b/devops/pack/LogoFX.Client.Theming/pack.bat @@ -4,9 +4,9 @@ mkdir lib cd lib mkdir net461\ robocopy ../../../../../src/Bin/netframework/Release net461 LogoFX.Client.Theming.* /E -mkdir net5.0 -robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Theming.* /E -cd net5.0 +mkdir net6.0 +robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Theming.* /E +cd net6.0 rmdir /Q /S ref cd .. mkdir netcoreapp3.1 diff --git a/devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec b/devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec index ae7ca17..291d5d6 100644 --- a/devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec +++ b/devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec @@ -2,7 +2,7 @@ LogoFX.Core - 2.2.6 + 2.2.7 Gennady Verdel, David Kossoglyad, Vlad Spivak, Dmitry Bublik Gennady Verdel false @@ -10,7 +10,8 @@ https://github.com/LogoFX/core https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true LogoFX Core assemblies containing collections and weak objects implementations. - Improved notification management via dedicated interface. + + framework logofx core dotnet diff --git a/devops/pack/LogoFX.Practices.IoC/contents/LogoFX.Practices.IoC.nuspec b/devops/pack/LogoFX.Practices.IoC/contents/LogoFX.Practices.IoC.nuspec index ce5a5ed..20cfb59 100644 --- 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 @@ LogoFX.Practices.IoC - 2.2.6 + 2.2.7 LogoFX.Practices.IoC Gennady Verdel, David Kossoglyad, Dmitry Bublik, Vlad Spivak Gennady Verdel @@ -15,8 +15,8 @@ - - + + framework logofx dotnet diff --git a/devops/publish/publish-all.bat b/devops/publish/publish-all.bat index 2ef22a3..48c75f2 100644 --- 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.6 +SET package_version=2.2.7 cd ../test call test-all cd ../pack diff --git a/devops/publish/publish-single.bat b/devops/publish/publish-single.bat index ac172c1..ed00dc0 100644 --- 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.6 +SET package_version=2.2.7 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 index 705e2e3..a03aad0 100644 --- 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.5" + "commandLineArgs": "Solid 2.3.6" } } } \ No newline at end of file diff --git a/devops/update/UpdateUtil/SdkProjectFileTypeHandler.cs b/devops/update/UpdateUtil/SdkProjectFileTypeHandler.cs index 1d7ad13..9ac3701 100644 --- a/devops/update/UpdateUtil/SdkProjectFileTypeHandler.cs +++ b/devops/update/UpdateUtil/SdkProjectFileTypeHandler.cs @@ -30,7 +30,7 @@ public override void UpdateFiles(string prefix, VersionInfo versionInfo) } if (!targetFrameworkElement.InnerText.StartsWith("netcoreapp") && - !targetFrameworkElement.InnerText.StartsWith("net5") && + !targetFrameworkElement.InnerText.StartsWith("net6") && !targetFrameworkElement.InnerText.StartsWith("netstandard")) { continue; diff --git a/src/LogoFX.Client.Core.Platform.NETCore.Specs/LogoFX.Client.Core.Platform.NETCore.Specs.csproj b/src/LogoFX.Client.Core.Platform.NETCore.Specs/LogoFX.Client.Core.Platform.NETCore.Specs.csproj index 4d9f5ff..7ad3e18 100644 --- a/src/LogoFX.Client.Core.Platform.NETCore.Specs/LogoFX.Client.Core.Platform.NETCore.Specs.csproj +++ b/src/LogoFX.Client.Core.Platform.NETCore.Specs/LogoFX.Client.Core.Platform.NETCore.Specs.csproj @@ -6,14 +6,14 @@ true - - - + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LogoFX.Client.Core.Platform/android/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/android/Properties/AssemblyInfo.cs index 9077e73..d69a97f 100644 --- 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.6")] -[assembly: AssemblyFileVersion("2.2.6")] +[assembly: AssemblyVersion("2.2.7")] +[assembly: AssemblyFileVersion("2.2.7")] diff --git a/src/LogoFX.Client.Core.Platform/android/Resources/Resource.Designer.cs b/src/LogoFX.Client.Core.Platform/android/Resources/Resource.Designer.cs index 42b5827..023023b 100644 --- a/src/LogoFX.Client.Core.Platform/android/Resources/Resource.Designer.cs +++ b/src/LogoFX.Client.Core.Platform/android/Resources/Resource.Designer.cs @@ -14,7 +14,7 @@ namespace LogoFX.Client.Core { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.1.0.11")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.0.0.73")] public partial class Resource { diff --git a/src/LogoFX.Client.Core.Platform/iOS/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/iOS/Properties/AssemblyInfo.cs index e9267ca..2f8e875 100644 --- 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.6")] -[assembly: AssemblyFileVersion("2.2.6")] +[assembly: AssemblyVersion("2.2.7")] +[assembly: AssemblyFileVersion("2.2.7")] 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 index bf5317b..9376f3f 100644 --- 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 @@ LogoFX.Client.Core.Platform LogoFX.Client.Core true - 2.2.6 + 2.2.7 ..\..\Bin\net\Release 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 index 5788fb4..35ff62f 100644 --- 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 @@ LogoFX.Client.Core.Platform LogoFX.Client.Core true - 2.2.6 + 2.2.7 ..\..\Bin\netcore\Release diff --git a/src/LogoFX.Client.Core.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/netframework/Properties/AssemblyInfo.cs index 5fd4444..dad1d46 100644 --- 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.6")] -[assembly: AssemblyFileVersion("2.2.6")] +[assembly: AssemblyVersion("2.2.7")] +[assembly: AssemblyFileVersion("2.2.7")] diff --git a/src/LogoFX.Client.Core.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Core.Platform/uwp/Properties/AssemblyInfo.cs index eedfd46..931dc84 100644 --- a/src/LogoFX.Client.Core.Platform/uwp/Properties/AssemblyInfo.cs +++ b/src/LogoFX.Client.Core.Platform/uwp/Properties/AssemblyInfo.cs @@ -20,6 +20,6 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.2.6")] -[assembly: AssemblyFileVersion("2.2.6")] +[assembly: AssemblyVersion("2.2.7")] +[assembly: AssemblyFileVersion("2.2.7")] [assembly: ComVisible(false)] diff --git a/src/LogoFX.Client.Core.Specs.Common/LogoFX.Client.Core.Specs.Common.csproj b/src/LogoFX.Client.Core.Specs.Common/LogoFX.Client.Core.Specs.Common.csproj index 13083a8..a1ae54a 100644 --- a/src/LogoFX.Client.Core.Specs.Common/LogoFX.Client.Core.Specs.Common.csproj +++ b/src/LogoFX.Client.Core.Specs.Common/LogoFX.Client.Core.Specs.Common.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 false @@ -11,7 +11,7 @@ 8 - + diff --git a/src/LogoFX.Client.Core.Specs/LogoFX.Client.Core.Specs.csproj b/src/LogoFX.Client.Core.Specs/LogoFX.Client.Core.Specs.csproj index 16deff4..963a7eb 100644 --- a/src/LogoFX.Client.Core.Specs/LogoFX.Client.Core.Specs.csproj +++ b/src/LogoFX.Client.Core.Specs/LogoFX.Client.Core.Specs.csproj @@ -5,15 +5,15 @@ false - - - - + + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LogoFX.Client.Core/LogoFX.Client.Core.csproj b/src/LogoFX.Client.Core/LogoFX.Client.Core.csproj index c81f379..4fc34fe 100644 --- a/src/LogoFX.Client.Core/LogoFX.Client.Core.csproj +++ b/src/LogoFX.Client.Core/LogoFX.Client.Core.csproj @@ -2,7 +2,7 @@ netstandard2.0 false - 2.2.6 + 2.2.7 ..\Bin\netstandard\Release diff --git a/src/LogoFX.Client.Modularity/LogoFX.Client.Modularity.csproj b/src/LogoFX.Client.Modularity/LogoFX.Client.Modularity.csproj index 286e428..45b6004 100644 --- a/src/LogoFX.Client.Modularity/LogoFX.Client.Modularity.csproj +++ b/src/LogoFX.Client.Modularity/LogoFX.Client.Modularity.csproj @@ -2,7 +2,7 @@ netstandard2.0 false - 2.2.6 + 2.2.7 ..\Bin\netstandard\Release @@ -12,6 +12,6 @@ true - + \ No newline at end of file diff --git a/src/LogoFX.Client.Theming.Platform/net/LogoFX.Client.Theming.Platform.NET.csproj b/src/LogoFX.Client.Theming.Platform/net/LogoFX.Client.Theming.Platform.NET.csproj index a948d3b..379edb7 100644 --- a/src/LogoFX.Client.Theming.Platform/net/LogoFX.Client.Theming.Platform.NET.csproj +++ b/src/LogoFX.Client.Theming.Platform/net/LogoFX.Client.Theming.Platform.NET.csproj @@ -5,7 +5,7 @@ true LogoFX.Client.Theming.Platform LogoFX.Client.Theming - 2.2.6 + 2.2.7 ..\..\bin\net\Release diff --git a/src/LogoFX.Client.Theming.Platform/netcore/LogoFX.Client.Theming.Platform.NETCore.csproj b/src/LogoFX.Client.Theming.Platform/netcore/LogoFX.Client.Theming.Platform.NETCore.csproj index d7037ca..28c9a1b 100644 --- a/src/LogoFX.Client.Theming.Platform/netcore/LogoFX.Client.Theming.Platform.NETCore.csproj +++ b/src/LogoFX.Client.Theming.Platform/netcore/LogoFX.Client.Theming.Platform.NETCore.csproj @@ -5,7 +5,7 @@ true LogoFX.Client.Theming.Platform LogoFX.Client.Theming - 2.2.6 + 2.2.7 ..\..\bin\netcore\Release diff --git a/src/LogoFX.Client.Theming.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Theming.Platform/netframework/Properties/AssemblyInfo.cs index cc03588..499de2e 100644 --- a/src/LogoFX.Client.Theming.Platform/netframework/Properties/AssemblyInfo.cs +++ b/src/LogoFX.Client.Theming.Platform/netframework/Properties/AssemblyInfo.cs @@ -44,5 +44,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.2.6")] -[assembly: AssemblyFileVersion("2.2.6")] +[assembly: AssemblyVersion("2.2.7")] +[assembly: AssemblyFileVersion("2.2.7")] diff --git a/src/LogoFX.Client.Theming/LogoFX.Client.Theming.csproj b/src/LogoFX.Client.Theming/LogoFX.Client.Theming.csproj index 5928083..b50d704 100644 --- a/src/LogoFX.Client.Theming/LogoFX.Client.Theming.csproj +++ b/src/LogoFX.Client.Theming/LogoFX.Client.Theming.csproj @@ -2,7 +2,7 @@ netstandard2.0 false - 2.2.6 + 2.2.7 ..\bin\netstandard\Release diff --git a/src/LogoFX.Core.Specs.Common/LogoFX.Core.Specs.Common.csproj b/src/LogoFX.Core.Specs.Common/LogoFX.Core.Specs.Common.csproj index 993e718..493b059 100644 --- a/src/LogoFX.Core.Specs.Common/LogoFX.Core.Specs.Common.csproj +++ b/src/LogoFX.Core.Specs.Common/LogoFX.Core.Specs.Common.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 false @@ -11,7 +11,7 @@ 8 - - + + \ No newline at end of file diff --git a/src/LogoFX.Core.Specs/LogoFX.Core.Specs.csproj b/src/LogoFX.Core.Specs/LogoFX.Core.Specs.csproj index 77f2d0f..02f12c4 100644 --- a/src/LogoFX.Core.Specs/LogoFX.Core.Specs.csproj +++ b/src/LogoFX.Core.Specs/LogoFX.Core.Specs.csproj @@ -8,15 +8,15 @@ false - - - - + + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LogoFX.Core.Tests/LogoFX.Core.Tests.csproj b/src/LogoFX.Core.Tests/LogoFX.Core.Tests.csproj index f9f0165..4f1bd81 100644 --- a/src/LogoFX.Core.Tests/LogoFX.Core.Tests.csproj +++ b/src/LogoFX.Core.Tests/LogoFX.Core.Tests.csproj @@ -1,14 +1,16 @@ - - netcoreapp3.1 - false - false - + + net6.0 + false + enable + enable + false + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LogoFX.Core/LogoFX.Core.csproj b/src/LogoFX.Core/LogoFX.Core.csproj index 7ddb676..486555f 100644 --- a/src/LogoFX.Core/LogoFX.Core.csproj +++ b/src/LogoFX.Core/LogoFX.Core.csproj @@ -2,7 +2,7 @@ netstandard2.0 false - 2.2.6 + 2.2.7 Gennady Verdel, David Kossoglyad, Vlad Spivak, Dmitry Bublik LogoFX LogoFX Core assemblies containing collections and weak objects implementations. diff --git a/src/LogoFX.Practices.IoC.Modularity/LogoFX.Practices.IoC.Modularity.csproj b/src/LogoFX.Practices.IoC.Modularity/LogoFX.Practices.IoC.Modularity.csproj index e42c2ba..e47335e 100644 --- a/src/LogoFX.Practices.IoC.Modularity/LogoFX.Practices.IoC.Modularity.csproj +++ b/src/LogoFX.Practices.IoC.Modularity/LogoFX.Practices.IoC.Modularity.csproj @@ -2,7 +2,7 @@ netstandard2.0 false - 2.2.6 + 2.2.7 ..\Bin\netstandard\Release @@ -12,7 +12,7 @@ true - + diff --git a/src/LogoFX.Practices.IoC.Specs/LogoFX.Practices.IoC.Specs.csproj b/src/LogoFX.Practices.IoC.Specs/LogoFX.Practices.IoC.Specs.csproj index 7a46210..7d07b46 100644 --- a/src/LogoFX.Practices.IoC.Specs/LogoFX.Practices.IoC.Specs.csproj +++ b/src/LogoFX.Practices.IoC.Specs/LogoFX.Practices.IoC.Specs.csproj @@ -5,15 +5,15 @@ false - - - - + + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/LogoFX.Practices.IoC/LogoFX.Practices.IoC.csproj b/src/LogoFX.Practices.IoC/LogoFX.Practices.IoC.csproj index 88acab4..f53f617 100644 --- a/src/LogoFX.Practices.IoC/LogoFX.Practices.IoC.csproj +++ b/src/LogoFX.Practices.IoC/LogoFX.Practices.IoC.csproj @@ -2,7 +2,7 @@ netstandard2.0 false - 2.2.6 + 2.2.7 ..\Bin\netstandard\Release