Skip to content

Commit 3f8f4b8

Browse files
jeffovercashjeffovercash
committed
7.13.6 release
Updated EFCore support to EFCore 6.0 and updated to the Fb 9.x driver source. This was done primarily for scaffolding support. Primary driver has a few bug fixes around when connecting to a dialect 1 database but requesting dialect 3.
1 parent 9251070 commit 3f8f4b8

File tree

271 files changed

+12216
-9247
lines changed

Some content is hidden

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

271 files changed

+12216
-9247
lines changed

‎NETProvider/DDEX/installer/Install.wxs

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<Product Id="FD91E41B-6B32-47A3-B440-27A0158DD679"
4-
UpgradeCode="0FD0277A-371E-4C1F-A486-0A6DB552E4B1"
5-
Name="DDEX Provider for InterBase !(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
6-
Language="1033"
7-
Version="!(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
8-
Manufacturer="InterBaseSQL">
9-
<Package InstallerVersion="200" Compressed="yes" Description="DDEX Provider for InterBase" />
10-
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" CompressionLevel="high" />
11-
<Feature Id="InterBaseDDEXFeature" Title="DDEX Provider for InterBase" Level="1" Absent="disallow">
12-
<ComponentRef Id="InterBaseDDEXComponent" />
13-
<ComponentRef Id="OtherFilesComponent" />
14-
</Feature>
15-
<Feature Id="VS2015Registry64Feature" Title="Visual Studio 2015 Support (64bit OS)" Level="1">
16-
<ComponentRef Id="VS2015Registry64Component" />
17-
</Feature>
18-
<Feature Id="VS2015Registry32Feature" Title="Visual Studio 2015 Support (32bit OS)" Level="2">
19-
<ComponentRef Id="VS2015Registry32Component" />
20-
</Feature>
21-
<Feature Id="VS2013Registry64Feature" Title="Visual Studio 2013 Support (64bit OS)" Level="2">
22-
<ComponentRef Id="VS2013Registry64Component" />
23-
</Feature>
24-
<Feature Id="VS2013Registry32Feature" Title="Visual Studio 2013 Support (32bit OS)" Level="2">
25-
<ComponentRef Id="VS2013Registry32Component" />
26-
</Feature>
27-
<Feature Id="VS2012Registry64Feature" Title="Visual Studio 2012 Support (64bit OS)" Level="2">
28-
<ComponentRef Id="VS2012Registry64Component" />
29-
</Feature>
30-
<Feature Id="VS2012Registry32Feature" Title="Visual Studio 2012 Support (32bit OS)" Level="2">
31-
<ComponentRef Id="VS2012Registry32Component" />
32-
</Feature>
33-
<Feature Id="VS2010Registry64Feature" Title="Visual Studio 2010 Support (64bit OS)" Level="2">
34-
<ComponentRef Id="VS2010Registry64Component" />
35-
</Feature>
36-
<Feature Id="VS2010Registry32Feature" Title="Visual Studio 2010 Support (32bit OS)" Level="2">
37-
<ComponentRef Id="VS2010Registry32Component" />
38-
</Feature>
39-
<Feature Id="VS2008Registry64Feature" Title="Visual Studio 2008 Support (64bit OS)" Level="2">
40-
<ComponentRef Id="VS2008Registry64Component" />
41-
</Feature>
42-
<Feature Id="VS2008Registry32Feature" Title="Visual Studio 2008 Support (32bit OS)" Level="2">
43-
<ComponentRef Id="VS2008Registry32Component" />
44-
</Feature>
45-
<Directory Id="TARGETDIR" Name="SourceDir">
46-
<Directory Id="ProgramFilesFolder">
47-
<Directory Id="APPLICATIONFOLDER" Name="InterBaseDDEX">
48-
<Component Id="InterBaseDDEXComponent" Guid="5FC7B74A-949A-448E-9E5A-1893C3CE9184">
49-
<File Id="InterBaseSql.VisualStudio.DataTools.dll"
50-
Name="InterBaseSql.VisualStudio.DataTools.dll"
51-
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataTools.dll" />
52-
<File Id="InterBaseSql.VisualStudio.DataToolsUI.dll"
53-
Name="InterBaseSql.VisualStudio.DataToolsUI.dll"
54-
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataToolsUI.dll" />
55-
</Component>
56-
<Component Id="OtherFilesComponent" Guid="348EA22F-390E-4BA6-9C93-3879581E9297">
3+
<Product Id="FD91E41B-6B32-47A3-B440-27A0158DD679"
4+
UpgradeCode="0FD0277A-371E-4C1F-A486-0A6DB552E4B1"
5+
Name="DDEX Provider for InterBase !(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
6+
Language="1033"
7+
Version="!(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
8+
Manufacturer="InterBaseSQL">
9+
<Package InstallerVersion="200" Compressed="yes" Description="DDEX Provider for InterBase" />
10+
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" CompressionLevel="high" />
11+
<Feature Id="InterBaseDDEXFeature" Title="DDEX Provider for InterBase" Level="1" Absent="disallow">
12+
<ComponentRef Id="InterBaseDDEXComponent" />
13+
<ComponentRef Id="OtherFilesComponent" />
14+
</Feature>
15+
<Feature Id="VS2015Registry64Feature" Title="Visual Studio 2015 Support (64bit OS)" Level="1">
16+
<ComponentRef Id="VS2015Registry64Component" />
17+
</Feature>
18+
<Feature Id="VS2015Registry32Feature" Title="Visual Studio 2015 Support (32bit OS)" Level="2">
19+
<ComponentRef Id="VS2015Registry32Component" />
20+
</Feature>
21+
<Feature Id="VS2013Registry64Feature" Title="Visual Studio 2013 Support (64bit OS)" Level="2">
22+
<ComponentRef Id="VS2013Registry64Component" />
23+
</Feature>
24+
<Feature Id="VS2013Registry32Feature" Title="Visual Studio 2013 Support (32bit OS)" Level="2">
25+
<ComponentRef Id="VS2013Registry32Component" />
26+
</Feature>
27+
<Feature Id="VS2012Registry64Feature" Title="Visual Studio 2012 Support (64bit OS)" Level="2">
28+
<ComponentRef Id="VS2012Registry64Component" />
29+
</Feature>
30+
<Feature Id="VS2012Registry32Feature" Title="Visual Studio 2012 Support (32bit OS)" Level="2">
31+
<ComponentRef Id="VS2012Registry32Component" />
32+
</Feature>
33+
<Feature Id="VS2010Registry64Feature" Title="Visual Studio 2010 Support (64bit OS)" Level="2">
34+
<ComponentRef Id="VS2010Registry64Component" />
35+
</Feature>
36+
<Feature Id="VS2010Registry32Feature" Title="Visual Studio 2010 Support (32bit OS)" Level="2">
37+
<ComponentRef Id="VS2010Registry32Component" />
38+
</Feature>
39+
<Feature Id="VS2008Registry64Feature" Title="Visual Studio 2008 Support (64bit OS)" Level="2">
40+
<ComponentRef Id="VS2008Registry64Component" />
41+
</Feature>
42+
<Feature Id="VS2008Registry32Feature" Title="Visual Studio 2008 Support (32bit OS)" Level="2">
43+
<ComponentRef Id="VS2008Registry32Component" />
44+
</Feature>
45+
<Directory Id="TARGETDIR" Name="SourceDir">
46+
<Directory Id="ProgramFilesFolder">
47+
<Directory Id="APPLICATIONFOLDER" Name="InterBaseDDEX">
48+
<Component Id="InterBaseDDEXComponent" Guid="5FC7B74A-949A-448E-9E5A-1893C3CE9184">
49+
<File Id="InterBaseSql.VisualStudio.DataTools.dll"
50+
Name="InterBaseSql.VisualStudio.DataTools.dll"
51+
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataTools.dll" />
52+
<File Id="InterBaseSql.VisualStudio.DataToolsUI.dll"
53+
Name="InterBaseSql.VisualStudio.DataToolsUI.dll"
54+
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataToolsUI.dll" />
55+
</Component>
56+
<Component Id="OtherFilesComponent" Guid="348EA22F-390E-4BA6-9C93-3879581E9297">
5757
<File Id="readme.md"
5858
Name="readme.md"
5959
Source="$(var.BaseDir)\readme.md" />
60-
<File Id="license.txt"
61-
Name="license.txt"
62-
Source="$(var.BaseDir)\..\license.txt" />
63-
<File Id="InterBaseDDEXProviderVS2017.reg"
64-
Name="InterBaseDDEXProviderVS2017.reg"
65-
Source="$(var.BaseDir)\reg_files\VS2017\InterBaseDDEXProvider32.reg" />
66-
<File Id="InterBaseDDEXProviderVS2019.reg"
67-
Name="InterBaseDDEXProviderVS2019.reg"
68-
Source="$(var.BaseDir)\reg_files\VS2019\InterBaseDDEXProvider32.reg" />
60+
<File Id="license.txt"
61+
Name="license.txt"
62+
Source="$(var.BaseDir)\..\license.txt" />
63+
<File Id="InterBaseDDEXProviderVS2017.reg"
64+
Name="InterBaseDDEXProviderVS2017.reg"
65+
Source="$(var.BaseDir)\reg_files\VS2017\InterBaseDDEXProvider32.reg" />
66+
<File Id="InterBaseDDEXProviderVS2019.reg"
67+
Name="InterBaseDDEXProviderVS2019.reg"
68+
Source="$(var.BaseDir)\reg_files\VS2019\InterBaseDDEXProvider32.reg" />
6969
<File Id="InterBaseDDEXProviderVS2022.reg"
7070
Name="InterBaseDDEXProviderVS2022.reg"
7171
Source="$(var.BaseDir)\reg_files\VS2022\InterBaseDDEXProvider32.reg" />
72-
<File Id="ADO_Driver_documentation.docx"
73-
Name="ADO Driver documentation.docx"
74-
Source="$(var.BaseDir)\..\Provider\docs\ADO Driver documentation.docx" />
75-
</Component>
76-
</Directory>
77-
</Directory>
78-
<Component Id="VS2015Registry64Component" Guid="DA35A566-D451-4869-84EC-2991219728D1">
79-
<?include $(var.BaseDir)\installer\VS2015Registry64.wsx ?>
80-
</Component>
81-
<Component Id="VS2015Registry32Component" Guid="D4654238-3DF3-4783-9D0E-5D3B9B5C53CA">
82-
<?include $(var.BaseDir)\installer\VS2015Registry32.wsx ?>
83-
</Component>
84-
<Component Id="VS2013Registry64Component" Guid="60913AE0-759B-423E-862A-28570266BA16">
85-
<?include $(var.BaseDir)\installer\VS2013Registry64.wsx ?>
86-
</Component>
87-
<Component Id="VS2013Registry32Component" Guid="C5899ADD-E60A-4A7A-AAEE-36C05A04B1E5">
88-
<?include $(var.BaseDir)\installer\VS2013Registry32.wsx ?>
89-
</Component>
90-
<Component Id="VS2012Registry64Component" Guid="6A5ED58E-F4A5-4985-9281-B41F3C5CE1DB">
91-
<?include $(var.BaseDir)\installer\VS2012Registry64.wsx ?>
92-
</Component>
93-
<Component Id="VS2012Registry32Component" Guid="5796FC82-143F-432B-B8E4-648EE630479D">
94-
<?include $(var.BaseDir)\installer\VS2012Registry32.wsx ?>
95-
</Component>
96-
<Component Id="VS2010Registry64Component" Guid="609DD8AA-A626-4067-9559-1C1DCA899177">
97-
<?include $(var.BaseDir)\installer\VS2010Registry64.wsx ?>
98-
</Component>
99-
<Component Id="VS2010Registry32Component" Guid="46C5304F-B3D2-4E4A-88BF-EF3C36D05253">
100-
<?include $(var.BaseDir)\installer\VS2010Registry32.wsx ?>
101-
</Component>
102-
<Component Id="VS2008Registry64Component" Guid="23BBAB15-91E9-431E-91B3-6D10EFEBCA25">
103-
<?include $(var.BaseDir)\installer\VS2008Registry64.wsx ?>
104-
</Component>
105-
<Component Id="VS2008Registry32Component" Guid="C9B66F06-FA93-4B24-BBDE-10A6FADE974A">
106-
<?include $(var.BaseDir)\installer\VS2008Registry32.wsx ?>
107-
</Component>
108-
</Directory>
109-
<UIRef Id="WixUI_Advanced" />
110-
<Property Id="ApplicationFolderName" Value="InterBaseDDEX" />
111-
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
112-
<WixVariable Id="WixUISupportPerUser" Value="0" />
113-
<Property Id="ALLUSERS" Value="1" />
114-
<WixVariable Id="WixUILicenseRtf" Value="$(var.BaseDir)\..\license.rtf" />
115-
</Product>
116-
</Wix>
72+
<File Id="ADO_Driver_documentation.docx"
73+
Name="ADO Driver documentation.docx"
74+
Source="$(var.BaseDir)\..\Provider\docs\ADO Driver documentation.docx" />
75+
</Component>
76+
</Directory>
77+
</Directory>
78+
<Component Id="VS2015Registry64Component" Guid="DA35A566-D451-4869-84EC-2991219728D1">
79+
<?include $(var.BaseDir)\installer\VS2015Registry64.wsx ?>
80+
</Component>
81+
<Component Id="VS2015Registry32Component" Guid="D4654238-3DF3-4783-9D0E-5D3B9B5C53CA">
82+
<?include $(var.BaseDir)\installer\VS2015Registry32.wsx ?>
83+
</Component>
84+
<Component Id="VS2013Registry64Component" Guid="60913AE0-759B-423E-862A-28570266BA16">
85+
<?include $(var.BaseDir)\installer\VS2013Registry64.wsx ?>
86+
</Component>
87+
<Component Id="VS2013Registry32Component" Guid="C5899ADD-E60A-4A7A-AAEE-36C05A04B1E5">
88+
<?include $(var.BaseDir)\installer\VS2013Registry32.wsx ?>
89+
</Component>
90+
<Component Id="VS2012Registry64Component" Guid="6A5ED58E-F4A5-4985-9281-B41F3C5CE1DB">
91+
<?include $(var.BaseDir)\installer\VS2012Registry64.wsx ?>
92+
</Component>
93+
<Component Id="VS2012Registry32Component" Guid="5796FC82-143F-432B-B8E4-648EE630479D">
94+
<?include $(var.BaseDir)\installer\VS2012Registry32.wsx ?>
95+
</Component>
96+
<Component Id="VS2010Registry64Component" Guid="609DD8AA-A626-4067-9559-1C1DCA899177">
97+
<?include $(var.BaseDir)\installer\VS2010Registry64.wsx ?>
98+
</Component>
99+
<Component Id="VS2010Registry32Component" Guid="46C5304F-B3D2-4E4A-88BF-EF3C36D05253">
100+
<?include $(var.BaseDir)\installer\VS2010Registry32.wsx ?>
101+
</Component>
102+
<Component Id="VS2008Registry64Component" Guid="23BBAB15-91E9-431E-91B3-6D10EFEBCA25">
103+
<?include $(var.BaseDir)\installer\VS2008Registry64.wsx ?>
104+
</Component>
105+
<Component Id="VS2008Registry32Component" Guid="C9B66F06-FA93-4B24-BBDE-10A6FADE974A">
106+
<?include $(var.BaseDir)\installer\VS2008Registry32.wsx ?>
107+
</Component>
108+
</Directory>
109+
<UIRef Id="WixUI_Advanced" />
110+
<Property Id="ApplicationFolderName" Value="InterBaseDDEX" />
111+
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
112+
<WixVariable Id="WixUISupportPerUser" Value="0" />
113+
<Property Id="ALLUSERS" Value="1" />
114+
<WixVariable Id="WixUILicenseRtf" Value="$(var.BaseDir)\..\license.rtf" />
115+
</Product>
116+
</Wix>

‎NETProvider/Demos/EnityCoreExample2/Country.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace EFCore101
5+
{
6+
public partial class Country
7+
{
8+
public Country()
9+
{
10+
Customers = new HashSet<Customer>();
11+
Jobs = new HashSet<Job>();
12+
}
13+
14+
public string Country1 { get; set; } = null!;
15+
public string Currency { get; set; } = null!;
16+
17+
public virtual ICollection<Customer> Customers { get; set; }
18+
public virtual ICollection<Job> Jobs { get; set; }
19+
}
20+
}

‎NETProvider/Demos/EnityCoreExample2/Customer.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace EFCore101
5+
{
6+
public partial class Customer
7+
{
8+
public Customer()
9+
{
10+
Sales = new HashSet<Sale>();
11+
}
12+
13+
public int CustNo { get; set; }
14+
public string Customer1 { get; set; } = null!;
15+
public string? ContactFirst { get; set; }
16+
public string? ContactLast { get; set; }
17+
public string? PhoneNo { get; set; }
18+
public string? AddressLine1 { get; set; }
19+
public string? AddressLine2 { get; set; }
20+
public string? City { get; set; }
21+
public string? StateProvince { get; set; }
22+
public string? Country { get; set; }
23+
public string? PostalCode { get; set; }
24+
public string? OnHold { get; set; }
25+
26+
public virtual Country? CountryNavigation { get; set; }
27+
public virtual ICollection<Sale> Sales { get; set; }
28+
}
29+
}

‎NETProvider/Demos/EnityCoreExample2/Department.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace EFCore101
5+
{
6+
public partial class Department
7+
{
8+
public Department()
9+
{
10+
Employees = new HashSet<Employee>();
11+
InverseHeadDeptNavigation = new HashSet<Department>();
12+
ProjDeptBudgets = new HashSet<ProjDeptBudget>();
13+
}
14+
15+
public string DeptNo { get; set; } = null!;
16+
public string Department1 { get; set; } = null!;
17+
public string? HeadDept { get; set; }
18+
public short? MngrNo { get; set; }
19+
public decimal? Budget { get; set; }
20+
public string? Location { get; set; }
21+
public string? PhoneNo { get; set; }
22+
23+
public virtual Department? HeadDeptNavigation { get; set; }
24+
public virtual Employee? MngrNoNavigation { get; set; }
25+
public virtual ICollection<Employee> Employees { get; set; }
26+
public virtual ICollection<Department> InverseHeadDeptNavigation { get; set; }
27+
public virtual ICollection<ProjDeptBudget> ProjDeptBudgets { get; set; }
28+
}
29+
}

‎NETProvider/Demos/EnityCoreExample2/EFCore101.csproj

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net6.0-windows</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<UseWindowsForms>true</UseWindowsForms>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<Compile Remove="EFCore101_old\**" />
13+
<EmbeddedResource Remove="EFCore101_old\**" />
14+
<None Remove="EFCore101_old\**" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<Compile Remove="MainForm.cs" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<EmbeddedResource Remove="MainForm.resx" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="InterBaseSql.Data.InterBaseClient" Version="7.13.6" />
27+
<PackageReference Include="InterBaseSql.EntityFrameworkCore.InterBase" Version="7.13.6" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.11">
29+
<PrivateAssets>all</PrivateAssets>
30+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
31+
</PackageReference>
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
33+
<PrivateAssets>all</PrivateAssets>
34+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35+
</PackageReference>
36+
</ItemGroup>
37+
38+
</Project>

‎NETProvider/Demos/EnityCoreExample2/EFCore101.sln

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.33414.496
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore101", "EFCore101.csproj", "{1149F87D-10A0-49F5-9F4E-073F1B151DCC}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {FF34E2E2-EB0F-4952-A33E-4A1F84E03486}
24+
EndGlobalSection
25+
EndGlobal

0 commit comments

Comments
 (0)