Skip to content

Commit 746790a

Browse files
cincuranetcincuranet
committed
Initial netstandard1.6 project.
1 parent 993517e commit 746790a

68 files changed

Lines changed: 166 additions & 231 deletions

File tree

Some content is hidden

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

‎Provider/src/EntityFramework.Firebird/EntityFramework.Firebird_NET40.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Compression/ZlibCodec.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ namespace Ionic.Zlib
7979
/// href="http://www.ietf.org/rfc/rfc1950.txt">RFC 1950 - ZLIB</see> and <see
8080
/// href="http://www.ietf.org/rfc/rfc1951.txt">RFC 1951 - DEFLATE</see>.
8181
/// </remarks>
82-
[Interop.GuidAttribute("ebc25cf6-9120-4283-b972-0e5520d0000D")]
83-
[Interop.ComVisible(true)]
84-
#if !NETCF
85-
[Interop.ClassInterface(Interop.ClassInterfaceType.AutoDispatch)]
86-
#endif
8782
sealed internal class ZlibCodec
8883
{
8984
/// <summary>

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/GdsConnection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private IPAddress GetIPAddress(string dataSource, AddressFamily addressFamily)
265265
return ipaddress;
266266
}
267267

268-
#if NETCORE10
268+
#if NETSTANDARD1_6
269269
IPAddress[] addresses = Dns.GetHostEntryAsync(dataSource).GetAwaiter().GetResult().AddressList;
270270
#else
271271
IPAddress[] addresses = Dns.GetHostEntry(dataSource).AddressList;

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FbClientFactory.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ internal static class FbClientFactory
5151
static FbClientFactory()
5252
{
5353
cache = new ConcurrentDictionary<string, IFbClient>();
54-
#if NETCORE10
54+
#if NETSTANDARD1_6
5555
injectionTypes = new HashSet<Type>(typeof(FbClientFactory).GetTypeInfo().Assembly.GetTypes()
5656
.Where(x => !x.GetTypeInfo().IsAbstract && !x.GetTypeInfo().IsInterface)
5757
.Where(x => typeof(IFirebirdHandle).IsAssignableFrom(x))
@@ -244,7 +244,7 @@ private static IFbClient CreateInstance(TypeBuilder tb)
244244
#endif
245245

246246
#if DEBUG
247-
#if !NETCORE10
247+
#if !NETSTANDARD1_6
248248
AssemblyBuilder ab = (AssemblyBuilder)tb.Assembly;
249249
ab.Save("DynamicAssembly.dll");
250250
#endif
@@ -273,14 +273,14 @@ private static TypeBuilder CreateTypeBuilder(string baseName)
273273
assemblyName.Name = baseName + "_Assembly";
274274

275275
// We create the dynamic assembly in our current AppDomain
276-
#if NETCORE10
276+
#if NETSTANDARD1_6
277277
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
278278
#else
279279
AssemblyBuilder assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
280280
#endif
281281

282282
// Generate the actual module (which is the DLL itself)
283-
#if NETCORE10
283+
#if NETSTANDARD1_6
284284
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(baseName + "_Module");
285285
#else
286286
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(baseName + "_Module", baseName + ".dll");

‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscError.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace FirebirdSql.Data.Common
2626
{
27-
#if !NETCORE10
27+
#if !NETSTANDARD1_6
2828
[Serializable]
2929
#endif
3030
internal sealed class IscError

‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscException.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
using System.Reflection;
2828
using System.Resources;
2929
using System.Linq;
30-
#if !NETCORE10
30+
#if !NETSTANDARD1_6
3131
using System.Runtime.Serialization;
3232
#endif
3333

3434
namespace FirebirdSql.Data.Common
3535
{
36-
#if !NETCORE10
36+
#if !NETSTANDARD1_6
3737
[Serializable]
3838
#endif
3939
internal sealed class IscException : Exception
@@ -120,7 +120,7 @@ public static IscException ForTypeErrorCodeIntParamStrParam(int type, int errorC
120120
return result;
121121
}
122122

123-
#if !NETCORE10
123+
#if !NETSTANDARD1_6
124124
private IscException(SerializationInfo info, StreamingContext context)
125125
: base(info, context)
126126
{
@@ -136,7 +136,7 @@ public void BuildExceptionData()
136136
BuildExceptionMessage();
137137
}
138138

139-
#if !NETCORE10
139+
#if !NETSTANDARD1_6
140140
public override void GetObjectData(SerializationInfo info, StreamingContext context)
141141
{
142142
base.GetObjectData(info, context);

‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/StatementState.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
namespace FirebirdSql.Data.Common
2121
{
22-
#if !NETCORE10
22+
#if !NETSTANDARD1_6
2323
[Serializable]
2424
#endif
2525
internal enum StatementState

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCharset.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
namespace FirebirdSql.Data.FirebirdClient
2222
{
23-
#if !NETCORE10
23+
#if !NETSTANDARD1_6
2424
[Serializable]
2525
#endif
2626
public enum FbCharset : int

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
using System.Text;
2929
using System.Collections.Generic;
3030
using System.Diagnostics;
31-
#if !NETCORE10
31+
#if !NETSTANDARD1_6
3232
using System.Runtime.Remoting.Messaging;
3333
#endif
3434

@@ -37,7 +37,7 @@
3737
namespace FirebirdSql.Data.FirebirdClient
3838
{
3939
public sealed class FbCommand : DbCommand
40-
#if !NETCORE10
40+
#if !NETSTANDARD1_6
4141
, ICloneable
4242
#endif
4343
{
@@ -386,7 +386,7 @@ protected override void Dispose(bool disposing)
386386

387387
#region ICloneable Methods
388388

389-
#if NETCORE10
389+
#if NETSTANDARD1_6
390390
internal object Clone()
391391
#else
392392
object ICloneable.Clone()
@@ -410,7 +410,7 @@ object ICloneable.Clone()
410410

411411
for (int i = 0; i < Parameters.Count; i++)
412412
{
413-
#if NETCORE10
413+
#if NETSTANDARD1_6
414414
command.Parameters.Add(Parameters[i].Clone());
415415
#else
416416
command.Parameters.Add(((ICloneable)Parameters[i]).Clone());
@@ -486,7 +486,7 @@ public override int ExecuteNonQuery()
486486

487487
return RecordsAffected;
488488
}
489-
#if !NETCORE10
489+
#if !NETSTANDARD1_6
490490
public IAsyncResult BeginExecuteNonQuery(AsyncCallback callback, object objectState)
491491
{
492492
// BeginInvoke might be slow, but the query processing will make this irrelevant
@@ -537,7 +537,7 @@ public IAsyncResult BeginExecuteReader(CommandBehavior behavior, AsyncCallback c
537537
// BeginInvoke might be slow, but the query processing will make this irrelevant
538538
return ((Func<CommandBehavior, FbDataReader>)ExecuteReader).BeginInvoke(behavior, callback, objectState);
539539
}
540-
#if !NETCORE10
540+
#if !NETSTANDARD1_6
541541
public FbDataReader EndExecuteReader(IAsyncResult asyncResult)
542542
{
543543
if ((asyncResult as AsyncResult).AsyncDelegate is Func<FbDataReader>)
@@ -597,7 +597,7 @@ public override object ExecuteScalar()
597597

598598
return val;
599599
}
600-
#if !NETCORE10
600+
#if !NETSTANDARD1_6
601601
public IAsyncResult BeginExecuteScalar(AsyncCallback callback, object objectState)
602602
{
603603
// BeginInvoke might be slow, but the query processing will make this irrelevant

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommandBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Jiri Cincura (jiri@cincura.net)
2020
*/
2121

22-
#if !NETCORE10
22+
#if !NETSTANDARD1_6
2323
using System;
2424
using System.ComponentModel;
2525
using System.Data;

0 commit comments

Comments
 (0)