Skip to content

Commit

Permalink
Merge pull request dotnet#1165 from ellismg/add-rids
Browse files Browse the repository at this point in the history
Add additional runtimes
  • Loading branch information
ellismg committed May 16, 2016
2 parents 2d8fe49 + ca56d30 commit e671f7c
Show file tree
Hide file tree
Showing 27 changed files with 285 additions and 165 deletions.
15 changes: 11 additions & 4 deletions src/Common/test-runtime/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,24 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ],
"imports": [
"netstandard1.6",
"portable-net45+win8"
],
"dependencies": {
"System.Net.Http.WinHttpHandler": "4.0.0-rc3-24109-00",
"System.Net.Security": "4.0.0-rc3-24109-00"
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {}
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
16 changes: 10 additions & 6 deletions src/System.Private.ServiceModel/tests/Common/Unit/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,24 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ],
"imports": [
"netstandard1.6",
"portable-net45+win8"
],
"dependencies": {
"System.Net.WebSockets": "4.0.0-rc3-24109-00",
"System.Net.WebSockets.Client": "4.0.0-rc3-24109-00"
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": { },
"win7-x86": { },
"ubuntu.14.04-x64": { },
"osx.10.10-x64": { },
"centos.7-x64": { },
"rhel.7-x64": { },
"debian.8.2-x64": { }
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": { },
"win7-x86": { },
"ubuntu.14.04-x64": { },
"osx.10.10-x64": { },
"centos.7-x64": { },
"rhel.7-x64": { },
"debian.8.2-x64": { }
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@
},
"frameworks": {
"dnxcore50": {
"imports": [ "netstandard1.6", "portable-net45+win8" ]
"imports": [
"netstandard1.6",
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"ubuntu.14.04-x64": {},
"osx.10.10-x64": {},
"centos.7-x64": {},
"debian.8-x64": {},
"linux-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"debian.8.2-x64": {}
"ubuntu.14.04-x64": {},
"win7-x64": {},
"win7-x86": {}
}
}
Loading

0 comments on commit e671f7c

Please sign in to comment.