Skip to content

Commit

Permalink
Merge pull request dotnet#344 from SamB/vs2015-update1-compat
Browse files Browse the repository at this point in the history 
Support VS 2015 Update 1
  • Loading branch information
@rainersigwald
rainersigwald committed Nov 11, 2015
2 parents ab862ac + 344beea commit e192146
Show file tree
Hide file tree
Showing 14 changed files with 979 additions and 213 deletions.
5 changes: 3 additions & 2 deletions src/Framework/UnitTests/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"net46": {}
},
"runtimes": {
"win-": {}
"win-": {},
"win": {}
}
}
}
174 changes: 140 additions & 34 deletions src/Framework/UnitTests/project.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
".NETFramework,Version=v4.5.1": {
"xunit/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.abstractions/2.0.0": {
Expand Down Expand Up @@ -55,11 +55,11 @@
},
"xunit.runner.visualstudio/2.1.0-rc1-build1124": {}
},
".NETFramework,Version=v4.6": {
".NETFramework,Version=v4.5.1/win": {
"xunit/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.abstractions/2.0.0": {
Expand Down Expand Up @@ -111,8 +111,114 @@
".NETFramework,Version=v4.5.1/win-": {
"xunit/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.abstractions/2.0.0": {
"compile": {
"lib/net35/xunit.abstractions.dll": {}
},
"runtime": {
"lib/net35/xunit.abstractions.dll": {}
}
},
"xunit.assert/2.1.0-rc1-build3168": {
"compile": {
"lib/dotnet/xunit.assert.dll": {}
},
"runtime": {
"lib/dotnet/xunit.assert.dll": {}
}
},
"xunit.core/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.extensibility.core/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.abstractions": "[2.0.0, 2.0.0]"
},
"compile": {
"lib/dotnet/xunit.core.dll": {}
},
"runtime": {
"lib/dotnet/xunit.core.dll": {}
}
},
"xunit.extensibility.execution/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
},
"compile": {
"lib/net35/xunit.execution.desktop.dll": {}
},
"runtime": {
"lib/net35/xunit.execution.desktop.dll": {}
}
},
"xunit.runner.visualstudio/2.1.0-rc1-build1124": {}
},
".NETFramework,Version=v4.6": {
"xunit/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.abstractions/2.0.0": {
"compile": {
"lib/net35/xunit.abstractions.dll": {}
},
"runtime": {
"lib/net35/xunit.abstractions.dll": {}
}
},
"xunit.assert/2.1.0-rc1-build3168": {
"compile": {
"lib/dotnet/xunit.assert.dll": {}
},
"runtime": {
"lib/dotnet/xunit.assert.dll": {}
}
},
"xunit.core/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.extensibility.core/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.abstractions": "[2.0.0, 2.0.0]"
},
"compile": {
"lib/dotnet/xunit.core.dll": {}
},
"runtime": {
"lib/dotnet/xunit.core.dll": {}
}
},
"xunit.extensibility.execution/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
},
"compile": {
"lib/net35/xunit.execution.desktop.dll": {}
},
"runtime": {
"lib/net35/xunit.execution.desktop.dll": {}
}
},
"xunit.runner.visualstudio/2.1.0-rc1-build1124": {}
},
".NETFramework,Version=v4.6/win": {
"xunit/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.abstractions/2.0.0": {
Expand Down Expand Up @@ -164,8 +270,8 @@
".NETFramework,Version=v4.6/win-": {
"xunit/2.1.0-rc1-build3168": {
"dependencies": {
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
"xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]",
"xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]"
}
},
"xunit.abstractions/2.0.0": {
Expand Down Expand Up @@ -220,48 +326,48 @@
"sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.nuspec",
"package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp",
"[Content_Types].xml"
"xunit.nuspec"
]
},
"xunit.abstractions/2.0.0": {
"sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.abstractions.nuspec",
"lib/net35/xunit.abstractions.dll",
"lib/net35/xunit.abstractions.xml",
"lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll",
"lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml",
"package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp",
"[Content_Types].xml"
"xunit.abstractions.nuspec"
]
},
"xunit.assert/2.1.0-rc1-build3168": {
"sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.assert.nuspec",
"lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll",
"lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb",
"lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml",
"lib/dotnet/xunit.assert.dll",
"lib/dotnet/xunit.assert.pdb",
"lib/dotnet/xunit.assert.xml",
"lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll",
"lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb",
"lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml",
"package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp",
"[Content_Types].xml"
"xunit.assert.nuspec"
]
},
"xunit.core/2.1.0-rc1-build3168": {
"sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.core.nuspec",
"build/_desktop/xunit.execution.desktop.dll",
"build/dnx451/_._",
"build/monoandroid/_._",
Expand All @@ -274,15 +380,15 @@
"build/wpa81/xunit.core.props",
"build/xamarinios/_._",
"package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp",
"[Content_Types].xml"
"xunit.core.nuspec"
]
},
"xunit.extensibility.core/2.1.0-rc1-build3168": {
"sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.extensibility.core.nuspec",
"lib/dotnet/xunit.core.dll",
"lib/dotnet/xunit.core.dll.tdnet",
"lib/dotnet/xunit.core.pdb",
Expand All @@ -296,21 +402,21 @@
"lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll",
"lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll",
"package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp",
"[Content_Types].xml"
"xunit.extensibility.core.nuspec"
]
},
"xunit.extensibility.execution/2.1.0-rc1-build3168": {
"sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.extensibility.execution.nuspec",
"lib/dotnet/xunit.execution.dotnet.dll",
"lib/dotnet/xunit.execution.dotnet.pdb",
"lib/dotnet/xunit.execution.dotnet.xml",
"lib/dnx451/xunit.execution.dotnet.dll",
"lib/dnx451/xunit.execution.dotnet.pdb",
"lib/dnx451/xunit.execution.dotnet.xml",
"lib/dotnet/xunit.execution.dotnet.dll",
"lib/dotnet/xunit.execution.dotnet.pdb",
"lib/dotnet/xunit.execution.dotnet.xml",
"lib/monoandroid/xunit.execution.dotnet.dll",
"lib/monoandroid/xunit.execution.dotnet.pdb",
"lib/monoandroid/xunit.execution.dotnet.xml",
Expand All @@ -336,40 +442,40 @@
"lib/xamarinios/xunit.execution.dotnet.pdb",
"lib/xamarinios/xunit.execution.dotnet.xml",
"package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp",
"[Content_Types].xml"
"xunit.extensibility.execution.nuspec"
]
},
"xunit.runner.visualstudio/2.1.0-rc1-build1124": {
"sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"xunit.runner.visualstudio.nuspec",
"build/_common/xunit.abstractions.dll",
"build/_common/xunit.runner.utility.desktop.dll",
"build/_common/xunit.runner.visualstudio.testadapter.dll",
"build/_common/xunit.runner.utility.dotnet.dll",
"build/_common/xunit.runner.visualstudio.testadapter.dll",
"build/monoandroid/_._",
"build/monotouch/_._",
"build/net20/xunit.runner.visualstudio.props",
"build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props",
"build/uap10.0/xunit.runner.visualstudio.props",
"build/uap10.0/xunit.runner.visualstudio.targets",
"build/uap10.0/xunit.runner.visualstudio.uwp.dll",
"build/uap10.0/xunit.runner.visualstudio.uwp.pri",
"build/win8/_._",
"build/win81/xunit.runner.visualstudio.props",
"build/win81/xunit.runner.visualstudio.targets",
"build/win81/xunit.runner.visualstudio.win81.dll",
"build/win81/xunit.runner.visualstudio.win81.pri",
"build/wp8/_._",
"build/wpa81/xunit.runner.visualstudio.props",
"build/wpa81/xunit.runner.visualstudio.targets",
"build/wpa81/xunit.runner.visualstudio.wpa81.dll",
"build/wpa81/xunit.runner.visualstudio.wpa81.pri",
"build/monoandroid/_._",
"build/monotouch/_._",
"build/win8/_._",
"build/wp8/_._",
"build/xamarinios/_._",
"package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp",
"[Content_Types].xml"
"xunit.runner.visualstudio.nuspec"
]
}
},
Expand Down
5 changes: 3 additions & 2 deletions src/Utilities/UnitTests/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"net46": {}
},
"runtimes": {
"win-": {}
"win-": {},
"win": {}
}
}
}
Loading

0 comments on commit e192146

Please sign in to comment.