dotnet all the things

bricelam · bricelam · commit 57fd5834371f · 2015-06-03T13:46:56.000-07:00
diff --git a/src/Microsoft.Framework.Configuration.Abstractions/project.json b/src/Microsoft.Framework.Configuration.Abstractions/project.json
@@ -5,23 +5,10 @@
     "frameworks": {
         "net45": { },
         "dnx451": { },
-        "dnxcore50": {
+        "dotnet": {
             "dependencies": {
                 "System.Linq": "4.0.0-beta-*"
             }
-        },
-        ".NETPortable,Version=v4.5,Profile=Profile7": {
-            "frameworkAssemblies": {
-                "System.Collections": "",
-                "System.Diagnostics.Debug": "",
-                "System.Globalization": "",
-                "System.Linq": "",
-                "System.Reflection": "",
-                "System.Resources.ResourceManager": "",
-                "System.Runtime": "",
-                "System.Runtime.Extensions": "",
-                "System.Runtime.InteropServices": ""
-            }
         }
     }
 }
diff --git a/src/Microsoft.Framework.Configuration.Binder/project.json b/src/Microsoft.Framework.Configuration.Binder/project.json
@@ -8,19 +8,6 @@
   "frameworks": {
     "net45": { },
     "dnx451": { },
-    "dnxcore50": { },
-    ".NETPortable,Version=v4.5,Profile=Profile7": {
-      "frameworkAssemblies": {
-        "System.Collections": "",
-        "System.Diagnostics.Debug": "",
-        "System.Globalization": "",
-        "System.Linq": "",
-        "System.Reflection": "",
-        "System.Resources.ResourceManager": "",
-        "System.Runtime": "",
-        "System.Runtime.Extensions": "",
-        "System.Runtime.InteropServices": ""
-      }
-    }
+    "dotnet": { }
   }
 }
diff --git a/src/Microsoft.Framework.Configuration.CommandLine/project.json b/src/Microsoft.Framework.Configuration.CommandLine/project.json
@@ -8,6 +8,6 @@
   "frameworks": {
     "net45": { },
     "dnx451": { },
-    "dnxcore50": { }
+    "dotnet": { }
     }
 }
diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs b/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs
@@ -30,12 +30,10 @@ public EnvironmentVariablesConfigurationSource()
             _prefix = string.Empty;
         }
 
-#if NET45 || DNX451 || DNXCORE50
         public override void Load()
         {
             Load(Environment.GetEnvironmentVariables());
         }
-#endif
 
         internal void Load(IDictionary envVariables)
         {
diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json b/src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json
@@ -8,6 +8,6 @@
   "frameworks": {
     "net45": { },
     "dnx451": { },
-    "dnxcore50": { }
+    "dotnet": { }
     }
 }
diff --git a/src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtension.cs b/src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtension.cs
@@ -11,7 +11,6 @@ namespace Microsoft.Framework.Configuration
 {
     public static class IniConfigurationExtension
     {
-#if NET45 || DNX451 || DNXCORE50
         /// <summary>
         /// Adds the INI configuration source at <paramref name="path"/> to <paramref name="configuraton"/>.
         /// </summary>
@@ -55,6 +54,5 @@ public static IConfigurationBuilder AddIniFile(
             configuration.Add(new IniFileConfigurationSource(fullPath, optional: optional));
             return configuration;
         }
-#endif
     }
 }
diff --git a/src/Microsoft.Framework.Configuration.Ini/IniFileConfigurationSource.cs b/src/Microsoft.Framework.Configuration.Ini/IniFileConfigurationSource.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if NET45 || DNX451 || DNXCORE50
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -144,4 +143,3 @@ internal void Load(Stream stream)
         }
     }
 }
-#endif
diff --git a/src/Microsoft.Framework.Configuration.Ini/project.json b/src/Microsoft.Framework.Configuration.Ini/project.json
@@ -8,6 +8,6 @@
     "frameworks": {
     "net45": { },
     "dnx451": { },
-    "dnxcore50": { }
+    "dotnet": { }
     }
 }
diff --git a/src/Microsoft.Framework.Configuration.Json/project.json b/src/Microsoft.Framework.Configuration.Json/project.json
@@ -9,7 +9,7 @@
     "frameworks": {
         "net45": { },
         "dnx451": { },
-        "dnxcore50": {
+        "dotnet": {
             "dependencies": {
                 "System.Dynamic.Runtime": "4.0.10-*"
             }
diff --git a/src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs b/src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if !DNXCORE50
+#if !DOTNET
 using System;
 using System.Security.Cryptography.Xml;
 using System.Xml;
diff --git a/src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs b/src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs
@@ -13,7 +13,7 @@ internal class XmlDocumentDecryptor
         /// <summary>
         /// Accesses the singleton decryptor instance.
         /// </summary>
-#if DNXCORE50
+#if DOTNET
         public static readonly XmlDocumentDecryptor Instance = new XmlDocumentDecryptor();
 #else
         public static readonly XmlDocumentDecryptor Instance = new EncryptedXmlDocumentDecryptor();
@@ -30,7 +30,7 @@ private static bool ContainsEncryptedData(XmlDocument document)
             // us that it did so, so we need to perform a check to see if EncryptedXml
             // will actually do anything. The below check for an encrypted data blob
             // is the same one that EncryptedXml would have performed.
-#if DNXCORE50
+#if DOTNET
             var matchingNodes = document.GetElementsByTagName("EncryptedData", "http://www.w3.org/2001/04/xmlenc#");
             return (matchingNodes != null && matchingNodes.Count > 0);
 #else
diff --git a/src/Microsoft.Framework.Configuration.Xml/project.json b/src/Microsoft.Framework.Configuration.Xml/project.json
@@ -18,7 +18,7 @@
                 "System.Xml": ""
             }
         },
-        "dnxcore50": {
+        "dotnet": {
             "dependencies": {
                 "System.Xml.XmlDocument": "4.0.0-beta-*",
                 "System.Xml.XmlSerializer": "4.0.10-beta-*"
diff --git a/src/Microsoft.Framework.Configuration/project.json b/src/Microsoft.Framework.Configuration/project.json
@@ -8,7 +8,7 @@
   "frameworks": {
     "net45": {},
     "dnx451": {},
-    "dnxcore50": {
+    "dotnet": {
       "dependencies": {
         "System.Collections": "4.0.10-beta-*",
         "System.Diagnostics.Debug": "4.0.10-beta-*",
@@ -18,19 +18,6 @@
         "System.Runtime.Extensions": "4.0.10-beta-*",
         "System.Runtime.InteropServices": "4.0.20-beta-*"
       }
-    },
-    ".NETPortable,Version=v4.5,Profile=Profile7": {
-      "frameworkAssemblies": {
-        "System.Collections": "",
-        "System.Diagnostics.Debug": "",
-        "System.Globalization": "",
-        "System.Linq": "",
-        "System.Reflection": "",
-        "System.Resources.ResourceManager": "",
-        "System.Runtime": "",
-        "System.Runtime.Extensions": "",
-        "System.Runtime.InteropServices": ""
-      }
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`"frameworks": {`
`9`	`9`	`"net45": { },`
`10`	`10`	`"dnx451": { },`
`11`		`- "dnxcore50": { }`
	`11`	`+ "dotnet": { }`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,10 @@ public EnvironmentVariablesConfigurationSource()`
`30`	`30`	`_prefix = string.Empty;`
`31`	`31`	`}`
`32`	`32`
`33`		`-#if NET45 \|\| DNX451 \|\| DNXCORE50`
`34`	`33`	`public override void Load()`
`35`	`34`	`{`
`36`	`35`	`Load(Environment.GetEnvironmentVariables());`
`37`	`36`	`}`
`38`		`-#endif`
`39`	`37`
`40`	`38`	`internal void Load(IDictionary envVariables)`
`41`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ namespace Microsoft.Framework.Configuration`
`11`	`11`	`{`
`12`	`12`	`public static class IniConfigurationExtension`
`13`	`13`	`{`
`14`		`-#if NET45 \|\| DNX451 \|\| DNXCORE50`
`15`	`14`	`/// <summary>`
`16`	`15`	`/// Adds the INI configuration source at <paramref name="path"/> to <paramref name="configuraton"/>.`
`17`	`16`	`/// </summary>`
`@@ -55,6 +54,5 @@ public static IConfigurationBuilder AddIniFile(`
`55`	`54`	`configuration.Add(new IniFileConfigurationSource(fullPath, optional: optional));`
`56`	`55`	`return configuration;`
`57`	`56`	`}`
`58`		`-#endif`
`59`	`57`	`}`
`60`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-#if NET45 \|\| DNX451 \|\| DNXCORE50`
`5`	`4`	`using System;`
`6`	`5`	`using System.Collections.Generic;`
`7`	`6`	`using System.IO;`
`@@ -144,4 +143,3 @@ internal void Load(Stream stream)`
`144`	`143`	`}`
`145`	`144`	`}`
`146`	`145`	`}`
`147`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"frameworks": {`
`10`	`10`	`"net45": { },`
`11`	`11`	`"dnx451": { },`
`12`		`- "dnxcore50": {`
	`12`	`+ "dotnet": {`
`13`	`13`	`"dependencies": {`
`14`	`14`	`"System.Dynamic.Runtime": "4.0.10-*"`
`15`	`15`	`}`