Merge pull request #722 from Sridhar-MS/centos-tests

Enable running tests for CentOS
2016-01-06 01:14:04 -08:00 · 2016-01-06 01:14:04 -08:00 · 6b1e11a1c9
commit 6b1e11a1c9
parent 4f18f938d4 2ebb28819e
31 changed files with 64 additions and 43 deletions
--- a/src/Microsoft.DotNet.Cli.Utils/project.json
+++ b/src/Microsoft.DotNet.Cli.Utils/project.json
@ -2,7 +2,7 @@
  "version": "1.0.0-*",
  
  "dependencies": {
-    "NETStandard.Library": "1.0.0-rc2-23616",
+    "NETStandard.Library": "1.0.0-rc2-23704",
    "Microsoft.DotNet.ProjectModel": "1.0.0",
    "System.Reflection.Metadata": "1.1.0"
  },
--- a/src/Microsoft.DotNet.Cli/project.json
+++ b/src/Microsoft.DotNet.Cli/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
        "Microsoft.Extensions.CommandLineUtils.Sources": {
--- a/src/Microsoft.DotNet.Compiler.Common/project.json
+++ b/src/Microsoft.DotNet.Compiler.Common/project.json
@ -7,7 +7,7 @@

    "dependencies": {
        "System.Reflection": "4.0.10-rc2-23616",
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "System.CommandLine": "0.1.0-*",
        "Microsoft.CodeAnalysis.CSharp":  "1.1.1",
        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
--- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json
+++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json
@ -4,11 +4,11 @@
        "keyFile": "../../tools/Key.snk"
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
        "System.Runtime.Loader": "4.0.0-rc2-23616"
    },
    "frameworks": {
        "dnxcore50": { }
    }
-}
+}
--- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
+++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
@ -4,11 +4,11 @@
        "keyFile": "../../tools/Key.snk"
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
        "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.0-*"
    },
    "frameworks": {
        "dnxcore50": { }
    }
-}
+}
--- a/src/Microsoft.DotNet.ProjectModel/RuntimeIdentifier.cs
+++ b/src/Microsoft.DotNet.ProjectModel/RuntimeIdentifier.cs
@ -22,7 +22,7 @@ namespace Microsoft.DotNet.ProjectModel
            {
                if(IsCentOS())
                {
-                    return "centos.7.1-x64";
+                    return "centos.7-x64";
                }
                else if(IsUbuntu())
                {
--- a/src/Microsoft.DotNet.ProjectModel/project.json
+++ b/src/Microsoft.DotNet.ProjectModel/project.json
@ -5,7 +5,7 @@
    },
    "description": "Types to model a .NET Project",
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "System.Threading.Thread": "4.0.0-rc2-23616",
        "System.Runtime.Loader": "4.0.0-rc2-23616",
        "System.Dynamic.Runtime": "4.0.11-rc2-23616",
--- a/src/Microsoft.DotNet.Runtime/project.json
+++ b/src/Microsoft.DotNet.Runtime/project.json
@ -5,7 +5,7 @@
  },

  "dependencies": {
-    "NETStandard.Library" : "1.0.0-rc2-23616"
+    "NETStandard.Library" : "1.0.0-rc2-23704"
  },

  "frameworks": {
--- a/src/Microsoft.DotNet.Tools.Builder/project.json
+++ b/src/Microsoft.DotNet.Tools.Builder/project.json
@ -5,7 +5,7 @@
    "emitEntryPoint": true
  },
  "dependencies": {
-    "NETStandard.Library": "1.0.0-rc2-23608",
+    "NETStandard.Library": "1.0.0-rc2-23704",
    "System.Linq": "4.0.1-rc2-23608",
    "System.Reflection.Metadata": "1.1.0",
    
--- a/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
+++ b/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20151228-02",

--- a/src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json
+++ b/src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218",

--- a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json
+++ b/src/Microsoft.DotNet.Tools.Compiler.Native/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
        "Microsoft.Extensions.CommandLineUtils.Sources": {
--- a/src/Microsoft.DotNet.Tools.Compiler/project.json
+++ b/src/Microsoft.DotNet.Tools.Compiler/project.json
@ -5,7 +5,7 @@
    "emitEntryPoint": true
  },
  "dependencies": {
-    "NETStandard.Library": "1.0.0-rc2-23616",
+    "NETStandard.Library": "1.0.0-rc2-23704",
    "System.Reflection.Metadata": "1.1.0",
    "Microsoft.DotNet.ProjectModel": "1.0.0-*",
    "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
--- a/src/Microsoft.DotNet.Tools.New/Template/project.json
+++ b/src/Microsoft.DotNet.Tools.New/Template/project.json
@ -5,7 +5,7 @@
    },

    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616"
+        "NETStandard.Library": "1.0.0-rc2-23704"
    },

    "frameworks": {
--- a/src/Microsoft.DotNet.Tools.New/project.json
+++ b/src/Microsoft.DotNet.Tools.New/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",

        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
--- a/src/Microsoft.DotNet.Tools.Pack/project.json
+++ b/src/Microsoft.DotNet.Tools.Pack/project.json
@ -5,7 +5,7 @@
    "emitEntryPoint": true
  },
  "dependencies": {
-    "NETStandard.Library": "1.0.0-rc2-23616",
+    "NETStandard.Library": "1.0.0-rc2-23704",
    "System.IO.Compression.ZipFile": "4.0.1-rc2-23616",
    
    "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
--- a/src/Microsoft.DotNet.Tools.Publish/project.json
+++ b/src/Microsoft.DotNet.Tools.Publish/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",

        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
--- a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json
+++ b/src/Microsoft.DotNet.Tools.Repl.Csi/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20151228-02",

--- a/src/Microsoft.DotNet.Tools.Repl/project.json
+++ b/src/Microsoft.DotNet.Tools.Repl/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
--- a/src/Microsoft.DotNet.Tools.Resgen/project.json
+++ b/src/Microsoft.DotNet.Tools.Resgen/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "System.Xml.XDocument": "4.0.11-rc2-23616",
        "System.Resources.ReaderWriter": "4.0.0-rc2-23616",

--- a/src/Microsoft.DotNet.Tools.Run/project.json
+++ b/src/Microsoft.DotNet.Tools.Run/project.json
@ -5,7 +5,7 @@
        "emitEntryPoint": true
    },
    "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        
        "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20151228-02",
        "System.CommandLine" : "0.1.0-d111815-3",
--- a/src/Microsoft.DotNet.Tools.Test/project.json
+++ b/src/Microsoft.DotNet.Tools.Test/project.json
@ -37,7 +37,7 @@
  "frameworks": {
    "dnxcore50": {
      "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23616",
        "System.Diagnostics.TraceSource": "4.0.0-rc2-23616",
        "System.Dynamic.Runtime": "4.0.11-rc2-23616",
@ -51,4 +51,4 @@
      "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
    ]
  }
-}
+}
--- a/src/Microsoft.Extensions.Testing.Abstractions/project.json
+++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json
@ -19,7 +19,7 @@
  "frameworks": {
    "dnxcore50": {
      "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23616",
+        "NETStandard.Library": "1.0.0-rc2-23704",
        "System.Resources.ResourceManager": "4.0.1-rc2-23616"
      }
    }
@ -30,4 +30,4 @@
          "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
      ]
  }
-}
+}