Skip to content

Commit 6f63a57

Browse files
cincuranetcincuranet
committed
Drop NS16 (DNET-866)
1 parent 3b4cd96 commit 6f63a57

Some content is hidden

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

61 files changed

+32
-276
lines changed

‎Provider/build.ps1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ function Build() {
3030

3131
function Pack() {
3232
7z a -mx=9 $outDir\FirebirdSql.Data.FirebirdClient-$version-net452.7z $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\net452\FirebirdSql.Data.FirebirdClient.dll $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\net452\FirebirdSql.Data.FirebirdClient.pdb | Out-Null
33-
7z a -mx=9 $outDir\FirebirdSql.Data.FirebirdClient-$version-netstandard1.6.7z $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\netstandard1.6\FirebirdSql.Data.FirebirdClient.dll $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\netstandard1.6\FirebirdSql.Data.FirebirdClient.pdb | Out-Null
3433
7z a -mx=9 $outDir\FirebirdSql.Data.FirebirdClient-$version-netstandard2.0.7z $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\netstandard2.0\FirebirdSql.Data.FirebirdClient.dll $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\netstandard2.0\FirebirdSql.Data.FirebirdClient.pdb | Out-Null
3534

3635
7z a -mx=9 $outDir\EntityFramework.Firebird-$version-net452.7z $baseDir\src\EntityFramework.Firebird\bin\$Configuration\net452\EntityFramework.Firebird.dll $baseDir\src\EntityFramework.Firebird\bin\$Configuration\net452\EntityFramework.Firebird.pdb | Out-Null

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,7 @@ private IPAddress GetIPAddress(string dataSource)
309309
return ipaddress;
310310
}
311311

312-
#if NETSTANDARD1_6
313-
var addresses = Dns.GetHostEntryAsync(dataSource).GetAwaiter().GetResult().AddressList;
314-
#else
315312
var addresses = Dns.GetHostEntry(dataSource).AddressList;
316-
#endif
317-
318313
foreach (var address in addresses)
319314
{
320315
// IPv4 priority

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ protected virtual void SendAttachToBuffer(DatabaseParameterBuffer dpb, string da
173173
{
174174
dpb.Append(IscCodes.isc_dpb_password, Password);
175175
}
176-
XdrStream.WriteBuffer(Encoding2.Default.GetBytes(database));
176+
XdrStream.WriteBuffer(Encoding.Default.GetBytes(database));
177177
XdrStream.WriteBuffer(dpb.ToArray());
178178
}
179179

@@ -282,7 +282,7 @@ protected virtual void SendCreateToBuffer(DatabaseParameterBuffer dpb, string da
282282
{
283283
dpb.Append(IscCodes.isc_dpb_password, Password);
284284
}
285-
XdrStream.WriteBuffer(Encoding2.Default.GetBytes(database));
285+
XdrStream.WriteBuffer(Encoding.Default.GetBytes(database));
286286
XdrStream.WriteBuffer(dpb.ToArray());
287287
}
288288

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,10 @@ internal static class FbClientFactory
4848
static FbClientFactory()
4949
{
5050
cache = new ConcurrentDictionary<string, IFbClient>();
51-
#if NETSTANDARD1_6
52-
injectionTypes = new HashSet<Type>(typeof(FbClientFactory).GetTypeInfo().Assembly.GetTypes()
53-
.Where(x => !x.GetTypeInfo().IsAbstract && !x.GetTypeInfo().IsInterface)
54-
.Where(x => typeof(IFirebirdHandle).IsAssignableFrom(x))
55-
.Select(x => x.MakeByRefType()));
56-
#else
5751
injectionTypes = new HashSet<Type>(typeof(FbClientFactory).Assembly.GetTypes()
5852
.Where(x => !x.IsAbstract && !x.IsInterface)
5953
.Where(x => typeof(IFirebirdHandle).IsAssignableFrom(x))
6054
.Select(x => x.MakeByRefType()));
61-
#endif
6255
}
6356

6457
/// <summary>
@@ -243,7 +236,7 @@ private static IFbClient CreateInstance(TypeBuilder tb)
243236
var t = tb.CreateTypeInfo().AsType();
244237

245238
#if DEBUG
246-
#if !NETSTANDARD1_6 && !NETSTANDARD2_0
239+
#if !NETSTANDARD2_0
247240
var ab = (AssemblyBuilder)tb.Assembly;
248241
ab.Save("DynamicAssembly.dll");
249242
#endif
@@ -272,18 +265,14 @@ private static TypeBuilder CreateTypeBuilder(string baseName)
272265
assemblyName.Name = baseName + "_Assembly";
273266

274267
// We create the dynamic assembly in our current AppDomain
275-
#if NETSTANDARD1_6 || NETSTANDARD2_0
268+
#if NETSTANDARD2_0
276269
var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
277270
#else
278271
var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
279272
#endif
280273

281274
// Generate the actual module (which is the DLL itself)
282-
#if NETSTANDARD1_6 || NETSTANDARD2_0
283275
var moduleBuilder = assemblyBuilder.DefineDynamicModule(baseName + "_Module");
284-
#else
285-
var moduleBuilder = assemblyBuilder.DefineDynamicModule(baseName + "_Module", baseName + ".dll");
286-
#endif
287276

288277
// Add our type to the module.
289278
return moduleBuilder.DefineType(baseName + "_Class", TypeAttributes.Class);
@@ -315,11 +304,7 @@ private static void ShutdownEntryPointWrapper(IFbClient fbClient)
315304
{
316305
fbClient.fb_shutdown(0, 0);
317306
}
318-
#if NETSTANDARD1_6
319-
catch (Exception ex) when (ex.GetType().Name == "EntryPointNotFoundException")
320-
#else
321307
catch (EntryPointNotFoundException)
322-
#endif
323308
{ }
324309
}
325310
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char
6060
{
6161
var ptr = statusVector[i++];
6262
var s = Marshal.PtrToStringAnsi(ptr);
63-
var value = charset.GetString(Encoding2.Default.GetBytes(s));
63+
var value = charset.GetString(Encoding.Default.GetBytes(s));
6464
exception.Errors.Add(new IscError(arg.AsInt(), value));
6565
}
6666
break;
@@ -71,7 +71,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char
7171

7272
var ptr = statusVector[i++];
7373
var s = Marshal.PtrToStringAnsi(ptr);
74-
var value = charset.GetString(Encoding2.Default.GetBytes(s));
74+
var value = charset.GetString(Encoding.Default.GetBytes(s));
7575
exception.Errors.Add(new IscError(arg.AsInt(), value));
7676
}
7777
break;
@@ -84,7 +84,7 @@ public static IscException ParseStatusVector(IntPtr[] statusVector, Charset char
8484
{
8585
var ptr = statusVector[i++];
8686
var s = Marshal.PtrToStringAnsi(ptr);
87-
var value = charset.GetString(Encoding2.Default.GetBytes(s));
87+
var value = charset.GetString(Encoding.Default.GetBytes(s));
8888
exception.Errors.Add(new IscError(arg.AsInt(), value));
8989
}
9090
break;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int p
131131
{
132132
CheckCryptKeyForSupport(cryptKey);
133133

134-
var databaseBuffer = Encoding2.Default.GetBytes(database);
134+
var databaseBuffer = Encoding.Default.GetBytes(database);
135135

136136
ClearStatusVector();
137137

@@ -190,7 +190,7 @@ public void Attach(DatabaseParameterBuffer dpb, string dataSource, int port, str
190190
{
191191
CheckCryptKeyForSupport(cryptKey);
192192

193-
var databaseBuffer = Encoding2.Default.GetBytes(database);
193+
var databaseBuffer = Encoding.Default.GetBytes(database);
194194

195195
ClearStatusVector();
196196

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public Charset(int id, string name, int bytesPerCharacter, string systemName)
166166
switch (_systemName)
167167
{
168168
case None:
169-
_encoding = Encoding2.Default;
169+
_encoding = Encoding.Default;
170170
_isNone = true;
171171
break;
172172
case Octets:

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -548,19 +548,12 @@ internal static FbWireCrypt GetWireCrypt(string key, TryGetValueDelegate tryGetV
548548
private static string ExpandDataDirectory(string s)
549549
{
550550
const string DataDirectoryKeyword = "|DataDirectory|";
551-
#if NETSTANDARD1_6
552-
if (s.IndexOf(DataDirectoryKeyword, StringComparison.OrdinalIgnoreCase) != -1)
553-
throw new NotSupportedException();
554-
555-
return s;
556-
#else
557551
if (s == null)
558552
return s;
559553

560554
var dataDirectoryLocation = (string)AppDomain.CurrentDomain.GetData("DataDirectory") ?? string.Empty;
561555
var pattern = string.Format("{0}{1}?", Regex.Escape(DataDirectoryKeyword), Regex.Escape(Path.DirectorySeparatorChar.ToString()));
562556
return Regex.Replace(s, pattern, dataDirectoryLocation + Path.DirectorySeparatorChar, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
563-
#endif
564557
}
565558

566559
private static T ParseEnum<T>(string value, string name) where T : struct

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void Append(int type, int value)
5151

5252
public void Append(int type, string content)
5353
{
54-
Append(type, Encoding2.Default.GetBytes(content));
54+
Append(type, Encoding.Default.GetBytes(content));
5555
}
5656

5757
public void Append(int type, byte[] buffer)

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)