diff --git a/SolutionInfo.cs b/SolutionInfo.cs index e725b03..e07f4f8 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -1,10 +1,12 @@ using System.Runtime.CompilerServices; using System.Reflection; using System.Runtime.InteropServices; +using System.Runtime.Versioning; [assembly: AssemblyCompany("Open Systems Pharmacology Community")] [assembly: AssemblyProduct("OSPSuite.DataBinding")] -[assembly: AssemblyCopyright("Copyright © 2002-2019 - Open Systems Pharmacology Community")] +[assembly: AssemblyCopyright("Copyright © 2002-2024 - Open Systems Pharmacology Community")] [assembly: ComVisible(false)] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: InternalsVisibleTo("OSPSuite.DataBinding.Tests")] +[assembly: SupportedOSPlatform("windows")] diff --git a/appveyor.yml b/appveyor.yml index 76719da..dc46cbb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,19 +1,20 @@ configuration: Debug -image: Visual Studio 2019 +image: Visual Studio 2022 environment: app_version: '3.0.0' version: '$(app_version).{build}' -assembly_info: +dotnet_csproj: patch: true - file: SolutionInfo.* - assembly_version: "{version}" - assembly_file_version: "{version}" - + file: '**\*.csproj' + assembly_version: '$(app_version).$(build_number)' + file_version: '$(app_version).$(build_number)' + informational_version: '$(app_version).$(build_number)' + cache: - packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified + packages -> **\*.csproj # preserve "packages" directory in the root of build folder but will reset it if a project file is modified before_build: - nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper @@ -22,7 +23,8 @@ before_build: build: publish_nuget: true - verbosity: minimal + publish_nuget_symbols: true + verbosity: detailed pull_requests: do_not_increment_build_number: true @@ -36,7 +38,7 @@ skip_tags: true branches: only: - - master + - main - develop test: @@ -46,8 +48,3 @@ test: skip_commits: files: - '*.md' - -notifications: - - provider: Slack - incoming_webhook: - secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyF1h7st5qNdNezFp6T+bWXqrcZ4q/smtPcJ7LkUFHL46JDYUFlIL8FDz+ApX/vP+x0= \ No newline at end of file diff --git a/src/OSPSuite.DataBinding/OSPSuite.DataBinding.csproj b/src/OSPSuite.DataBinding/OSPSuite.DataBinding.csproj index 996bbc5..da07c18 100644 --- a/src/OSPSuite.DataBinding/OSPSuite.DataBinding.csproj +++ b/src/OSPSuite.DataBinding/OSPSuite.DataBinding.csproj @@ -1,23 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {2A29ACC0-9E37-4C97-8814-5F247C66B127} + net8.0-windows Library - Properties - OSPSuite.DataBinding - OSPSuite.DataBinding - v4.6.2 - 512 - - - - - 3.5 - publish\ true Disk @@ -33,68 +17,26 @@ false false true + false + true + true - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\OSPSuite.DataBinding.xml 1591 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - ..\..\packages\OSPSuite.Utility.4.0.0.4\lib\netstandard2.0\OSPSuite.Utility.dll - - - - 3.5 - - - + 3.5 - + 3.5 - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - - @@ -109,17 +51,12 @@ - + Designer - - - + + + + \ No newline at end of file diff --git a/src/OSPSuite.DataBinding/Properties/AssemblyInfo.cs b/src/OSPSuite.DataBinding/Properties/AssemblyInfo.cs deleted file mode 100644 index 4201364..0000000 --- a/src/OSPSuite.DataBinding/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Reflection; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OSPSuite.DataBinding")] -[assembly: AssemblyDescription("WinForms DataBinding Engine")] diff --git a/src/OSPSuite.DataBinding/packages.config b/src/OSPSuite.DataBinding/packages.config deleted file mode 100644 index 46beed0..0000000 --- a/src/OSPSuite.DataBinding/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tests/OSPSuite.DataBinding.Starter/OSPSuite.DataBinding.Starter.csproj b/tests/OSPSuite.DataBinding.Starter/OSPSuite.DataBinding.Starter.csproj index 7960f3e..9d955eb 100644 --- a/tests/OSPSuite.DataBinding.Starter/OSPSuite.DataBinding.Starter.csproj +++ b/tests/OSPSuite.DataBinding.Starter/OSPSuite.DataBinding.Starter.csproj @@ -1,23 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {F9880840-16A0-45B4-87AD-2F587605BD91} + net8.0-windows WinExe - Properties - OSPSuite.DataBinding.Starter - OSPSuite.DataBinding.Starter - v4.6.2 - 512 - - - - - 3.5 - publish\ true Disk @@ -33,107 +17,26 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + false + true + true - - ..\..\packages\OSPSuite.Utility.4.0.0.4\lib\netstandard2.0\OSPSuite.Utility.dll - - - + 3.5 - - + 3.5 - - 3.5 - - - - - - Properties\SolutionInfo.cs - - Form - - - Form1.cs - - - Form - - - FormComboBox.cs - - - - - - - Form1.cs - Designer - - - FormComboBox.cs - Designer - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - ScreenBinderSimple.cs - Designer - - - True - Resources.resx - True - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - + UserControl - - ScreenBinderSimple.cs - @@ -148,21 +51,11 @@ - - {2a29acc0-9e37-4c97-8814-5f247c66b127} - OSPSuite.DataBinding - - - {af1abbb0-0e07-4479-a345-80806641937d} - OSPSuite.DataBinding.Tests - + + + + + + - - \ No newline at end of file diff --git a/tests/OSPSuite.DataBinding.Starter/Properties/AssemblyInfo.cs b/tests/OSPSuite.DataBinding.Starter/Properties/AssemblyInfo.cs deleted file mode 100644 index 9a93f4f..0000000 --- a/tests/OSPSuite.DataBinding.Starter/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OSPSuite.DataBinding.Starter")] diff --git a/tests/OSPSuite.DataBinding.Starter/Properties/Resources.Designer.cs b/tests/OSPSuite.DataBinding.Starter/Properties/Resources.Designer.cs index 818e981..e7ba718 100644 --- a/tests/OSPSuite.DataBinding.Starter/Properties/Resources.Designer.cs +++ b/tests/OSPSuite.DataBinding.Starter/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace OSPSuite.DataBinding.Starter.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/tests/OSPSuite.DataBinding.Starter/Properties/Settings.Designer.cs b/tests/OSPSuite.DataBinding.Starter/Properties/Settings.Designer.cs index c72f051..a3ff22a 100644 --- a/tests/OSPSuite.DataBinding.Starter/Properties/Settings.Designer.cs +++ b/tests/OSPSuite.DataBinding.Starter/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace OSPSuite.DataBinding.Starter.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/tests/OSPSuite.DataBinding.Starter/app.config b/tests/OSPSuite.DataBinding.Starter/app.config deleted file mode 100644 index b2b9a3b..0000000 --- a/tests/OSPSuite.DataBinding.Starter/app.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/OSPSuite.DataBinding.Starter/packages.config b/tests/OSPSuite.DataBinding.Starter/packages.config deleted file mode 100644 index 46beed0..0000000 --- a/tests/OSPSuite.DataBinding.Starter/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tests/OSPSuite.DataBinding.Tests/ElementBinderValidatorSpecs.cs b/tests/OSPSuite.DataBinding.Tests/ElementBinderValidatorSpecs.cs index 1b0f4b7..7714ff2 100644 --- a/tests/OSPSuite.DataBinding.Tests/ElementBinderValidatorSpecs.cs +++ b/tests/OSPSuite.DataBinding.Tests/ElementBinderValidatorSpecs.cs @@ -1,4 +1,5 @@ using System; +using System.Windows.Forms; using FakeItEasy; using OSPSuite.BDDHelper; using OSPSuite.BDDHelper.Extensions; @@ -22,7 +23,8 @@ protected override void Context() A.CallTo(() => _elementToValidate.Source).Returns(_source); A.CallTo(() => _elementToValidate.PropertyName).Returns("FirstName"); A.CallTo(() => _elementToValidate.GetValueFromControl()).Returns("Toto"); - _elementToValidate.ParentBinder = _screenBinder; + A.CallTo(() => _elementToValidate.ParentBinder).Returns(_screenBinder); + A.CallTo(() => _elementToValidate.Control).Returns(new Label()); _validationEngine = A.Fake(); sut = new ElementBinderValidator(_validationEngine); diff --git a/tests/OSPSuite.DataBinding.Tests/OSPSuite.DataBinding.Tests.csproj b/tests/OSPSuite.DataBinding.Tests/OSPSuite.DataBinding.Tests.csproj index 0311bae..42d8084 100644 --- a/tests/OSPSuite.DataBinding.Tests/OSPSuite.DataBinding.Tests.csproj +++ b/tests/OSPSuite.DataBinding.Tests/OSPSuite.DataBinding.Tests.csproj @@ -1,24 +1,7 @@ - - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {AF1ABBB0-0E07-4479-A345-80806641937D} + net8.0-windows Library - Properties - OSPSuite.DataBinding.Tests - OSPSuite.DataBinding.Tests - v4.6.2 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,70 +17,25 @@ false false true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + false + true + true - - ..\..\packages\FakeItEasy.5.5.0\lib\net45\FakeItEasy.dll - - - - ..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll - - - ..\..\packages\OSPSuite.BDDHelper.4.0.0.1\lib\netstandard2.0\OSPSuite.BDDHelper.dll - - - ..\..\packages\OSPSuite.Utility.4.0.0.4\lib\netstandard2.0\OSPSuite.Utility.dll - - - - 3.5 - - - + 3.5 - + 3.5 - - Properties\SolutionInfo.cs - - - - + Component - - - - @@ -112,27 +50,15 @@ - - + - - {2a29acc0-9e37-4c97-8814-5f247c66b127} - OSPSuite.DataBinding - + + + + + + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/tests/OSPSuite.DataBinding.Tests/Properties/AssemblyInfo.cs b/tests/OSPSuite.DataBinding.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index c805d4f..0000000 --- a/tests/OSPSuite.DataBinding.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OSPSuite.DataBinding.Tests")] \ No newline at end of file diff --git a/tests/OSPSuite.DataBinding.Tests/app.config b/tests/OSPSuite.DataBinding.Tests/app.config deleted file mode 100644 index 0ceb3e8..0000000 --- a/tests/OSPSuite.DataBinding.Tests/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tests/OSPSuite.DataBinding.Tests/packages.config b/tests/OSPSuite.DataBinding.Tests/packages.config deleted file mode 100644 index 3b0fd0d..0000000 --- a/tests/OSPSuite.DataBinding.Tests/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file