Switching to using dotnet generations TFM

2015-10-21 13:01:31 -07:00 · 2015-10-21 13:01:31 -07:00 · 6cdd73b246
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,4 @@ nuget.exe
 *.ipch
 *.sln.ide
 project.lock.json
+.vs
--- a/src/Microsoft.Extensions.Configuration.Abstractions/project.json
+++ b/src/Microsoft.Extensions.Configuration.Abstractions/project.json
@ -1,25 +1,17 @@
 {
-    "version": "1.0.0-*",
-    "description": "Abstractions of key-value pair based configuration.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/configuration"
-    },
-    "dependencies": { },
-    "frameworks": {
-        "net45": { },
-        "dnx451": { },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Linq": "4.0.1-beta-*"
-            }
-        },
-        "dotnet": {
-            "dependencies": {
-                "System.Collections": "4.0.10",
-                "System.Resources.ResourceManager": "4.0.0",
-                "System.Runtime": "4.0.20"
-            }
-        }
+  "version": "1.0.0-*",
+  "description": "Abstractions of key-value pair based configuration.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
+  },
+  "dependencies": {},
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Linq": "4.0.1-beta-*"
+      }
    }
-}
+  }
+}
--- a/src/Microsoft.Extensions.Configuration.Binder/project.json
+++ b/src/Microsoft.Extensions.Configuration.Binder/project.json
@ -2,31 +2,18 @@
  "version": "1.0.0-*",
  "description": "Functionality to bind an object to data in configuration providers.",
  "repository": {
-      "type": "git",
-      "url": "https://github.com/aspnet/configuration"
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
  },
  "dependencies": {
    "Microsoft.Extensions.Configuration": "1.0.0-*"
  },
  "frameworks": {
-    "net45": { },
-    "dnx451": { },
-    "dnxcore50": {
+    "net451": {},
+    "dotnet5.4": {
      "dependencies": {
        "System.ComponentModel.TypeConverter": "4.0.1-beta-*"
      }
-    },
-    "dotnet": {
-      "dependencies": {
-        "System.Collections": "4.0.10",
-        "System.ComponentModel.TypeConverter": "4.0.0",
-        "System.Diagnostics.Debug": "4.0.10",
-        "System.Globalization": "4.0.10",
-        "System.Linq": "4.0.0",
-        "System.Reflection": "4.0.10",
-        "System.Resources.ResourceManager": "4.0.0",
-        "System.Runtime": "4.0.20"
-      }
    }
  }
-}
+}
--- a/src/Microsoft.Extensions.Configuration.CommandLine/project.json
+++ b/src/Microsoft.Extensions.Configuration.CommandLine/project.json
@ -9,9 +9,7 @@
    "Microsoft.Extensions.Configuration": "1.0.0-*"
  },
  "frameworks": {
-    "net45": { },
-    "dnx451": { },
-    "dnxcore50": { },
-    "dotnet": { }
+    "net451": {},
+    "dotnet5.4": {}
  }
-}
+}
--- a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json
+++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json
@ -9,8 +9,7 @@
    "Microsoft.Extensions.Configuration": "1.0.0-*"
  },
  "frameworks": {
-    "net45": { },
-    "dnx451": { },
-    "dotnet": { }
-    }
-}
+    "net451": {},
+    "dotnet5.4": {}
+  }
+}
--- a/src/Microsoft.Extensions.Configuration.FileExtensions/FileConfigurationExtensions.cs
+++ b/src/Microsoft.Extensions.Configuration.FileExtensions/FileConfigurationExtensions.cs
@ -49,7 +49,7 @@ namespace Microsoft.Extensions.Configuration
                return (string)basePath;
            }

-#if DOTNET
+#if DOTNET5_4
            return AppContext.BaseDirectory ?? string.Empty;
 #else
            return AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") as string ??
