Skip to content

Commit a27b10f

Browse files
authored
Obsolete Environment.Properties
1 parent 5b6ca3f commit a27b10f

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

src/NHibernate/Cfg/Configuration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ protected void Reset()
171171
propertyReferences = new List<Mappings.PropertyReference>();
172172
FilterDefinitions = new Dictionary<string, FilterDefinition>();
173173
interceptor = EmptyInterceptor.Instance;
174+
#pragma warning disable 618
174175
properties = Environment.Properties;
176+
#pragma warning restore 618
175177
auxiliaryDatabaseObjects = new List<IAuxiliaryDatabaseObject>();
176178
SqlFunctions = new Dictionary<string, ISQLFunction>();
177179
mappingsQueue = new MappingsQueue();

src/NHibernate/Cfg/Environment.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ private static IHibernateConfiguration GetHibernateConfiguration()
383383
/// <remarks>
384384
/// This is the replacement for hibernate.properties
385385
/// </remarks>
386+
//Since v5.3
387+
[Obsolete("This property is not used and will be removed in a future version.")]
386388
public static IDictionary<string, string> Properties
387389
{
388390
get { return new Dictionary<string, string>(GlobalProperties); }

src/NHibernate/Dialect/Dialect.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,18 @@ protected Dialect()
148148
public static Dialect GetDialect()
149149
{
150150
string dialectName;
151+
#pragma warning disable 618
152+
var properties = Environment.Properties;
153+
#pragma warning restore 618
151154
try
152155
{
153-
dialectName = Environment.Properties[Environment.Dialect];
156+
dialectName = properties[Environment.Dialect];
154157
}
155158
catch (Exception e)
156159
{
157160
throw new HibernateException("The dialect was not set. Set the property 'dialect'.", e);
158161
}
159-
return InstantiateDialect(dialectName, Environment.Properties);
162+
return InstantiateDialect(dialectName, properties);
160163
}
161164

162165
/// <summary>

src/NHibernate/Driver/DriverExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ internal static int GetCommandTimeout(this IDriver driver)
2020
if (driver is DriverBase driverBase)
2121
return driverBase.CommandTimeout;
2222

23+
#pragma warning disable 618
2324
return PropertiesHelper.GetInt32(Cfg.Environment.CommandTimeout, Cfg.Environment.Properties, -1);
25+
#pragma warning restore 618
2426
}
2527

2628
// 6.0 TODO: merge into IDriver

0 commit comments

Comments
 (0)