From e792387d7af0a28053d0d7eb2e8adc919afc83e1 Mon Sep 17 00:00:00 2001 From: PiotrP Date: Thu, 28 Jan 2016 10:55:22 -0800 Subject: [PATCH] Adjust imports to portable45 --- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.Runtime/project.json | 2 +- .../project.json | 18 ++++++------------ .../project.json | 2 +- src/dotnet-build/project.json | 2 +- src/dotnet-compile-csc/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- src/dotnet-compile-native/project.json | 2 +- src/dotnet-compile/project.json | 2 +- src/dotnet-new/project.json | 2 +- src/dotnet-pack/project.json | 2 +- src/dotnet-projectmodel-server/project.json | 2 +- src/dotnet-publish/project.json | 2 +- src/dotnet-repl-csi/project.json | 2 +- src/dotnet-repl/project.json | 2 +- src/dotnet-resgen/project.json | 2 +- src/dotnet-restore/project.json | 2 +- src/dotnet-run/project.json | 2 +- src/dotnet/project.json | 2 +- .../ArgumentForwardingTests/project.json | 2 +- .../Reflector/project.json | 2 +- test/E2E/project.json | 2 +- .../CompileFail/project.json | 2 +- test/FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- test/LoadContextTest/project.json | 2 +- .../project.json | 2 +- test/StreamForwarderTests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- .../project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- .../src/IncompatiblePackageSample/project.json | 2 +- 38 files changed, 43 insertions(+), 49 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index edfd3e80d..9d1b1c97d 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 371ae2db2..d49d39f1f 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -14,7 +14,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net45+win8+wpa81+aspnetcore50" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 5a95c997c..88b640a61 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -10,7 +10,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 70e516ce4..0c12863b1 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -11,7 +11,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index b610be491..e0c97adfd 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -31,7 +31,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index 23437be75..e54d71da9 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -10,7 +10,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index fa1ab0e05..9e550857f 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -15,22 +15,16 @@ "frameworks": { "net451": { }, "dotnet5.4": { - "imports": "portable-net451+win8", - "dependencies": { - "System.IO.FileSystem": "4.0.1-rc3-23727", - "System.Linq": "4.0.1-rc3-23727", - "System.Runtime": "4.0.21-rc3-23727", - "System.Reflection": "4.1.0-rc3-23727", + "imports": "portable-net45+win8", + "dependencies": { + "NETStandard.Library": "1.0.0-rc3-23727", "System.Dynamic.Runtime": "4.0.11-rc3-23727" } }, "dnxcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc3-23727", - "System.IO.FileSystem": "4.0.1-rc3-23727", - "System.Linq": "4.0.1-rc3-23727", - "System.Runtime": "4.0.21-rc3-23727", - "System.Reflection": "4.1.0-rc3-23727", + "imports": "portable-net451+win8", + "dependencies": { + "NETStandard.Library": "1.0.0-rc3-23727", "System.Dynamic.Runtime": "4.0.11-rc3-23727" } } diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 37eebbce4..ccca188af 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -19,7 +19,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-build/project.json b/src/dotnet-build/project.json index 02756b5b2..7ab26920e 100644 --- a/src/dotnet-build/project.json +++ b/src/dotnet-build/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-compile-csc/project.json b/src/dotnet-compile-csc/project.json index 3bdf4fb63..9c0c64c4d 100644 --- a/src/dotnet-compile-csc/project.json +++ b/src/dotnet-compile-csc/project.json @@ -18,7 +18,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 8d981c705..02051bf1b 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -17,7 +17,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-compile-native/project.json b/src/dotnet-compile-native/project.json index 38c4c270f..a1c1631f8 100644 --- a/src/dotnet-compile-native/project.json +++ b/src/dotnet-compile-native/project.json @@ -17,7 +17,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-compile/project.json b/src/dotnet-compile/project.json index 7e6f0badf..13803f2c0 100644 --- a/src/dotnet-compile/project.json +++ b/src/dotnet-compile/project.json @@ -21,7 +21,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-new/project.json b/src/dotnet-new/project.json index 263595670..5d1929840 100644 --- a/src/dotnet-new/project.json +++ b/src/dotnet-new/project.json @@ -17,7 +17,7 @@ "resource": [ "CSharp_Console/NuGet.Config", "CSharp_Console/Program.cs", "CSharp_Console/project.json", "FSharp_Console/NuGet.config", "FSharp_Console/Program.fs", "FSharp_Console/project.json"], "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-pack/project.json b/src/dotnet-pack/project.json index 98e2fc222..e2e9e093d 100644 --- a/src/dotnet-pack/project.json +++ b/src/dotnet-pack/project.json @@ -17,7 +17,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-projectmodel-server/project.json b/src/dotnet-projectmodel-server/project.json index 3a0a33f61..247b9cc97 100644 --- a/src/dotnet-projectmodel-server/project.json +++ b/src/dotnet-projectmodel-server/project.json @@ -19,7 +19,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-publish/project.json b/src/dotnet-publish/project.json index 1616cf317..b3bbc2523 100644 --- a/src/dotnet-publish/project.json +++ b/src/dotnet-publish/project.json @@ -15,7 +15,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-repl-csi/project.json b/src/dotnet-repl-csi/project.json index 0e1608da9..3bd7c1db4 100644 --- a/src/dotnet-repl-csi/project.json +++ b/src/dotnet-repl-csi/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-repl/project.json b/src/dotnet-repl/project.json index 1616cf317..b3bbc2523 100644 --- a/src/dotnet-repl/project.json +++ b/src/dotnet-repl/project.json @@ -15,7 +15,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-resgen/project.json b/src/dotnet-resgen/project.json index 84aa93532..1dfbb0b6e 100644 --- a/src/dotnet-resgen/project.json +++ b/src/dotnet-resgen/project.json @@ -18,7 +18,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-restore/project.json b/src/dotnet-restore/project.json index 20467fa2e..b0e599344 100644 --- a/src/dotnet-restore/project.json +++ b/src/dotnet-restore/project.json @@ -30,7 +30,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-run/project.json b/src/dotnet-run/project.json index ffc5a3788..928dbfd04 100644 --- a/src/dotnet-run/project.json +++ b/src/dotnet-run/project.json @@ -15,7 +15,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net45+win8+wpa81+aspnetcore50" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 3d9b8beb7..fa20bd53e 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -14,7 +14,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json index 5db3ecda4..8d79d3893 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json @@ -20,7 +20,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/ArgumentForwardingTests/Reflector/project.json b/test/ArgumentForwardingTests/Reflector/project.json index 5db3ecda4..8d79d3893 100644 --- a/test/ArgumentForwardingTests/Reflector/project.json +++ b/test/ArgumentForwardingTests/Reflector/project.json @@ -20,7 +20,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/E2E/project.json b/test/E2E/project.json index 52adcd14d..a9bb12beb 100644 --- a/test/E2E/project.json +++ b/test/E2E/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/CompileFail/project.json b/test/FSharpTestProjects/CompileFail/project.json index db6b68b23..8b6e2f469 100644 --- a/test/FSharpTestProjects/CompileFail/project.json +++ b/test/FSharpTestProjects/CompileFail/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/TestApp/project.json b/test/FSharpTestProjects/TestApp/project.json index 5903c54e3..a29600c91 100644 --- a/test/FSharpTestProjects/TestApp/project.json +++ b/test/FSharpTestProjects/TestApp/project.json @@ -15,7 +15,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/TestAppWithArgs/project.json b/test/FSharpTestProjects/TestAppWithArgs/project.json index db6b68b23..8b6e2f469 100644 --- a/test/FSharpTestProjects/TestAppWithArgs/project.json +++ b/test/FSharpTestProjects/TestAppWithArgs/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/TestLibrary/project.json b/test/FSharpTestProjects/TestLibrary/project.json index eea2ee21a..264a89118 100644 --- a/test/FSharpTestProjects/TestLibrary/project.json +++ b/test/FSharpTestProjects/TestLibrary/project.json @@ -11,7 +11,7 @@ ], "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/LoadContextTest/project.json b/test/LoadContextTest/project.json index ba068d375..20b61407d 100644 --- a/test/LoadContextTest/project.json +++ b/test/LoadContextTest/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 4073df718..fc10bf3b8 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -15,7 +15,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/StreamForwarderTests/project.json b/test/StreamForwarderTests/project.json index d25aac09c..9c94c162c 100644 --- a/test/StreamForwarderTests/project.json +++ b/test/StreamForwarderTests/project.json @@ -20,7 +20,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 61a30cebb..9196c66c7 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index a4a94e111..c8019c355 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index bd66aa8ef..8a1cdc437 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -8,7 +8,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "commands": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index feb47b09c..22ea2fd01 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json index 8064d1e3a..12d737ef1 100644 --- a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -4,7 +4,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } }