Skip to content

Commit 5ee63cb

Browse files
rojiroji
committed
Target net451/dnx451 instead of net452/dnx452
There really was no reason to target 4.5.2 and mono doesn't support it.
1 parent 7b33baa commit 5ee63cb

39 files changed

Lines changed: 85 additions & 79 deletions

‎src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
2424
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>TRACE;DEBUG;NET452</DefineConstants>
25+
<DefineConstants>TRACE;DEBUG;NET451</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
<DocumentationFile>bin\Debug\EntityFramework5.Npgsql.xml</DocumentationFile>
@@ -31,7 +31,7 @@
3131
<DebugType>pdbonly</DebugType>
3232
<Optimize>true</Optimize>
3333
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE;NET452</DefineConstants>
34+
<DefineConstants>TRACE;NET451</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
3737
<DocumentationFile>bin\Release\EntityFramework5.Npgsql.xml</DocumentationFile>

‎src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DebugType>full</DebugType>
2222
<Optimize>false</Optimize>
2323
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>TRACE;DEBUG;NET452;ENTITIES6</DefineConstants>
24+
<DefineConstants>TRACE;DEBUG;NET451;ENTITIES6</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
2727
<DocumentationFile>bin\Debug\EntityFramework6.Npgsql.xml</DocumentationFile>
@@ -30,7 +30,7 @@
3030
<DebugType>pdbonly</DebugType>
3131
<Optimize>true</Optimize>
3232
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE;NET452;ENTITIES6</DefineConstants>
33+
<DefineConstants>TRACE;NET451;ENTITIES6</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
3636
<DocumentationFile>bin\Release\EntityFramework6.Npgsql.xml</DocumentationFile>

‎src/Npgsql/BackendMessages/ErrorOrNoticeMessage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
using System;
2525
using System.Diagnostics.Contracts;
2626
using Npgsql.Logging;
27-
#if NET45 || NET452 || DNX452
27+
#if NET45 || NET451 || DNX451
2828
using System.Runtime.Serialization;
2929
#endif
3030

