7.12.1 Release

Embarcadero · Aug 14, 2022 · 9251070 · 9251070
1 parent b56d925
commit 9251070
Show file tree

Hide file tree

Showing 68 changed files with 1,584 additions and 317 deletions.
diff --git a/NETProvider/DDEX/installer/Install.wxs b/NETProvider/DDEX/installer/Install.wxs
@@ -7,9 +7,7 @@
 					 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" />
@@ -44,8 +42,7 @@
 		<Feature Id="VS2008Registry32Feature" Title="Visual Studio 2008 Support (32bit OS)" Level="2">
 			<ComponentRef Id="VS2008Registry32Component" />
 		</Feature>
-
-		<Directory Id="TARGETDIR" Name="SourceDir">
+ 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="ProgramFilesFolder">
 				<Directory Id="APPLICATIONFOLDER" Name="InterBaseDDEX">
 					<Component Id="InterBaseDDEXComponent" Guid="5FC7B74A-949A-448E-9E5A-1893C3CE9184">
@@ -57,9 +54,9 @@
 									Source="$(var.BaseDir)\installer\in\InterBaseSql.VisualStudio.DataToolsUI.dll" />
 					</Component>
 					<Component Id="OtherFilesComponent" Guid="348EA22F-390E-4BA6-9C93-3879581E9297">
-						<File Id="readme.txt"
-									Name="readme.txt"
-									Source="$(var.BaseDir)\readme.txt" />
+                        <File Id="readme.md" 
+                                               Name="readme.md" 
+                                               Source="$(var.BaseDir)\readme.md" />
 						<File Id="license.txt"
 									Name="license.txt"
 									Source="$(var.BaseDir)\..\license.txt" />
@@ -69,13 +66,15 @@
 						<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>
@@ -107,12 +106,11 @@
 				<?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' />
+                <Property Id="ALLUSERS" Value="1" />
 		<WixVariable Id="WixUILicenseRtf" Value="$(var.BaseDir)\..\license.rtf" />
 	</Product>
 </Wix>
diff --git a/NETProvider/DDEX/readme.md b/NETProvider/DDEX/readme.md
@@ -36,7 +36,7 @@ Modify it like this (for 64bit systems you have to edit "32bit version" of this
 
 
 And substitute (this information you can find using gacutil): 
-  - %Version% with the version of the provider assembly that you have in the GAC (currently 7.11.0.0).
+  - %Version% with the version of the provider assembly that you have in the GAC (currently 7.12.1.0).
 
 Note:
   Notice, that in configSections there isn't signature of InterBaseClient but the signature of assembly from framework.

diff --git a/NETProvider/DDEX/reg_files/VS2022/InterBaseDDEXProvider32.reg b/NETProvider/DDEX/reg_files/VS2022/InterBaseDDEXProvider32.reg
@@ -0,0 +1,39 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataSources\{108473C1-273A-41BF-AE1E-CA515C423B9F}]
+@="InterBase Data Source"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataSources\{108473C1-273A-41BF-AE1E-CA515C423B9F}\SupportingProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}]
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}]
+@=".NET Framework Data Provider for InterBase"
+"DisplayName"="Provider_DisplayName, InterBaseSql.VisualStudio.DataTools.Properties.Resources"
+"ShortDisplayName"="Provider_ShortDisplayName, InterBaseSql.VisualStudio.DataTools.Properties.Resources"
+"Description"="Provider_Description, InterBaseSql.VisualStudio.DataTools.Properties.Resources"
+"CodeBase"="%PATH%\\InterBaseSql.VisualStudio.DataTools.dll"
+"InvariantName"="InterBaseSql.Data.InterBaseClient"
+"Technology"="{77AB9A9D-78B9-4ba7-91AC-873F5338F1D2}"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects]
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataConnectionSupport]
+@="InterBaseSql.VisualStudio.DataTools.IBDataConnectionSupport"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataConnectionProperties]
+@="InterBaseSql.VisualStudio.DataTools.IBDataConnectionProperties"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataConnectionUIControl]
+@="InterBaseSql.VisualStudio.DataTools.IBDataConnectionUIControl"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataSourceInformation]
+@="InterBaseSql.VisualStudio.DataTools.IBDataSourceInformation"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataObjectSupport]
+@="InterBaseSql.VisualStudio.DataTools.IBDataObjectSupport"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataViewSupport]
+@="InterBaseSql.VisualStudio.DataTools.IBDataViewSupport"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\Services\{EADC6C1E-17D2-42FF-9816-19850428BCF1}]
+@="{0095710D-F7DC-4FA1-8FEB-C8153AA5DF75}"
+"Name"="InterBase Provider Object Factory"
diff --git a/NETProvider/DDEX/reg_files/VS2022/InterBaseDDEXProvider64.reg b/NETProvider/DDEX/reg_files/VS2022/InterBaseDDEXProvider64.reg
@@ -0,0 +1,39 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataSources\{108473C1-273A-41BF-AE1E-CA515C423B9F}]
+@="InterBase Data Source"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataSources\{108473C1-273A-41BF-AE1E-CA515C423B9F}\SupportingProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}]
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}]
+@=".NET Framework Data Provider for InterBase"
+"DisplayName"="Provider_DisplayName, InterBaseSql.VisualStudio.DataTools.Properties.Resources"
+"ShortDisplayName"="Provider_ShortDisplayName, InterBaseSql.VisualStudio.DataTools.Properties.Resources"
+"Description"="Provider_Description, InterBaseSql.VisualStudio.DataTools.Properties.Resources"
+"CodeBase"="C:\\Users\\jeffo\\source\\repos\\NETProvider\\trunk\\NETProvider\\DDEX\\src\\InterBaseSql\\VisualStudio\\DataTools\\bin\\InterBaseSql.VisualStudio.DataTools.dll"
+"InvariantName"="InterBaseSql.Data.InterBaseClient"
+"Technology"="{77AB9A9D-78B9-4ba7-91AC-873F5338F1D2}"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects]
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataConnectionSupport]
+@="InterBaseSql.VisualStudio.DataTools.IBDataConnectionSupport"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataConnectionProperties]
+@="InterBaseSql.VisualStudio.DataTools.IBDataConnectionProperties"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataConnectionUIControl]
+@="InterBaseSql.VisualStudio.DataTools.IBDataConnectionUIControl"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataSourceInformation]
+@="InterBaseSql.VisualStudio.DataTools.IBDataSourceInformation"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataObjectSupport]
+@="InterBaseSql.VisualStudio.DataTools.IBDataObjectSupport"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\DataProviders\{ACE0EC8B-0EC7-4C0C-B99A-39E6AE7B5419}\SupportedObjects\DataViewSupport]
+@="InterBaseSql.VisualStudio.DataTools.IBDataViewSupport"
+
+[HKEY_USERS\17.0_390494b1\Software\Microsoft\VisualStudio\17.0_390494b1_Config\Services\{EADC6C1E-17D2-42FF-9816-19850428BCF1}]
+@="{0095710D-F7DC-4FA1-8FEB-C8153AA5DF75}"
+"Name"="InterBase Provider Object Factory"
diff --git a/NETProvider/Demos/ChangeViews Demo/MainForm.cs b/NETProvider/Demos/ChangeViews Demo/MainForm.cs
@@ -1,4 +1,24 @@
-using System;
+/*
+ *    The contents of this file are subject to the Initial
+ *    Developer's Public License Version 1.0 (the "License");
+ *    you may not use this file except in compliance with the
+ *    License. You may obtain a copy of the License at
+ *    https://github.com/Embarcadero/IB.NETDataProvider/blob/main/LICENSE.
+ *
+ *    Software distributed under the License is distributed on
+ *    an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ *    express or implied. See the License for the specific
+ *    language governing rights and limitations under the License.
+ *
+ *    The Initial Developer(s) of the Original Code are listed below.
+ *    Portions created by Embarcadero are Copyright (C) Embarcadero.
+ *
+ *    All Rights Reserved.
+ */
+
+//$Authors = Embarcadero, Jeff Overcash
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;

diff --git a/NETProvider/Demos/ConnectionBuilder/ConnectionBuilder/Form1.cs b/NETProvider/Demos/ConnectionBuilder/ConnectionBuilder/Form1.cs
@@ -3,7 +3,7 @@
  *    Developer's Public License Version 1.0 (the "License");
  *    you may not use this file except in compliance with the
  *    License. You may obtain a copy of the License at
- *    https://github.com/FirebirdSQL/NETProvider/blob/master/license.txt.
+ *    https://github.com/Embarcadero/IB.NETDataProvider/blob/main/LICENSE.
  *
  *    Software distributed under the License is distributed on
  *    an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either

diff --git a/NETProvider/Demos/EventDemo/Event Demo Readme.docx b/NETProvider/Demos/EventDemo/Event Demo Readme.docx
diff --git a/NETProvider/Demos/EventDemo/EventDemo.csproj b/NETProvider/Demos/EventDemo/EventDemo.csproj
@@ -0,0 +1,21 @@
+<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>
+    <None Remove="EVENTDEMO.IB" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="InterBaseSql.Data.InterBaseClient">
+      <HintPath>..\..\..\..\..\..\..\source\repos\NETProvider\trunk\NETProvider\Provider\src\InterBaseSql.Data.InterBaseClient\obj\Debug\net6.0\refint\InterBaseSql.Data.InterBaseClient.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
diff --git a/NETProvider/Demos/EventDemo/EventDemo.sln b/NETProvider/Demos/EventDemo/EventDemo.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32602.215
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventDemo", "EventDemo.csproj", "{A14E6165-FC60-428E-946C-24EDEF068CC3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A14E6165-FC60-428E-946C-24EDEF068CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A14E6165-FC60-428E-946C-24EDEF068CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A14E6165-FC60-428E-946C-24EDEF068CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A14E6165-FC60-428E-946C-24EDEF068CC3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0C6D486C-7701-44C2-B875-33D83F78A5A0}
+	EndGlobalSection
+EndGlobal