diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-12-15 12:42:17 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-12-15 12:42:17 -0800 |
| commit | 8338d1100ffa20319aa9e0ad3031ea63ee3b941b (patch) | |
| tree | a84ab077b15cdea27bb75e73e9d8ab57ec17a363 /src | |
| parent | 8667a6c4b4fc74881ba0d763c6ccdd4bb7ec155d (diff) | |
| parent | a6769943767d25933528a6668fa561062dd233ac (diff) | |
| download | coreclr-8338d1100ffa20319aa9e0ad3031ea63ee3b941b.tar.gz coreclr-8338d1100ffa20319aa9e0ad3031ea63ee3b941b.tar.bz2 coreclr-8338d1100ffa20319aa9e0ad3031ea63ee3b941b.zip | |
Merge pull request #2346 from dotnet-bot/from-tfs
Merge changes from TFS
Diffstat (limited to 'src')
| -rw-r--r-- | src/mscorlib/model.xml | 2 | ||||
| -rw-r--r-- | src/mscorlib/src/System/AppContext/AppContext.cs | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index ce97c4af58..ecaa8f4c02 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -162,6 +162,8 @@ <Type Name="System.AppContext"> <Member Name="get_BaseDirectory" /> <Member MemberType="Property" Name="BaseDirectory" /> + <Member Name="get_TargetFrameworkName" /> + <Member MemberType="Property" Name="TargetFrameworkName" /> <Member Name="DefineSwitchDefault(System.String,System.Boolean)" /> <Member Name="SetSwitch(System.String,System.Boolean)" /> <Member Name="TryGetSwitch(System.String,System.Boolean@)" /> diff --git a/src/mscorlib/src/System/AppContext/AppContext.cs b/src/mscorlib/src/System/AppContext/AppContext.cs index feef21b787..30a405d7c9 100644 --- a/src/mscorlib/src/System/AppContext/AppContext.cs +++ b/src/mscorlib/src/System/AppContext/AppContext.cs @@ -32,8 +32,16 @@ namespace System } } - #region Switch APIs + public static string TargetFrameworkName + { + get + { + // Forward the value that is set on the current domain. + return AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; + } + } + #region Switch APIs static AppContext() { // populate the AppContext with the default set of values |