3131
namespace Npgsql.BackendMessages
3232
{
33-
#if NET45 || NET452 || DNX452
33+
#if NET45 || NET451 || DNX451
3434
[Serializable]
3535
#endif
3636
class ErrorOrNoticeMessage

‎src/Npgsql/BackendMessages/RowDescriptionMessage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public bool Equals(string x, string y)
127127
}
128128
public int GetHashCode(string obj)
129129
{
130-
#if NET45 || NET452 || DNX452
130+
#if NET45 || NET451 || DNX451
131131
return CompareInfo.GetSortKey(obj, CompareOptions.IgnoreWidth).GetHashCode();
132132
#else
133133
return CompareInfo.GetHashCode(obj, CompareOptions.IgnoreWidth);
@@ -145,7 +145,7 @@ public bool Equals(string x, string y)
145145
}
146146
public int GetHashCode(string obj)
147147
{
148-
#if NET45 || NET452 || DNX452
148+
#if NET45 || NET451 || DNX451
149149
return CompareInfo.GetSortKey(obj, CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase).GetHashCode();
150150
#else
151151
return CompareInfo.GetHashCode(obj, CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase);

‎src/Npgsql/Logging/NpgsqlLogManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ internal static NpgsqlLogger GetCurrentClassLogger()
7777
// Copied from NLog
7878
static string GetClassFullName()
7979
{
80-
#if NET45 || NET452 || DNX452
80+
#if NET45 || NET451 || DNX451
8181
string className;
8282
Type declaringType;
8383
int framesToSkip = 2;

‎src/Npgsql/Npgsql.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<DebugType>full</DebugType>
2525
<Optimize>false</Optimize>
2626
<OutputPath>bin\Debug\</OutputPath>
27-
<DefineConstants>TRACE;DEBUG;NET452</DefineConstants>
27+
<DefineConstants>TRACE;DEBUG;NET451</DefineConstants>
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
3030
<DocumentationFile>bin\Debug\Npgsql.xml</DocumentationFile>
@@ -77,7 +77,7 @@
7777
<DebugType>pdbonly</DebugType>
7878
<Optimize>true</Optimize>
7979
<OutputPath>bin\Release\</OutputPath>
80-
<DefineConstants>TRACE;NET452</DefineConstants>
80+
<DefineConstants>TRACE;NET451</DefineConstants>
8181
<ErrorReport>prompt</ErrorReport>
8282
<WarningLevel>4</WarningLevel>
8383
<DocumentationFile>bin\Release\Npgsql.xml</DocumentationFile>
@@ -293,4 +293,4 @@
293293
<None Include="packages.config" />
294294
</ItemGroup>
295295
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
296-
</Project>
296+
</Project>

‎src/Npgsql/NpgsqlCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ void LogCommand()
11761176
Log.Debug(sb.ToString(), Connection.Connector.Id);
11771177
}
11781178

1179-
#if NET45 || NET452 || DNX452
1179+
#if NET45 || NET451 || DNX451
11801180
/// <summary>
11811181
/// Create a new command based on this one.
11821182
/// </summary>

‎src/Npgsql/NpgsqlCommandBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NET45 || NET452 || DNX452
1+
#if NET45 || NET451 || DNX451
22

33
#region License
44
// The PostgreSQL License

‎src/Npgsql/NpgsqlConnection.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
using System.Threading.Tasks;
3636
using AsyncRewriter;
3737
using JetBrains.Annotations;
38-
#if NET45 || NET452 || DNX452
38+
#if NET45 || NET451 || DNX451
3939
using System.Transactions;
4040
#endif
4141
using Npgsql.Logging;
@@ -99,7 +99,7 @@ public sealed partial class NpgsqlConnection : DbConnection, ICloneable
9999

100100
internal bool WasBroken { private get; set; }
101101

102-
#if NET45 || NET452 || DNX452
102+
#if NET45 || NET451 || DNX451
103103
NpgsqlPromotableSinglePhaseNotification Promotable => _promotable ?? (_promotable = new NpgsqlPromotableSinglePhaseNotification(this));
104104
NpgsqlPromotableSinglePhaseNotification _promotable;
105105
#endif
@@ -151,7 +151,7 @@ void Init()
151151
_noticeDelegate = OnNotice;
152152
_notificationDelegate = OnNotification;
153153

154-
#if NET45 || NET452 || DNX452
154+
#if NET45 || NET451 || DNX451
155155
// Fix authentication problems. See https://bugzilla.novell.com/show_bug.cgi?id=MONO77559 and
156156
// http://pgfoundry.org/forum/message.php?msg_id=1002377 for more info.
157157
RSACryptoServiceProvider.UseMachineKeyStore = true;
@@ -269,7 +269,7 @@ void OpenInternal(NpgsqlTimeout timeout)
269269
Connector.Notice += _noticeDelegate;
270270
Connector.Notification += _notificationDelegate;
271271

272-
#if NET45 || NET452 || DNX452
272+
#if NET45 || NET451 || DNX451
273273
if (Settings.Enlist)
274274
{
275275
Promotable.Enlist(Transaction.Current);
@@ -575,7 +575,7 @@ internal void PromotableLocalTransactionEnded()
575575
ReallyClose();
576576
}
577577

578-
#if NET45 || NET452 || DNX452
578+
#if NET45 || NET451 || DNX451
579579
/// <summary>
580580
/// Enlist transation.
581581
/// </summary>
@@ -606,7 +606,7 @@ public override void Close()
606606

607607
Log.Trace("Closing connection", Connector.Id);
608608

609-
#if NET45 || NET452 || DNX452
609+
#if NET45 || NET451 || DNX451
610610
if (_promotable != null && _promotable.InLocalTransaction)
611611
{
612612
_postponingClose = true;
@@ -623,7 +623,7 @@ internal void ReallyClose()
623623
Log.Trace("Really closing connection", connectorId);
624624
_postponingClose = false;
625625

626-
#if NET45 || NET452 || DNX452
626+
#if NET45 || NET451 || DNX451
627627
// clear the way for another promotable transaction
628628
_promotable = null;
629629
#endif
@@ -1259,7 +1259,7 @@ internal void CheckReady()
12591259
#endregion State checks
12601260

12611261
#region Schema operations
1262-
#if NET45 || NET452 || DNX452
1262+
#if NET45 || NET451 || DNX451
12631263
/// <summary>
12641264
/// Returns the supported collections
12651265
/// </summary>
@@ -1335,7 +1335,7 @@ public override DataTable GetSchema([CanBeNull] string collectionName, [CanBeNul
13351335

13361336
#region Misc
13371337

1338-
#if NET45 || NET452 || DNX452
1338+
#if NET45 || NET451 || DNX451
13391339
object ICloneable.Clone()
13401340
{
13411341
CheckNotDisposed();
@@ -1392,7 +1392,7 @@ public override void ChangeDatabase(String dbName)
13921392
Open();
13931393
}
13941394

1395-
#if NET45 || NET452 || DNX452
1395+
#if NET45 || NET451 || DNX451
13961396
/// <summary>
13971397
/// DB provider factory.
13981398
/// </summary>

‎src/Npgsql/NpgsqlConnectionStringBuilder.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using System.Linq;
3030
using System.Reflection;
3131
using JetBrains.Annotations;
32-
#if NET45 || NET452 || DNX452
32+
#if NET45 || NET451 || DNX451
3333
using System.DirectoryServices;
3434
using System.Security.Principal;
3535
#endif
@@ -71,7 +71,7 @@ public sealed class NpgsqlConnectionStringBuilder : DbConnectionStringBuilder
7171
/// </summary>
7272
public NpgsqlConnectionStringBuilder() { Init(); }
7373

74-
#if NET45 || NET452 || DNX452
74+
#if NET45 || NET451 || DNX451
7575
/// <summary>
7676
/// Initializes a new instance of the NpgsqlConnectionStringBuilder class, optionally using ODBC rules for quoting values.
7777
/// </summary>
@@ -336,7 +336,7 @@ public string Username
336336
{
337337
get
338338
{
339-
#if NET45 || NET452 || DNX452
339+
#if NET45 || NET451 || DNX451
340340
if ((_integratedSecurity) && (String.IsNullOrEmpty(_username))) {
341341
_username = GetIntegratedUserName();
342342
}
@@ -948,7 +948,7 @@ static void CheckIntegratedSecuritySupport()
948948
throw new NotSupportedException("IntegratedSecurity is currently unsupported on mono and .NET 4.5 (see https://github.com/npgsql/Npgsql/issues/133)");
949949
}
950950

951-
#if NET45 || NET452 || DNX452
951+
#if NET45 || NET451 || DNX451
952952
class CachedUpn
953953
{
954954
public string Upn;

0 commit comments

Comments
 (0)