diff options
| author | Senthil <schellap@microsoft.com> | 2016-02-05 06:41:02 +0300 |
|---|---|---|
| committer | Senthil <schellap@microsoft.com> | 2016-02-06 03:28:54 +0300 |
| commit | a1f2ba2cae2dac1d134ae9afd60462cf57dde3c3 (patch) | |
| tree | 3a479c47244353aad6121aa4ebdff5b584f009c8 /src/ILCompiler.DependencyAnalysisFramework | |
| parent | f46fd89272ff210a0c5dc4bcb4017ba59f84171e (diff) | |
Revert "Merge pull request #717 from schellap/break2"
This reverts commit 766f4ea7ff4d9dcd0422da1ebd115eb6b279e684, reversing
changes made to ce31cfa86e2d82af79212a1b09b7c1fe05baf3f6.
Revert "Merge pull request #767 from schellap/wmain"
This reverts commit 86e568eb6e82e2526ace252fcb49903e298e708d, reversing
changes made to 1d3ef5fd841effc0599511e3073a0cad53bed88b.
Revert formatting to old project.json and cppcompilerflag in runtest.cmd
Diffstat (limited to 'src/ILCompiler.DependencyAnalysisFramework')
| -rw-r--r-- | src/ILCompiler.DependencyAnalysisFramework/src/project.json | 18 | ||||
| -rw-r--r-- | src/ILCompiler.DependencyAnalysisFramework/tests/project.json | 18 |
2 files changed, 28 insertions, 8 deletions
diff --git a/src/ILCompiler.DependencyAnalysisFramework/src/project.json b/src/ILCompiler.DependencyAnalysisFramework/src/project.json index 641055a90..bfdd34f11 100644 --- a/src/ILCompiler.DependencyAnalysisFramework/src/project.json +++ b/src/ILCompiler.DependencyAnalysisFramework/src/project.json @@ -1,10 +1,22 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23704", + "System.Runtime": "4.0.20", + "System.Resources.ResourceManager": "4.0.0", + "System.Reflection.Primitives": "4.0.0", + "System.Diagnostics.Debug": "4.0.0", + "System.IO": "4.0.10", "System.Collections.Immutable": "1.1.37", + "System.Collections": "4.0.0", + "System.Text.Encoding": "4.0.0", + "System.Runtime.InteropServices": "4.0.0", + "System.Reflection": "4.0.10", + "System.Runtime.Extensions": "4.0.0", + "System.Threading": "4.0.0", + "System.Text.Encoding.Extensions": "4.0.0", + "System.Reflection.Extensions": "4.0.0", "System.Xml.ReaderWriter": "4.0.0" }, "frameworks": { - "dnxcore50": {} + "dotnet": {} } -} +}
\ No newline at end of file diff --git a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json b/src/ILCompiler.DependencyAnalysisFramework/tests/project.json index e489a61d8..2be5107a7 100644 --- a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json +++ b/src/ILCompiler.DependencyAnalysisFramework/tests/project.json @@ -1,13 +1,21 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23704", + "System.Collections": "4.0.10", "System.Collections.Immutable": "1.1.37", + "System.Console": "4.0.0-rc2-23616", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tracing": "4.0.20", + "System.Linq": "4.0.0", + "System.IO.FileSystem": "4.0.0", + "System.Reflection": "4.0.10", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Threading": "4.0.10", + "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" - } + "dotnet": {} } -} +}
\ No newline at end of file |