--- a/src/Microsoft.Extensions.Configuration.FileExtensions/project.json
+++ b/src/Microsoft.Extensions.Configuration.FileExtensions/project.json
@ -1,20 +1,19 @@
 {
-    "version": "1.0.0-*",
-    "description": "File based provider configuration extensions for the Configuration package.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/configuration"
-    },
-    "dependencies": {
-        "Microsoft.Extensions.Configuration": "1.0.0-*"
-    },
-    "frameworks": {
-    "net45": { },
-    "dnx451": { },
-    "dotnet": {
-        "dependencies": {
-          "System.AppContext": "4.0.0-*"
-        }
+  "version": "1.0.0-*",
+  "description": "File based provider configuration extensions for the Configuration package.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
+  },
+  "dependencies": {
+    "Microsoft.Extensions.Configuration": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": { },
+    "dotnet5.4": {
+      "dependencies": {
+        "System.AppContext": "4.0.0-*"
      }
    }
-}
+  }
+}
--- a/src/Microsoft.Extensions.Configuration.Ini/project.json
+++ b/src/Microsoft.Extensions.Configuration.Ini/project.json
@ -1,24 +1,16 @@
 {
-    "version": "1.0.0-*",
-    "description": "INI configuration provider for the Configuration package.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/configuration"
-    },
-    "dependencies": {
-        "Microsoft.Extensions.Configuration": "1.0.0-*",
-        "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*"
-    },
-    "frameworks": {
-        "net45": { },
-        "dnx451": { },
-        "dnxcore50": { },
-        "dotnet": {
-            "dependencies": {
-                "System.IO": "4.0.10",
-                "System.IO.FileSystem": "4.0.0",
-                "System.IO.FileSystem.Primitives": "4.0.0"
-            }
-        }
-    }
-}
+  "version": "1.0.0-*",
+  "description": "INI configuration provider for the Configuration package.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
+  },
+  "dependencies": {
+    "Microsoft.Extensions.Configuration": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  }
+}
--- a/src/Microsoft.Extensions.Configuration.Json/project.json
+++ b/src/Microsoft.Extensions.Configuration.Json/project.json
@ -1,30 +1,21 @@
 {
-    "version": "1.0.0-*",
-    "description": "JSON configuration provider for the Configuration package.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/configuration"
-    },
-    "dependencies": {
-        "Newtonsoft.Json": "6.0.6",
-        "Microsoft.Extensions.Configuration": "1.0.0-*",
-        "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*"
-    },
-    "frameworks": {
-        "net45": { },
-        "dnx451": { },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Dynamic.Runtime": "4.0.11-beta-*"
-            }
-        },
-        "dotnet": {
-            "dependencies": {
-                "System.Dynamic.Runtime": "4.0.10",
-                "System.IO": "4.0.10",
-                "System.IO.FileSystem": "4.0.0",
-                "System.IO.FileSystem.Primitives": "4.0.0"
-            }
-        }
+  "version": "1.0.0-*",
+  "description": "JSON configuration provider for the Configuration package.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
+  },
+  "dependencies": {
+    "Newtonsoft.Json": "6.0.6",
+    "Microsoft.Extensions.Configuration": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Dynamic.Runtime": "4.0.11-beta-*"
+      }
    }
-}
+  }
+}
--- a/src/Microsoft.Extensions.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs
+++ b/src/Microsoft.Extensions.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 !DOTNET && !DNXCORE50
+#if !DOTNET5_4 && !DOTNET5_4
 using System;
 using System.Security.Cryptography.Xml;
 using System.Xml;
--- a/src/Microsoft.Extensions.Configuration.Xml/XmlDocumentDecryptor.cs
+++ b/src/Microsoft.Extensions.Configuration.Xml/XmlDocumentDecryptor.cs
@ -12,7 +12,7 @@ namespace Microsoft.Extensions.Configuration.Xml
        /// <summary>
        /// Accesses the singleton decryptor instance.
        /// </summary>
-#if DOTNET || DNXCORE50
+#if DOTNET5_4
        public static readonly XmlDocumentDecryptor Instance = new XmlDocumentDecryptor();
 #else
        public static readonly XmlDocumentDecryptor Instance = new EncryptedXmlDocumentDecryptor();
