Skip to content

Commit f8cd3a7

Browse files
jeffovercashjeffovercash
committed
7.14.6 Update
Improved ANSI character support (SJIS, Latin1 etc) MacOS loading works The Schema classes now have a global switch to emulate its output types to match the old Dbx based ADO driver.
1 parent 5b080e4 commit f8cd3a7

File tree

72 files changed

+1494
-1328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1494
-1328
lines changed

‎NETProvider/Demos/ChangeViews Demo/ChangeViews Demo.csproj

+8-75
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{1B9C0326-7E38-460A-B6B0-C9318B6075DB}</ProjectGuid>
3+
<TargetFramework>net6.0-windows</TargetFramework>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>ChangeViews_Demo</RootNamespace>
10-
<AssemblyName>ChangeViews Demo</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
348
</PropertyGroup>
359
<ItemGroup>
3610
<Reference Include="InterBaseSql.Data.InterBaseClient">
3711
<HintPath>..\..\NETProvider\trunk\NETProvider\Provider\src\InterBaseSql.Data.InterBaseClient\obj\Debug\net452\InterBaseSql.Data.InterBaseClient.dll</HintPath>
3812
</Reference>
39-
<Reference Include="System" />
40-
<Reference Include="System.Core" />
41-
<Reference Include="System.Xml.Linq" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Deployment" />
46-
<Reference Include="System.Drawing" />
47-
<Reference Include="System.Net.Http" />
48-
<Reference Include="System.Windows.Forms" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="MainForm.cs">
53-
<SubType>Form</SubType>
54-
</Compile>
55-
<Compile Include="MainForm.Designer.cs">
56-
<DependentUpon>MainForm.cs</DependentUpon>
57-
</Compile>
58-
<Compile Include="Program.cs" />
59-
<Compile Include="Properties\AssemblyInfo.cs" />
60-
<EmbeddedResource Include="MainForm.resx">
61-
<DependentUpon>MainForm.cs</DependentUpon>
62-
</EmbeddedResource>
63-
<EmbeddedResource Include="Properties\Resources.resx">
64-
<Generator>ResXFileCodeGenerator</Generator>
65-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
66-
<SubType>Designer</SubType>
67-
</EmbeddedResource>
68-
<Compile Include="Properties\Resources.Designer.cs">
69-
<AutoGen>True</AutoGen>
70-
<DependentUpon>Resources.resx</DependentUpon>
71-
</Compile>
72-
<None Include="Properties\Settings.settings">
73-
<Generator>SettingsSingleFileGenerator</Generator>
74-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
75-
</None>
76-
<Compile Include="Properties\Settings.Designer.cs">
77-
<AutoGen>True</AutoGen>
78-
<DependentUpon>Settings.settings</DependentUpon>
79-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
80-
</Compile>
8113
</ItemGroup>
8214
<ItemGroup>
83-
<None Include="App.config" />
15+
<PackageReference Include="InterBaseSql.Data.InterBaseClient" Version="7.13.7" />
16+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
17+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
8418
</ItemGroup>
85-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8619
</Project>

‎NETProvider/Demos/ChangeViews Demo/ChangeViews Demo.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.31205.134
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChangeViews Demo", "ChangeViews Demo.csproj", "{1B9C0326-7E38-460A-B6B0-C9318B6075DB}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChangeViews Demo", "ChangeViews Demo.csproj", "{1B9C0326-7E38-460A-B6B0-C9318B6075DB}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎NETProvider/Demos/ChangeViews Demo/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎NETProvider/Demos/ConnectionBuilder/ConnectionBuilder.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.30907.101
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectionBuilder", "ConnectionBuilder\ConnectionBuilder.csproj", "{EC6E1FFC-0076-4A45-B0C0-02A5AD3F85A1}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectionBuilder", "ConnectionBuilder\ConnectionBuilder.csproj", "{EC6E1FFC-0076-4A45-B0C0-02A5AD3F85A1}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎NETProvider/Demos/ConnectionBuilder/ConnectionBuilder/ConnectionBuilder.csproj

+16-75
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,33 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{EC6E1FFC-0076-4A45-B0C0-02A5AD3F85A1}</ProjectGuid>
3+
<TargetFramework>net6.0-windows</TargetFramework>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>ConnectionBuilder</RootNamespace>
10-
<AssemblyName>ConnectionBuilder</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
348
</PropertyGroup>
359
<ItemGroup>
3610
<Reference Include="InterBaseSql.Data.InterBaseClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=73f45bff97b4c31b, processorArchitecture=MSIL">
3711
<SpecificVersion>False</SpecificVersion>
3812
<HintPath>..\..\NETProvider\trunk\NETProvider\Provider\src\InterBaseSql.Data.InterBaseClient\obj\Debug\net452\InterBaseSql.Data.InterBaseClient.dll</HintPath>
3913
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="System.Data.DataSetExtensions" />
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Deployment" />
47-
<Reference Include="System.Drawing" />
48-
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Windows.Forms" />
50-
<Reference Include="System.Xml" />
5114
</ItemGroup>
5215
<ItemGroup>
53-
<Compile Include="Form1.cs">
54-
<SubType>Form</SubType>
55-
</Compile>
56-
<Compile Include="Form1.Designer.cs">
57-
<DependentUpon>Form1.cs</DependentUpon>
58-
</Compile>
59-
<Compile Include="Program.cs" />
60-
<Compile Include="Properties\AssemblyInfo.cs" />
61-
<EmbeddedResource Include="Form1.resx">
62-
<DependentUpon>Form1.cs</DependentUpon>
63-
</EmbeddedResource>
64-
<EmbeddedResource Include="Properties\Resources.resx">
65-
<Generator>ResXFileCodeGenerator</Generator>
66-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
67-
<SubType>Designer</SubType>
68-
</EmbeddedResource>
69-
<Compile Include="Properties\Resources.Designer.cs">
70-
<AutoGen>True</AutoGen>
71-
<DependentUpon>Resources.resx</DependentUpon>
72-
</Compile>
73-
<None Include="Properties\Settings.settings">
74-
<Generator>SettingsSingleFileGenerator</Generator>
75-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
76-
</None>
77-
<Compile Include="Properties\Settings.Designer.cs">
16+
<PackageReference Include="InterBaseSql.Data.InterBaseClient" Version="7.14.6" />
17+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
18+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<Compile Update="Properties\Settings.Designer.cs">
22+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
7823
<AutoGen>True</AutoGen>
7924
<DependentUpon>Settings.settings</DependentUpon>
80-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
8125
</Compile>
8226
</ItemGroup>
8327
<ItemGroup>
84-
<None Include="App.config" />
85-
</ItemGroup>
86-
<ItemGroup>
87-
<PackageReference Include="InterBaseSql.Data.InterBaseClient">
88-
<Version>7.11.0</Version>
89-
</PackageReference>
28+
<None Update="Properties\Settings.settings">
29+
<Generator>SettingsSingleFileGenerator</Generator>
30+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
31+
</None>
9032
</ItemGroup>
91-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9233
</Project>

0 commit comments

Comments
 (0)