diff options
| author | Stephen Toub <stoub@microsoft.com> | 2015-08-16 08:18:11 -0400 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2015-08-16 08:18:11 -0400 |
| commit | 57ae05a6c50090382b2054908abf28b82f474c8c (patch) | |
| tree | 3858b4438948ff216c551e9ed0056c0ddd03fb4b | |
| parent | 2d024d472a600156af270765864a95b822bcf272 (diff) | |
| parent | 96dfddc0491810f8fa6b928911caddeb888ff07e (diff) | |
| download | coreclr-57ae05a6c50090382b2054908abf28b82f474c8c.tar.gz coreclr-57ae05a6c50090382b2054908abf28b82f474c8c.tar.bz2 coreclr-57ae05a6c50090382b2054908abf28b82f474c8c.zip | |
Merge pull request #1399 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/mscorlib/src/System/TimeZoneInfo.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mscorlib/src/System/TimeZoneInfo.cs b/src/mscorlib/src/System/TimeZoneInfo.cs index 2d475b4677..e2abc3bb38 100644 --- a/src/mscorlib/src/System/TimeZoneInfo.cs +++ b/src/mscorlib/src/System/TimeZoneInfo.cs @@ -978,6 +978,7 @@ namespace System { return cachedData.m_readOnlySystemTimeZones; } + [SecuritySafeCritical] private static void PopulateAllSystemTimeZones(CachedData cachedData) { #if FEATURE_WIN32_REGISTRY |