Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to net8-windows #11

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Upgrade to net8-windows #11

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95f70e5
upgrade to net8-windows
rwmcintosh Mar 21, 2024
2c590c4
update build image
rwmcintosh Mar 21, 2024
a3e6300
update ospsuite.utility
rwmcintosh Mar 21, 2024
f6db97d
make tests pass
rwmcintosh Mar 21, 2024
bc20239
update appveyor.info
rwmcintosh Mar 21, 2024
486fcb9
update default branch name
rwmcintosh Mar 21, 2024
311defa
update verbosity and copyright date
rwmcintosh Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SolutionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor issue: could change the copyright to ... 2002-2024...

[assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: InternalsVisibleTo("OSPSuite.DataBinding.Tests")]
[assembly: SupportedOSPlatform("windows")]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to tell VS that all assemblies are targeting windows only, otherwise there is a lot of warnings generated.

23 changes: 10 additions & 13 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,6 +23,7 @@ before_build:

build:
publish_nuget: true
publish_nuget_symbols: true
verbosity: minimal

pull_requests:
Expand All @@ -36,7 +38,7 @@ skip_tags: true

branches:
only:
- master
- main
- develop

test:
Expand All @@ -46,8 +48,3 @@ test:
skip_commits:
files:
- '*.md'

notifications:
- provider: Slack
incoming_webhook:
secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyF1h7st5qNdNezFp6T+bWXqrcZ4q/smtPcJ7LkUFHL46JDYUFlIL8FDz+ApX/vP+x0=
87 changes: 12 additions & 75 deletions src/OSPSuite.DataBinding/OSPSuite.DataBinding.csproj
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the csproj files are upgraded by right click, then select Upgrade. There's a few confirmations etc, but it's automatic. You just have to pick the target.

Then you have to go back and put -windows by hand.

Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2A29ACC0-9E37-4C97-8814-5F247C66B127}</ProjectGuid>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSPSuite.DataBinding</RootNamespace>
<AssemblyName>OSPSuite.DataBinding</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -33,68 +17,26 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\OSPSuite.DataBinding.xml</DocumentationFile>
<NoWarn>1591</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSPSuite.Utility, Version=4.0.0.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.4.0.0.4\lib\netstandard2.0\OSPSuite.Utility.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq">
<Reference Update="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<Reference Update="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="ControlEnableElementBinder.cs" />
<Compile Include="Controls\ComboBoxElementBinder.cs" />
<Compile Include="Controls\LabelBinder.cs" />
<Compile Include="Controls\TextBoxBinder.cs" />
<Compile Include="ElementBinderExtensions.cs" />
<Compile Include="IBinder.cs" />
<Compile Include="ListElementBinder.cs" />
<Compile Include="Core\PropertyBinderNotifier.cs" />
<Compile Include="ElementBinderValidator.cs" />
<Compile Include="IElementBinder.cs" />
<Compile Include="ScreenToElementBinder.cs" />
<Compile Include="ListElementBinderExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScreenBinder.cs" />
<Compile Include="ScreenBinderExtensions.cs" />
<Compile Include="ElementBinder.cs" />
<Compile Include="ScreenToElementBinderExtensions.cs" />
<Compile Include="PropertyValueSetEventArgs.cs" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
Expand All @@ -109,17 +51,12 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="OSPSuite.DataBinding.nuspec">
<None Update="OSPSuite.DataBinding.nuspec">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions src/OSPSuite.DataBinding/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/OSPSuite.DataBinding/packages.config
View file
Open in desktop

This file was deleted.

135 changes: 14 additions & 121 deletions tests/OSPSuite.DataBinding.Starter/OSPSuite.DataBinding.Starter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F9880840-16A0-45B4-87AD-2F587605BD91}</ProjectGuid>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSPSuite.DataBinding.Starter</RootNamespace>
<AssemblyName>OSPSuite.DataBinding.Starter</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -33,107 +17,26 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSPSuite.Utility, Version=4.0.0.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.4.0.0.4\lib\netstandard2.0\OSPSuite.Utility.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<Reference Update="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Design" />
<Reference Include="System.Xml.Linq">
<Reference Update="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="FormComboBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FormComboBox.Designer.cs">
<DependentUpon>FormComboBox.cs</DependentUpon>
</Compile>
<Compile Include="Individual.cs" />
<Compile Include="Population.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FormComboBox.resx">
<DependentUpon>FormComboBox.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ScreenBinderSimple.resx">
<DependentUpon>ScreenBinderSimple.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="ScreenBinderSimple.cs">
<Compile Update="ScreenBinderSimple.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ScreenBinderSimple.Designer.cs">
<DependentUpon>ScreenBinderSimple.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
Expand All @@ -148,21 +51,11 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\OSPSuite.DataBinding\OSPSuite.DataBinding.csproj">
<Project>{2a29acc0-9e37-4c97-8814-5f247c66b127}</Project>
<Name>OSPSuite.DataBinding</Name>
</ProjectReference>
<ProjectReference Include="..\OSPSuite.DataBinding.Tests\OSPSuite.DataBinding.Tests.csproj">
<Project>{af1abbb0-0e07-4479-a345-80806641937d}</Project>
<Name>OSPSuite.DataBinding.Tests</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\OSPSuite.DataBinding\OSPSuite.DataBinding.csproj" />
<ProjectReference Include="..\OSPSuite.DataBinding.Tests\OSPSuite.DataBinding.Tests.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
7 changes: 0 additions & 7 deletions tests/OSPSuite.DataBinding.Starter/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/OSPSuite.DataBinding.Starter/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading