Skip to content

Commit

Permalink
7.13.6 release
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@jeffovercash
jeffovercash committed Mar 25, 2023
1 parent 9251070 commit 3f8f4b8
Show file tree
Hide file tree
Showing 271 changed files with 12,216 additions and 9,247 deletions.
216 changes: 108 additions & 108 deletions NETProvider/DDEX/installer/Install.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,116 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="FD91E41B-6B32-47A3-B440-27A0158DD679"
UpgradeCode="0FD0277A-371E-4C1F-A486-0A6DB552E4B1"
Name="DDEX Provider for InterBase !(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
Language="1033"
Version="!(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
Manufacturer="InterBaseSQL">
<Package InstallerVersion="200" Compressed="yes" Description="DDEX Provider for InterBase" />
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" CompressionLevel="high" />
<Feature Id="InterBaseDDEXFeature" Title="DDEX Provider for InterBase" Level="1" Absent="disallow">
<ComponentRef Id="InterBaseDDEXComponent" />
<ComponentRef Id="OtherFilesComponent" />
</Feature>
<Feature Id="VS2015Registry64Feature" Title="Visual Studio 2015 Support (64bit OS)" Level="1">
<ComponentRef Id="VS2015Registry64Component" />
</Feature>
<Feature Id="VS2015Registry32Feature" Title="Visual Studio 2015 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2015Registry32Component" />
</Feature>
<Feature Id="VS2013Registry64Feature" Title="Visual Studio 2013 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2013Registry64Component" />
</Feature>
<Feature Id="VS2013Registry32Feature" Title="Visual Studio 2013 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2013Registry32Component" />
</Feature>
<Feature Id="VS2012Registry64Feature" Title="Visual Studio 2012 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2012Registry64Component" />
</Feature>
<Feature Id="VS2012Registry32Feature" Title="Visual Studio 2012 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2012Registry32Component" />
</Feature>
<Feature Id="VS2010Registry64Feature" Title="Visual Studio 2010 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2010Registry64Component" />
</Feature>
<Feature Id="VS2010Registry32Feature" Title="Visual Studio 2010 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2010Registry32Component" />
</Feature>
<Feature Id="VS2008Registry64Feature" Title="Visual Studio 2008 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2008Registry64Component" />
</Feature>
<Feature Id="VS2008Registry32Feature" Title="Visual Studio 2008 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2008Registry32Component" />
</Feature>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="APPLICATIONFOLDER" Name="InterBaseDDEX">
<Component Id="InterBaseDDEXComponent" Guid="5FC7B74A-949A-448E-9E5A-1893C3CE9184">
<File Id="InterBaseSql.VisualStudio.DataTools.dll"
Name="InterBaseSql.VisualStudio.DataTools.dll"
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataTools.dll" />
<File Id="InterBaseSql.VisualStudio.DataToolsUI.dll"
Name="InterBaseSql.VisualStudio.DataToolsUI.dll"
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataToolsUI.dll" />
</Component>
<Component Id="OtherFilesComponent" Guid="348EA22F-390E-4BA6-9C93-3879581E9297">
<Product Id="FD91E41B-6B32-47A3-B440-27A0158DD679"
UpgradeCode="0FD0277A-371E-4C1F-A486-0A6DB552E4B1"
Name="DDEX Provider for InterBase !(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
Language="1033"
Version="!(bind.fileVersion.InterBaseSql.VisualStudio.DataTools.dll)"
Manufacturer="InterBaseSQL">
<Package InstallerVersion="200" Compressed="yes" Description="DDEX Provider for InterBase" />
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" CompressionLevel="high" />
<Feature Id="InterBaseDDEXFeature" Title="DDEX Provider for InterBase" Level="1" Absent="disallow">
<ComponentRef Id="InterBaseDDEXComponent" />
<ComponentRef Id="OtherFilesComponent" />
</Feature>
<Feature Id="VS2015Registry64Feature" Title="Visual Studio 2015 Support (64bit OS)" Level="1">
<ComponentRef Id="VS2015Registry64Component" />
</Feature>
<Feature Id="VS2015Registry32Feature" Title="Visual Studio 2015 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2015Registry32Component" />
</Feature>
<Feature Id="VS2013Registry64Feature" Title="Visual Studio 2013 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2013Registry64Component" />
</Feature>
<Feature Id="VS2013Registry32Feature" Title="Visual Studio 2013 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2013Registry32Component" />
</Feature>
<Feature Id="VS2012Registry64Feature" Title="Visual Studio 2012 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2012Registry64Component" />
</Feature>
<Feature Id="VS2012Registry32Feature" Title="Visual Studio 2012 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2012Registry32Component" />
</Feature>
<Feature Id="VS2010Registry64Feature" Title="Visual Studio 2010 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2010Registry64Component" />
</Feature>
<Feature Id="VS2010Registry32Feature" Title="Visual Studio 2010 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2010Registry32Component" />
</Feature>
<Feature Id="VS2008Registry64Feature" Title="Visual Studio 2008 Support (64bit OS)" Level="2">
<ComponentRef Id="VS2008Registry64Component" />
</Feature>
<Feature Id="VS2008Registry32Feature" Title="Visual Studio 2008 Support (32bit OS)" Level="2">
<ComponentRef Id="VS2008Registry32Component" />
</Feature>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="APPLICATIONFOLDER" Name="InterBaseDDEX">
<Component Id="InterBaseDDEXComponent" Guid="5FC7B74A-949A-448E-9E5A-1893C3CE9184">
<File Id="InterBaseSql.VisualStudio.DataTools.dll"
Name="InterBaseSql.VisualStudio.DataTools.dll"
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataTools.dll" />
<File Id="InterBaseSql.VisualStudio.DataToolsUI.dll"
Name="InterBaseSql.VisualStudio.DataToolsUI.dll"
Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataToolsUI.dll" />
</Component>
<Component Id="OtherFilesComponent" Guid="348EA22F-390E-4BA6-9C93-3879581E9297">
<File Id="readme.md"
Name="readme.md"
Source="$(var.BaseDir)\readme.md" />
<File Id="license.txt"
Name="license.txt"
Source="$(var.BaseDir)\..\license.txt" />
<File Id="InterBaseDDEXProviderVS2017.reg"
Name="InterBaseDDEXProviderVS2017.reg"
Source="$(var.BaseDir)\reg_files\VS2017\InterBaseDDEXProvider32.reg" />
<File Id="InterBaseDDEXProviderVS2019.reg"
Name="InterBaseDDEXProviderVS2019.reg"
Source="$(var.BaseDir)\reg_files\VS2019\InterBaseDDEXProvider32.reg" />
<File Id="license.txt"
Name="license.txt"
Source="$(var.BaseDir)\..\license.txt" />
<File Id="InterBaseDDEXProviderVS2017.reg"
Name="InterBaseDDEXProviderVS2017.reg"
Source="$(var.BaseDir)\reg_files\VS2017\InterBaseDDEXProvider32.reg" />
<File Id="InterBaseDDEXProviderVS2019.reg"
Name="InterBaseDDEXProviderVS2019.reg"
Source="$(var.BaseDir)\reg_files\VS2019\InterBaseDDEXProvider32.reg" />
<File Id="InterBaseDDEXProviderVS2022.reg"
Name="InterBaseDDEXProviderVS2022.reg"
Source="$(var.BaseDir)\reg_files\VS2022\InterBaseDDEXProvider32.reg" />
<File Id="ADO_Driver_documentation.docx"
Name="ADO Driver documentation.docx"
Source="$(var.BaseDir)\..\Provider\docs\ADO Driver documentation.docx" />
</Component>
</Directory>
</Directory>
<Component Id="VS2015Registry64Component" Guid="DA35A566-D451-4869-84EC-2991219728D1">
<?include $(var.BaseDir)\installer\VS2015Registry64.wsx ?>
</Component>
<Component Id="VS2015Registry32Component" Guid="D4654238-3DF3-4783-9D0E-5D3B9B5C53CA">
<?include $(var.BaseDir)\installer\VS2015Registry32.wsx ?>
</Component>
<Component Id="VS2013Registry64Component" Guid="60913AE0-759B-423E-862A-28570266BA16">
<?include $(var.BaseDir)\installer\VS2013Registry64.wsx ?>
</Component>
<Component Id="VS2013Registry32Component" Guid="C5899ADD-E60A-4A7A-AAEE-36C05A04B1E5">
<?include $(var.BaseDir)\installer\VS2013Registry32.wsx ?>
</Component>
<Component Id="VS2012Registry64Component" Guid="6A5ED58E-F4A5-4985-9281-B41F3C5CE1DB">
<?include $(var.BaseDir)\installer\VS2012Registry64.wsx ?>
</Component>
<Component Id="VS2012Registry32Component" Guid="5796FC82-143F-432B-B8E4-648EE630479D">
<?include $(var.BaseDir)\installer\VS2012Registry32.wsx ?>
</Component>
<Component Id="VS2010Registry64Component" Guid="609DD8AA-A626-4067-9559-1C1DCA899177">
<?include $(var.BaseDir)\installer\VS2010Registry64.wsx ?>
</Component>
<Component Id="VS2010Registry32Component" Guid="46C5304F-B3D2-4E4A-88BF-EF3C36D05253">
<?include $(var.BaseDir)\installer\VS2010Registry32.wsx ?>
</Component>
<Component Id="VS2008Registry64Component" Guid="23BBAB15-91E9-431E-91B3-6D10EFEBCA25">
<?include $(var.BaseDir)\installer\VS2008Registry64.wsx ?>
</Component>
<Component Id="VS2008Registry32Component" Guid="C9B66F06-FA93-4B24-BBDE-10A6FADE974A">
<?include $(var.BaseDir)\installer\VS2008Registry32.wsx ?>
</Component>
</Directory>
<UIRef Id="WixUI_Advanced" />
<Property Id="ApplicationFolderName" Value="InterBaseDDEX" />
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
<WixVariable Id="WixUISupportPerUser" Value="0" />
<Property Id="ALLUSERS" Value="1" />
<WixVariable Id="WixUILicenseRtf" Value="$(var.BaseDir)\..\license.rtf" />
</Product>
</Wix>
<File Id="ADO_Driver_documentation.docx"
Name="ADO Driver documentation.docx"
Source="$(var.BaseDir)\..\Provider\docs\ADO Driver documentation.docx" />
</Component>
</Directory>
</Directory>
<Component Id="VS2015Registry64Component" Guid="DA35A566-D451-4869-84EC-2991219728D1">
<?include $(var.BaseDir)\installer\VS2015Registry64.wsx ?>
</Component>
<Component Id="VS2015Registry32Component" Guid="D4654238-3DF3-4783-9D0E-5D3B9B5C53CA">
<?include $(var.BaseDir)\installer\VS2015Registry32.wsx ?>
</Component>
<Component Id="VS2013Registry64Component" Guid="60913AE0-759B-423E-862A-28570266BA16">
<?include $(var.BaseDir)\installer\VS2013Registry64.wsx ?>
</Component>
<Component Id="VS2013Registry32Component" Guid="C5899ADD-E60A-4A7A-AAEE-36C05A04B1E5">
<?include $(var.BaseDir)\installer\VS2013Registry32.wsx ?>
</Component>
<Component Id="VS2012Registry64Component" Guid="6A5ED58E-F4A5-4985-9281-B41F3C5CE1DB">
<?include $(var.BaseDir)\installer\VS2012Registry64.wsx ?>
</Component>
<Component Id="VS2012Registry32Component" Guid="5796FC82-143F-432B-B8E4-648EE630479D">
<?include $(var.BaseDir)\installer\VS2012Registry32.wsx ?>
</Component>
<Component Id="VS2010Registry64Component" Guid="609DD8AA-A626-4067-9559-1C1DCA899177">
<?include $(var.BaseDir)\installer\VS2010Registry64.wsx ?>
</Component>
<Component Id="VS2010Registry32Component" Guid="46C5304F-B3D2-4E4A-88BF-EF3C36D05253">
<?include $(var.BaseDir)\installer\VS2010Registry32.wsx ?>
</Component>
<Component Id="VS2008Registry64Component" Guid="23BBAB15-91E9-431E-91B3-6D10EFEBCA25">
<?include $(var.BaseDir)\installer\VS2008Registry64.wsx ?>
</Component>
<Component Id="VS2008Registry32Component" Guid="C9B66F06-FA93-4B24-BBDE-10A6FADE974A">
<?include $(var.BaseDir)\installer\VS2008Registry32.wsx ?>
</Component>
</Directory>
<UIRef Id="WixUI_Advanced" />
<Property Id="ApplicationFolderName" Value="InterBaseDDEX" />
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
<WixVariable Id="WixUISupportPerUser" Value="0" />
<Property Id="ALLUSERS" Value="1" />
<WixVariable Id="WixUILicenseRtf" Value="$(var.BaseDir)\..\license.rtf" />
</Product>
</Wix>
20 changes: 20 additions & 0 deletions NETProvider/Demos/EnityCoreExample2/Country.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;

namespace EFCore101
{
public partial class Country
{
public Country()
{
Customers = new HashSet<Customer>();
Jobs = new HashSet<Job>();
}

public string Country1 { get; set; } = null!;
public string Currency { get; set; } = null!;

public virtual ICollection<Customer> Customers { get; set; }
public virtual ICollection<Job> Jobs { get; set; }
}
}
29 changes: 29 additions & 0 deletions NETProvider/Demos/EnityCoreExample2/Customer.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;

namespace EFCore101
{
public partial class Customer
{
public Customer()
{
Sales = new HashSet<Sale>();
}

public int CustNo { get; set; }
public string Customer1 { get; set; } = null!;
public string? ContactFirst { get; set; }
public string? ContactLast { get; set; }
public string? PhoneNo { get; set; }
public string? AddressLine1 { get; set; }
public string? AddressLine2 { get; set; }
public string? City { get; set; }
public string? StateProvince { get; set; }
public string? Country { get; set; }
public string? PostalCode { get; set; }
public string? OnHold { get; set; }

public virtual Country? CountryNavigation { get; set; }
public virtual ICollection<Sale> Sales { get; set; }
}
}
29 changes: 29 additions & 0 deletions NETProvider/Demos/EnityCoreExample2/Department.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;

namespace EFCore101
{
public partial class Department
{
public Department()
{
Employees = new HashSet<Employee>();
InverseHeadDeptNavigation = new HashSet<Department>();
ProjDeptBudgets = new HashSet<ProjDeptBudget>();
}

public string DeptNo { get; set; } = null!;
public string Department1 { get; set; } = null!;
public string? HeadDept { get; set; }
public short? MngrNo { get; set; }
public decimal? Budget { get; set; }
public string? Location { get; set; }
public string? PhoneNo { get; set; }

public virtual Department? HeadDeptNavigation { get; set; }
public virtual Employee? MngrNoNavigation { get; set; }
public virtual ICollection<Employee> Employees { get; set; }
public virtual ICollection<Department> InverseHeadDeptNavigation { get; set; }
public virtual ICollection<ProjDeptBudget> ProjDeptBudgets { get; set; }
}
}
38 changes: 38 additions & 0 deletions NETProvider/Demos/EnityCoreExample2/EFCore101.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<Compile Remove="EFCore101_old\**" />
<EmbeddedResource Remove="EFCore101_old\**" />
<None Remove="EFCore101_old\**" />
</ItemGroup>

<ItemGroup>
<Compile Remove="MainForm.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Remove="MainForm.resx" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="InterBaseSql.Data.InterBaseClient" Version="7.13.6" />
<PackageReference Include="InterBaseSql.EntityFrameworkCore.InterBase" Version="7.13.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
25 changes: 25 additions & 0 deletions NETProvider/Demos/EnityCoreExample2/EFCore101.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33414.496
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore101", "EFCore101.csproj", "{1149F87D-10A0-49F5-9F4E-073F1B151DCC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1149F87D-10A0-49F5-9F4E-073F1B151DCC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF34E2E2-EB0F-4952-A33E-4A1F84E03486}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 3f8f4b8

Please sign in to comment.