@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Configuration.Xml
            // 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 DOTNET || DNXCORE50
+#if DOTNET5_4
            var matchingNodes = document.GetElementsByTagName("EncryptedData", "http://www.w3.org/2001/04/xmlenc#");
            return (matchingNodes != null && matchingNodes.Count > 0);
 #else
--- a/src/Microsoft.Extensions.Configuration.Xml/project.json
+++ b/src/Microsoft.Extensions.Configuration.Xml/project.json
@ -1,41 +1,26 @@
 {
-    "version": "1.0.0-*",
-    "description": "XML configuration provider for the Configuration package.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/configuration"
+  "version": "1.0.0-*",
+  "description": "XML configuration provider for the Configuration package.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
+  },
+  "dependencies": {
+    "Microsoft.Extensions.Configuration": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Security": "",
+        "System.Xml": ""
+      }
    },
-    "dependencies": {
-        "Microsoft.Extensions.Configuration": "1.0.0-*",
-        "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*"
-    },
-    "frameworks": {
-        "net45": {
-            "frameworkAssemblies": {
-                "System.Security": "",
-                "System.Xml": ""
-            }
-        },
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.Security": "",
-                "System.Xml": ""
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Xml.XmlDocument": "4.0.1-beta-*",
-                "System.Xml.XmlSerializer": "4.0.11-beta-*"
-            }
-        },
-        "dotnet": {
-            "dependencies": {
-                "System.IO": "4.0.10",
-                "System.IO.FileSystem": "4.0.0",
-                "System.IO.FileSystem.Primitives": "4.0.0",
-                "System.Xml.ReaderWriter": "4.0.10",
-                "System.Xml.XmlDocument": "4.0.0"
-            }
-        }
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Xml.XmlDocument": "4.0.1-beta-*",
+        "System.Xml.XmlSerializer": "4.0.11-beta-*"
+      }
    }
-}
+  }
+}
--- a/src/Microsoft.Extensions.Configuration/project.json
+++ b/src/Microsoft.Extensions.Configuration/project.json
@ -1,17 +1,16 @@
 {
-    "version": "1.0.0-*",
-    "description": "Implementation of key-value pair based configuration. Includes the memory configuration provider.",
-    "dependencies": {
-        "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/configuration"
-    },
+  "version": "1.0.0-*",
+  "description": "Implementation of key-value pair based configuration. Includes the memory configuration provider.",
+  "dependencies": {
+    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/configuration"
+  },
  "frameworks": {
-    "net45": {},
-    "dnx451": {},
-    "dnxcore50": {
+    "net451": {},
+    "dotnet5.4": {
      "dependencies": {
        "System.Collections": "4.0.11-beta-*",
        "System.Diagnostics.Debug": "4.0.11-beta-*",
@ -21,19 +20,6 @@
        "System.Runtime.Extensions": "4.0.11-beta-*",
        "System.Runtime.InteropServices": "4.0.21-beta-*"
      }
-    },
-    "dotnet": {
-      "dependencies": {
-        "System.Collections": "4.0.10",
-        "System.Diagnostics.Debug": "4.0.10",
-        "System.Globalization": "4.0.10",
-        "System.Linq": "4.0.0",
-        "System.Reflection": "4.0.10",
-        "System.Resources.ResourceManager": "4.0.0",
-        "System.Runtime": "4.0.20",
-        "System.Runtime.Extensions": "4.0.10",
-        "System.Runtime.InteropServices": "4.0.20"
-      }
    }
  }
-}
+}
--- a/test/Microsoft.Extensions.Configuration.Test.Common/project.json
+++ b/test/Microsoft.Extensions.Configuration.Test.Common/project.json
@ -7,7 +7,8 @@
    },
    "dnxcore50": {
      "dependencies": {
-        "System.Collections.NonGeneric": "4.0.1-beta-*"
+        "System.Collections.NonGeneric": "4.0.1-beta-*",
+        "System.Runtime": "4.0.21-beta-*"
      }
    }
  }