Replaced deprecated odp.net.managed package with Oracle.ManagedDataAc…

…cess #382.
igor-tkachev · Dec 19, 2016 · 718e3d1 · 718e3d1
1 parent a875bd3
commit 718e3d1
Show file tree

Hide file tree

Showing 15 changed files with 930 additions and 21 deletions.
diff --git a/DataProviders/Oracle/BLToolkit.Data.DataProvider.OracleManaged.4.csproj b/DataProviders/Oracle/BLToolkit.Data.DataProvider.OracleManaged.4.csproj
@@ -84,9 +84,9 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\odp.net.managed.121.1.0\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Oracle.ManagedDataAccess.12.1.24160719\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -127,6 +127,10 @@
       <Name>BLToolkit.4</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <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.

diff --git a/DataProviders/Oracle/packages.config b/DataProviders/Oracle/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="odp.net.managed" version="121.1.2" targetFramework="net40" />
   <package id="odp.net.x86" version="112.3.20" targetFramework="net40" />
+  <package id="Oracle.ManagedDataAccess" version="12.1.24160719" targetFramework="net40" />
 </packages>
diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/Oracle.ManagedDataAccess.12.1.24160719.nupkg b/packages/Oracle.ManagedDataAccess.12.1.24160719/Oracle.ManagedDataAccess.12.1.24160719.nupkg
diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/App.config.install.xdt b/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/App.config.install.xdt
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+
+  <configSections xdt:Transform="InsertIfMissing">
+  </configSections> 
+
+  <configSections xdt:Transform="InsertBefore(/configuration/*[1])">
+  </configSections>   
+
+  <!-- remove existing entry -->
+  <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
+      <section name="oracle.manageddataaccess.client" xdt:Transform="Remove" xdt:Locator="Match(name)" />
+  </configSections>
+
+  <!-- insert new entry -->
+  <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
+      <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />
+  </configSections>
+
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
+  <!-- If system.data tag is absent -->
+  <system.data xdt:Transform="InsertIfMissing">
+    <DbProviderFactories>
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- If system.data tag is present, but DbProviderFactories tag is absent -->
+  <system.data>
+    <DbProviderFactories xdt:Transform="InsertIfMissing">
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- remove existing ODPM entry -->  
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Remove" xdt:Locator="Match(invariant)" />
+      <add name="ODP.NET, Managed Driver" xdt:Transform="Remove" xdt:Locator="Match(name)" />      
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- add new ODPM entry -->
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Insert"/>
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />      
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- If runtime tag is absent -->
+  <runtime xdt:Transform="InsertIfMissing">
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+    </assemblyBinding>
+  </runtime>
+
+  <!-- If runtime tag is present, but assembly binding tag is absent -->
+  <runtime>
+    <assemblyBinding xdt:Transform="InsertIfMissing" xmlns="urn:schemas-microsoft-com:asm.v1">
+    </assemblyBinding>
+  </runtime>
+
+  <!-- remove existing entry -->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly xdt:Transform="Remove"
+          xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Oracle.ManagedDataAccess')" >
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+  <!-- insert new entry -->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly xdt:Transform="Insert">
+        <publisherPolicy apply="no"/>
+        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
+        <bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.121.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+  <!-- If oracle.manageddataaccess.client tag is absent -->
+  <oracle.manageddataaccess.client xdt:Transform="InsertIfMissing">
+    <version number="*">
+      <dataSources>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- If version tag is absent -->
+  <oracle.manageddataaccess.client>
+    <version number="*" xdt:Transform="InsertIfMissing">
+      <dataSources>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- If dataSources tag is absent -->
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources xdt:Transform="InsertIfMissing">         
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- add entry if missing -->
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources>
+         <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " xdt:Transform="InsertIfMissing" xdt:Locator="Match(alias)"/>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+</configuration>
diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/App.config.transform b/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/App.config.transform
@@ -0,0 +1,4 @@
+<configuration>
+    <configSections>
+    </configSections>
+</configuration>
diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/App.config.uninstall.xdt b/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/App.config.uninstall.xdt
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+
+  <!-- remove existing entry -->
+  <configSections>
+      <section name="oracle.manageddataaccess.client" xdt:Transform="Remove" xdt:Locator="Match(name)" />
+  </configSections>
+
+  <!-- remove if section is empty -->
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
+  <!-- remove existing entry -->
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Remove" xdt:Locator="Match(invariant)" />
+      <add name="ODP.NET, Managed Driver" xdt:Transform="Remove" xdt:Locator="Match(name)" />      
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- remove if section is empty -->
+  <system.data>
+    <DbProviderFactories xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+  </system.data>
+  <system.data xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
+  <!-- remove existing entry -->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly xdt:Transform="Remove"
+          xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Oracle.ManagedDataAccess')" >
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+  <!-- remove if section is empty -->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+  </runtime>
+  <runtime xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
+  <!-- remove existing entry -->
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources>
+        <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " xdt:Transform="Remove" xdt:Locator="Match(alias)"/>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- remove if section is empty -->
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- remove existing entry -->
+  <oracle.manageddataaccess.client>
+    <version number="*" xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+  </oracle.manageddataaccess.client>
+
+  <oracle.manageddataaccess.client xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
+</configuration>
diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/Web.config.install.xdt b/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/Web.config.install.xdt
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+
+  <configSections xdt:Transform="InsertIfMissing">
+  </configSections> 
+
+  <configSections xdt:Transform="InsertBefore(/configuration/*[1])">
+  </configSections>   
+
+  <!-- remove existing entry -->
+  <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
+      <section name="oracle.manageddataaccess.client" xdt:Transform="Remove" xdt:Locator="Match(name)" />
+  </configSections>
+
+  <!-- insert new entry -->
+  <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
+      <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />
+  </configSections>
+
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
+  <!-- If system.data tag is absent -->
+  <system.data xdt:Transform="InsertIfMissing">
+    <DbProviderFactories>
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- If system.data tag is present, but DbProviderFactories tag is absent -->
+  <system.data>
+    <DbProviderFactories xdt:Transform="InsertIfMissing">
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- remove existing ODPM entry -->  
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Remove" xdt:Locator="Match(invariant)" />
+      <add name="ODP.NET, Managed Driver" xdt:Transform="Remove" xdt:Locator="Match(name)" />      
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- add new ODPM entry -->
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Insert"/>
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />      
+    </DbProviderFactories>
+  </system.data>
+
+  <!-- If runtime tag is absent -->
+  <runtime xdt:Transform="InsertIfMissing">
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+    </assemblyBinding>
+  </runtime>
+
+  <!-- If runtime tag is present, but assembly binding tag is absent -->
+  <runtime>
+    <assemblyBinding xdt:Transform="InsertIfMissing" xmlns="urn:schemas-microsoft-com:asm.v1">
+    </assemblyBinding>
+  </runtime>
+
+  <!-- remove existing entry -->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly xdt:Transform="Remove"
+          xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Oracle.ManagedDataAccess')" >
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+  <!-- insert new entry -->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly xdt:Transform="Insert">
+        <publisherPolicy apply="no"/>
+        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+  <!-- If oracle.manageddataaccess.client tag is absent -->
+  <oracle.manageddataaccess.client xdt:Transform="InsertIfMissing">
+    <version number="*">
+      <dataSources>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- If version tag is absent -->
+  <oracle.manageddataaccess.client>
+    <version number="*" xdt:Transform="InsertIfMissing">
+      <dataSources>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- If dataSources tag is absent -->
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources xdt:Transform="InsertIfMissing">         
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+  <!-- add entry if missing -->
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources>
+         <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " xdt:Transform="InsertIfMissing" xdt:Locator="Match(alias)"/>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+
+</configuration>
diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/Web.config.transform b/packages/Oracle.ManagedDataAccess.12.1.24160719/content/net40/Web.config.transform
@@ -0,0 +1,4 @@
+<configuration>
+    <configSections>
+    </configSections>
+</configuration>