From bae95c67d8f97678f93a809d27cbaab47d1953c5 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 1 Sep 2016 17:53:52 +0200 Subject: [PATCH 1/2] update storage dependency and remove dotnet import --- src/GeekLearning.Storage.Azure/project.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/GeekLearning.Storage.Azure/project.json b/src/GeekLearning.Storage.Azure/project.json index 7b4eb69..3917055 100644 --- a/src/GeekLearning.Storage.Azure/project.json +++ b/src/GeekLearning.Storage.Azure/project.json @@ -12,7 +12,7 @@ "NETStandard.Library": "1.6.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0", "Microsoft.Extensions.Options": "1.0.0", - "WindowsAzure.Storage": "7.1.3-preview", + "WindowsAzure.Storage": "7.2.0", "GeekLearning.Storage": "*", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0" }, @@ -21,7 +21,6 @@ "net451": { }, "netstandard1.5": { "imports": [ - "dotnet5.6", "portable-net45+win8" ] } From 10c7fe39a1daf7d74b0f967428ec9df37ac53459 Mon Sep 17 00:00:00 2001 From: Adrien Siffermann Date: Fri, 16 Sep 2016 14:59:48 +0200 Subject: [PATCH 2/2] Update dependencies for .NET Core 1.0.1 --- GeekLearning.Storage.sln | 12 +++++++++--- global.json | 6 ++++-- .../GeekLearning.Storage.BasicSample/project.json | 6 +++--- tests/GeekLearning.Integration.Test/project.json | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln index 127b7a5..90d4920 100644 --- a/GeekLearning.Storage.sln +++ b/GeekLearning.Storage.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage", "src\GeekLearning.Storage\GeekLearning.Storage.xproj", "{1F419C53-73C6-4460-B284-6A49AE41C596}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{FBAC4C17-D755-49A9-959D-18FD6B95B543}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FBAC4C17-D755-49A9-959D-18FD6B95B543}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.Azure", "src\GeekLearning.Storage.Azure\GeekLearning.Storage.Azure.xproj", "{FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}" EndProject @@ -13,11 +13,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSy EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "samples\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{63416AEA-DA51-4D62-B566-DB7D9BC800DC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2DAF5EF9-8F8E-4C51-BE2D-8D63CA143360}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2DAF5EF9-8F8E-4C51-BE2D-8D63CA143360}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Integration.Test", "tests\GeekLearning.Integration.Test\GeekLearning.Integration.Test.xproj", "{590B21B0-2AFA-4329-82AD-EF180C50EB5C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6BEB33C6-FA17-4F58-ACC3-83C1EB28B604}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{6BEB33C6-FA17-4F58-ACC3-83C1EB28B604}" ProjectSection(SolutionItems) = preProject .gitattributes = .gitattributes .gitignore = .gitignore @@ -29,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSystem.Server", "src\GeekLearning.Storage.FileSystem.Server\GeekLearning.Storage.FileSystem.Server.xproj", "{9D94CD6C-9451-449A-BED2-1C07D624A8E0}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{520AB1D3-C501-40FD-ACEB-7CC0D1F00B90}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -64,7 +66,11 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {1F419C53-73C6-4460-B284-6A49AE41C596} = {520AB1D3-C501-40FD-ACEB-7CC0D1F00B90} + {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2} = {520AB1D3-C501-40FD-ACEB-7CC0D1F00B90} + {4A12B042-76B3-471B-9235-F653E1ABE3C0} = {520AB1D3-C501-40FD-ACEB-7CC0D1F00B90} {63416AEA-DA51-4D62-B566-DB7D9BC800DC} = {FBAC4C17-D755-49A9-959D-18FD6B95B543} {590B21B0-2AFA-4329-82AD-EF180C50EB5C} = {2DAF5EF9-8F8E-4C51-BE2D-8D63CA143360} + {9D94CD6C-9451-449A-BED2-1C07D624A8E0} = {520AB1D3-C501-40FD-ACEB-7CC0D1F00B90} EndGlobalSection EndGlobal diff --git a/global.json b/global.json index dd067bf..48cf56a 100644 --- a/global.json +++ b/global.json @@ -1,4 +1,6 @@ { - "sdk" : { "version": "1.0.0-preview2-003121"}, - "projects": [ "src", "tests", "samples" ] + "projects": [ "src", "tests", "samples" ], + "sdk": { + "version": "1.0.0-preview2-003121" + } } \ No newline at end of file diff --git a/samples/GeekLearning.Storage.BasicSample/project.json b/samples/GeekLearning.Storage.BasicSample/project.json index 0e21265..8abd787 100644 --- a/samples/GeekLearning.Storage.BasicSample/project.json +++ b/samples/GeekLearning.Storage.BasicSample/project.json @@ -1,12 +1,12 @@ { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" }, - "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", "Microsoft.Extensions.Configuration.Json": "1.0.0", diff --git a/tests/GeekLearning.Integration.Test/project.json b/tests/GeekLearning.Integration.Test/project.json index c286d1a..7f1f9dc 100644 --- a/tests/GeekLearning.Integration.Test/project.json +++ b/tests/GeekLearning.Integration.Test/project.json @@ -34,7 +34,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } },