From 1c6b649d087c267f52adef32ce871aa4d8d00472 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Wed, 4 May 2016 21:23:15 +0200 Subject: [PATCH 01/11] fix versioning and nuspec --- .../GeekLearning.Storage.Azure.nuspec | 11 +++++++---- src/GeekLearning.Azure/Properties/AssemblyInfo.cs | 10 +++++++--- .../GeekLearning.FileSystem.nuspec | 11 +++++++---- .../Properties/AssemblyInfo.cs | 10 +++++++--- src/GeekLearning.Storage/GeekLearning.Storage.nuspec | 8 ++++---- src/GeekLearning.Storage/Properties/AssemblyInfo.cs | 10 +++++++--- 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/GeekLearning.Azure/GeekLearning.Storage.Azure.nuspec b/src/GeekLearning.Azure/GeekLearning.Storage.Azure.nuspec index 1dd43d6..0762102 100644 --- a/src/GeekLearning.Azure/GeekLearning.Storage.Azure.nuspec +++ b/src/GeekLearning.Azure/GeekLearning.Storage.Azure.nuspec @@ -2,11 +2,14 @@ GeekLearning.Storage.Azure - 1.0.0 - autex - autex + $version$ + $author$ + $author$ + $description$ false - GeekLearning.Storage.Azure Class Library + + + diff --git a/src/GeekLearning.Azure/Properties/AssemblyInfo.cs b/src/GeekLearning.Azure/Properties/AssemblyInfo.cs index 33d629a..463d146 100644 --- a/src/GeekLearning.Azure/Properties/AssemblyInfo.cs +++ b/src/GeekLearning.Azure/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -6,9 +6,9 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("GeekLearning.Storage.Azure")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Geek Learning Azure Storage Provider")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Geek Learning")] [assembly: AssemblyProduct("GeekLearning.Storage.Azure")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] @@ -21,3 +21,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("fd8bb8f9-9af5-4c12-b962-9e08c30b01e2")] + +[assembly: AssemblyVersion("0.1.0.0")] +[assembly: AssemblyInformationalVersion("0.1.0+3.Branch.master.Sha.c1972a5901589d4f8d5670ad90b383609ee69408")] +[assembly: AssemblyFileVersion("0.1.0.0")] \ No newline at end of file diff --git a/src/GeekLearning.FileSystem/GeekLearning.FileSystem.nuspec b/src/GeekLearning.FileSystem/GeekLearning.FileSystem.nuspec index 00c0ac2..5bd2527 100644 --- a/src/GeekLearning.FileSystem/GeekLearning.FileSystem.nuspec +++ b/src/GeekLearning.FileSystem/GeekLearning.FileSystem.nuspec @@ -2,11 +2,14 @@ GeekLearning.Storage.FileSystem - 1.0.0 - autex - autex + $version$ + $author$ + $author$ + $description$ false - GeekLearning.Storage.FileSystem Class Library + + + diff --git a/src/GeekLearning.FileSystem/Properties/AssemblyInfo.cs b/src/GeekLearning.FileSystem/Properties/AssemblyInfo.cs index 65221b5..2617307 100644 --- a/src/GeekLearning.FileSystem/Properties/AssemblyInfo.cs +++ b/src/GeekLearning.FileSystem/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -6,9 +6,9 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("GeekLearning.Storage.FileSystem")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Geek Learning FileSystem Storage Provider")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Geek Learning")] [assembly: AssemblyProduct("GeekLearning.Storage.FileSystem")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] @@ -21,3 +21,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("4a12b042-76b3-471b-9235-f653e1abe3c0")] + +[assembly: AssemblyVersion("0.1.0.0")] +[assembly: AssemblyInformationalVersion("0.1.0+3.Branch.master.Sha.c1972a5901589d4f8d5670ad90b383609ee69408")] +[assembly: AssemblyFileVersion("0.1.0.0")] \ No newline at end of file diff --git a/src/GeekLearning.Storage/GeekLearning.Storage.nuspec b/src/GeekLearning.Storage/GeekLearning.Storage.nuspec index 50c25e3..c6520e9 100644 --- a/src/GeekLearning.Storage/GeekLearning.Storage.nuspec +++ b/src/GeekLearning.Storage/GeekLearning.Storage.nuspec @@ -2,11 +2,11 @@ GeekLearning.Storage - 1.0.0 - autex - autex + $version$ + $author$ + $author$ + $description$ false - GeekLearning.Storage Class Library diff --git a/src/GeekLearning.Storage/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage/Properties/AssemblyInfo.cs index 82038ac..119ff8b 100644 --- a/src/GeekLearning.Storage/Properties/AssemblyInfo.cs +++ b/src/GeekLearning.Storage/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -6,9 +6,9 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("GeekLearning.Storage")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Geek Learning Storage abstraction")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Geek Learning")] [assembly: AssemblyProduct("GeekLearning.Storage")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] @@ -21,3 +21,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("1f419c53-73c6-4460-b284-6a49ae41c596")] + +[assembly: AssemblyVersion("0.1.0.0")] +[assembly: AssemblyInformationalVersion("0.1.0+3.Branch.master.Sha.c1972a5901589d4f8d5670ad90b383609ee69408")] +[assembly: AssemblyFileVersion("0.1.0.0")] \ No newline at end of file From 9d32db4c5a33476e9947d626b5b5f79f15d41ba1 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Wed, 4 May 2016 23:46:20 +0200 Subject: [PATCH 02/11] global.json fix --- GeekLearning.Storage.sln | 2 -- global.json | 3 +++ src/GeekLearning.FileSystem/global.json | 5 ----- src/GeekLearning.Storage/global.json | 5 ----- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 src/GeekLearning.FileSystem/global.json delete mode 100644 src/GeekLearning.Storage/global.json diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln index 8a206c7..97be50a 100644 --- a/GeekLearning.Storage.sln +++ b/GeekLearning.Storage.sln @@ -11,8 +11,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSy EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FFFDF8A8-A519-481E-8A4B-6AE80D3E950D}" ProjectSection(SolutionItems) = preProject - src\GeekLearning.Storage\global.json = src\GeekLearning.Storage\global.json - src\GeekLearning.FileSystem\global.json = src\GeekLearning.FileSystem\global.json global.json = global.json EndProjectSection EndProject diff --git a/global.json b/global.json index 0ddf69c..5bac986 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { + "sdk": { + "version": "1.0.0-rc1-final" + }, "projects": [ "src" ] } \ No newline at end of file diff --git a/src/GeekLearning.FileSystem/global.json b/src/GeekLearning.FileSystem/global.json deleted file mode 100644 index 62f0043..0000000 --- a/src/GeekLearning.FileSystem/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-rc1-update1" - } -} diff --git a/src/GeekLearning.Storage/global.json b/src/GeekLearning.Storage/global.json deleted file mode 100644 index 62f0043..0000000 --- a/src/GeekLearning.Storage/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-rc1-update1" - } -} From 391ca47b5e01c79b15e92575ecf510a10b9baef2 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Wed, 4 May 2016 23:49:38 +0200 Subject: [PATCH 03/11] fix global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 5bac986..2613181 100644 --- a/global.json +++ b/global.json @@ -2,5 +2,5 @@ "sdk": { "version": "1.0.0-rc1-final" }, - "projects": [ "src" ] + "projects": [ "src", "samples" ] } \ No newline at end of file From d2ac3b4ac15314e40619eaa3ab58f3bf761dd2cc Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 5 May 2016 00:02:03 +0200 Subject: [PATCH 04/11] fix layout and relax versions --- GeekLearning.Storage.sln | 20 +++++++++---------- .../project.json | 4 ++-- .../AzureStorageManagerOptions.cs | 0 .../AzureStorageProvider.cs | 0 .../AzureStore.cs | 0 .../GeekLearning.Storage.Azure.nuspec | 0 .../GeekLearning.Storage.Azure.xproj | 0 .../GeekLearningAzureStorageExtensions.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../project.json | 2 +- .../FileSystemStorageProvider.cs | 0 .../FileSystemStore.cs | 0 .../GeekLearning.FileSystem.nuspec | 0 .../GeekLearning.Storage.FileSystem.xproj | 0 ...GeekLearningFileSystemStorageExtensions.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../project.json | 2 +- 17 files changed, 14 insertions(+), 14 deletions(-) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/AzureStorageManagerOptions.cs (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/AzureStorageProvider.cs (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/AzureStore.cs (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/GeekLearning.Storage.Azure.nuspec (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/GeekLearning.Storage.Azure.xproj (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/GeekLearningAzureStorageExtensions.cs (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/Properties/AssemblyInfo.cs (100%) rename src/{GeekLearning.Azure => GeekLearning.Storage.Azure}/project.json (96%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/FileSystemStorageProvider.cs (100%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/FileSystemStore.cs (100%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/GeekLearning.FileSystem.nuspec (100%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/GeekLearning.Storage.FileSystem.xproj (100%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/GeekLearningFileSystemStorageExtensions.cs (100%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/Properties/AssemblyInfo.cs (100%) rename src/{GeekLearning.FileSystem => GeekLearning.Storage.FileSystem}/project.json (96%) diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln index 97be50a..ffb920d 100644 --- a/GeekLearning.Storage.sln +++ b/GeekLearning.Storage.sln @@ -3,35 +3,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.Azure", "src\GeekLearning.Azure\GeekLearning.Storage.Azure.xproj", "{FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage", "src\GeekLearning.Storage\GeekLearning.Storage.xproj", "{1F419C53-73C6-4460-B284-6A49AE41C596}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSystem", "src\GeekLearning.FileSystem\GeekLearning.Storage.FileSystem.xproj", "{4A12B042-76B3-471B-9235-F653E1ABE3C0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FFFDF8A8-A519-481E-8A4B-6AE80D3E950D}" ProjectSection(SolutionItems) = preProject global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "samples\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}" -EndProject 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 +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSystem", "src\GeekLearning.Storage.FileSystem\GeekLearning.Storage.FileSystem.xproj", "{4A12B042-76B3-471B-9235-F653E1ABE3C0}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "samples\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Release|Any CPU.Build.0 = Release|Any CPU {1F419C53-73C6-4460-B284-6A49AE41C596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F419C53-73C6-4460-B284-6A49AE41C596}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F419C53-73C6-4460-B284-6A49AE41C596}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F419C53-73C6-4460-B284-6A49AE41C596}.Release|Any CPU.Build.0 = Release|Any CPU + {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}.Release|Any CPU.Build.0 = Release|Any CPU {4A12B042-76B3-471B-9235-F653E1ABE3C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A12B042-76B3-471B-9235-F653E1ABE3C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A12B042-76B3-471B-9235-F653E1ABE3C0}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/samples/GeekLearning.Storage.BasicSample/project.json b/samples/GeekLearning.Storage.BasicSample/project.json index d509d04..3a806db 100644 --- a/samples/GeekLearning.Storage.BasicSample/project.json +++ b/samples/GeekLearning.Storage.BasicSample/project.json @@ -5,8 +5,8 @@ }, "dependencies": { - "GeekLearning.Azure": "1.0.0-*", - "GeekLearning.FileSystem": "1.0.0-*", + "GeekLearning.Storage.Azure": "*", + "GeekLearning.Storage.FileSystem": "*", "GeekLearning.Storage": "1.0.0-*", "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final", "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", diff --git a/src/GeekLearning.Azure/AzureStorageManagerOptions.cs b/src/GeekLearning.Storage.Azure/AzureStorageManagerOptions.cs similarity index 100% rename from src/GeekLearning.Azure/AzureStorageManagerOptions.cs rename to src/GeekLearning.Storage.Azure/AzureStorageManagerOptions.cs diff --git a/src/GeekLearning.Azure/AzureStorageProvider.cs b/src/GeekLearning.Storage.Azure/AzureStorageProvider.cs similarity index 100% rename from src/GeekLearning.Azure/AzureStorageProvider.cs rename to src/GeekLearning.Storage.Azure/AzureStorageProvider.cs diff --git a/src/GeekLearning.Azure/AzureStore.cs b/src/GeekLearning.Storage.Azure/AzureStore.cs similarity index 100% rename from src/GeekLearning.Azure/AzureStore.cs rename to src/GeekLearning.Storage.Azure/AzureStore.cs diff --git a/src/GeekLearning.Azure/GeekLearning.Storage.Azure.nuspec b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.nuspec similarity index 100% rename from src/GeekLearning.Azure/GeekLearning.Storage.Azure.nuspec rename to src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.nuspec diff --git a/src/GeekLearning.Azure/GeekLearning.Storage.Azure.xproj b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj similarity index 100% rename from src/GeekLearning.Azure/GeekLearning.Storage.Azure.xproj rename to src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj diff --git a/src/GeekLearning.Azure/GeekLearningAzureStorageExtensions.cs b/src/GeekLearning.Storage.Azure/GeekLearningAzureStorageExtensions.cs similarity index 100% rename from src/GeekLearning.Azure/GeekLearningAzureStorageExtensions.cs rename to src/GeekLearning.Storage.Azure/GeekLearningAzureStorageExtensions.cs diff --git a/src/GeekLearning.Azure/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage.Azure/Properties/AssemblyInfo.cs similarity index 100% rename from src/GeekLearning.Azure/Properties/AssemblyInfo.cs rename to src/GeekLearning.Storage.Azure/Properties/AssemblyInfo.cs diff --git a/src/GeekLearning.Azure/project.json b/src/GeekLearning.Storage.Azure/project.json similarity index 96% rename from src/GeekLearning.Azure/project.json rename to src/GeekLearning.Storage.Azure/project.json index a4983ac..4f1a624 100644 --- a/src/GeekLearning.Azure/project.json +++ b/src/GeekLearning.Storage.Azure/project.json @@ -6,7 +6,7 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "GeekLearning.Storage": "1.0.0-*", + "GeekLearning.Storage": "*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", "WindowsAzure.Storage": "6.2.2-preview" diff --git a/src/GeekLearning.FileSystem/FileSystemStorageProvider.cs b/src/GeekLearning.Storage.FileSystem/FileSystemStorageProvider.cs similarity index 100% rename from src/GeekLearning.FileSystem/FileSystemStorageProvider.cs rename to src/GeekLearning.Storage.FileSystem/FileSystemStorageProvider.cs diff --git a/src/GeekLearning.FileSystem/FileSystemStore.cs b/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs similarity index 100% rename from src/GeekLearning.FileSystem/FileSystemStore.cs rename to src/GeekLearning.Storage.FileSystem/FileSystemStore.cs diff --git a/src/GeekLearning.FileSystem/GeekLearning.FileSystem.nuspec b/src/GeekLearning.Storage.FileSystem/GeekLearning.FileSystem.nuspec similarity index 100% rename from src/GeekLearning.FileSystem/GeekLearning.FileSystem.nuspec rename to src/GeekLearning.Storage.FileSystem/GeekLearning.FileSystem.nuspec diff --git a/src/GeekLearning.FileSystem/GeekLearning.Storage.FileSystem.xproj b/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.xproj similarity index 100% rename from src/GeekLearning.FileSystem/GeekLearning.Storage.FileSystem.xproj rename to src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.xproj diff --git a/src/GeekLearning.FileSystem/GeekLearningFileSystemStorageExtensions.cs b/src/GeekLearning.Storage.FileSystem/GeekLearningFileSystemStorageExtensions.cs similarity index 100% rename from src/GeekLearning.FileSystem/GeekLearningFileSystemStorageExtensions.cs rename to src/GeekLearning.Storage.FileSystem/GeekLearningFileSystemStorageExtensions.cs diff --git a/src/GeekLearning.FileSystem/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage.FileSystem/Properties/AssemblyInfo.cs similarity index 100% rename from src/GeekLearning.FileSystem/Properties/AssemblyInfo.cs rename to src/GeekLearning.Storage.FileSystem/Properties/AssemblyInfo.cs diff --git a/src/GeekLearning.FileSystem/project.json b/src/GeekLearning.Storage.FileSystem/project.json similarity index 96% rename from src/GeekLearning.FileSystem/project.json rename to src/GeekLearning.Storage.FileSystem/project.json index 8d2e5e0..6ad962f 100644 --- a/src/GeekLearning.FileSystem/project.json +++ b/src/GeekLearning.Storage.FileSystem/project.json @@ -27,7 +27,7 @@ } }, "dependencies": { - "GeekLearning.Storage": "1.0.0-*", + "GeekLearning.Storage": "*", "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final" } From 2d9ee2dd4b24b245e8bb9e9bdb59c90f3e8ede7d Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 5 May 2016 00:13:36 +0200 Subject: [PATCH 05/11] change version placeholder --- samples/GeekLearning.Storage.BasicSample/project.json | 8 ++++---- src/GeekLearning.Storage.Azure/project.json | 4 ++-- src/GeekLearning.Storage.FileSystem/project.json | 4 ++-- src/GeekLearning.Storage/project.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/GeekLearning.Storage.BasicSample/project.json b/samples/GeekLearning.Storage.BasicSample/project.json index 3a806db..1c72399 100644 --- a/samples/GeekLearning.Storage.BasicSample/project.json +++ b/samples/GeekLearning.Storage.BasicSample/project.json @@ -1,13 +1,13 @@ { - "version": "1.0.0-*", + "version": "0.0.1-*", "compilationOptions": { "emitEntryPoint": true }, "dependencies": { - "GeekLearning.Storage.Azure": "*", - "GeekLearning.Storage.FileSystem": "*", - "GeekLearning.Storage": "1.0.0-*", + "GeekLearning.Storage": "0.0.1-*", + "GeekLearning.Storage.Azure": "0.0.1-*", + "GeekLearning.Storage.FileSystem": "0.0.1-*", "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final", "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final", diff --git a/src/GeekLearning.Storage.Azure/project.json b/src/GeekLearning.Storage.Azure/project.json index 4f1a624..5edce38 100644 --- a/src/GeekLearning.Storage.Azure/project.json +++ b/src/GeekLearning.Storage.Azure/project.json @@ -1,12 +1,12 @@ { - "version": "1.0.0-*", + "version": "0.0.1-*", "description": "GeekLearning.Storage.Azure Class Library", "authors": [ "autex" ], "tags": [ "" ], "projectUrl": "", "licenseUrl": "", "dependencies": { - "GeekLearning.Storage": "*", + "GeekLearning.Storage": "0.0.1-*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", "WindowsAzure.Storage": "6.2.2-preview" diff --git a/src/GeekLearning.Storage.FileSystem/project.json b/src/GeekLearning.Storage.FileSystem/project.json index 6ad962f..a7e2640 100644 --- a/src/GeekLearning.Storage.FileSystem/project.json +++ b/src/GeekLearning.Storage.FileSystem/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "0.0.1-*", "description": "GeekLearning.Storage.FileSystem Class Library", "authors": [ "autex" ], "tags": [ "" ], @@ -27,7 +27,7 @@ } }, "dependencies": { - "GeekLearning.Storage": "*", + "GeekLearning.Storage": "0.0.1-*", "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final" } diff --git a/src/GeekLearning.Storage/project.json b/src/GeekLearning.Storage/project.json index b4bdbdd..653e8a3 100644 --- a/src/GeekLearning.Storage/project.json +++ b/src/GeekLearning.Storage/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "0.0.1-*", "description": "GeekLearning.Storage Class Library", "authors": [ "autex" ], "tags": [ "" ], From 9708495e79d30b94d9aa092ccb93ccb0bbebb867 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 5 May 2016 00:18:57 +0200 Subject: [PATCH 06/11] move samples --- GeekLearning.Storage.sln | 2 +- .../Controllers/ValuesController.cs | 0 .../GeekLearning.Storage.BasicSample.xproj | 0 .../GeekLearning.Storage.BasicSample/Project_Readme.html | 0 .../Properties/launchSettings.json | 0 {samples => src}/GeekLearning.Storage.BasicSample/Startup.cs | 0 .../GeekLearning.Storage.BasicSample/Templates/json.json | 0 .../GeekLearning.Storage.BasicSample/TemplatesStore.cs | 0 .../GeekLearning.Storage.BasicSample/appsettings.json | 0 {samples => src}/GeekLearning.Storage.BasicSample/project.json | 0 .../GeekLearning.Storage.BasicSample/wwwroot/web.config | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename {samples => src}/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/Project_Readme.html (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/Properties/launchSettings.json (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/Startup.cs (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/Templates/json.json (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/TemplatesStore.cs (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/appsettings.json (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/project.json (100%) rename {samples => src}/GeekLearning.Storage.BasicSample/wwwroot/web.config (100%) diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln index ffb920d..41a94fe 100644 --- a/GeekLearning.Storage.sln +++ b/GeekLearning.Storage.sln @@ -16,7 +16,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.Azure" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSystem", "src\GeekLearning.Storage.FileSystem\GeekLearning.Storage.FileSystem.xproj", "{4A12B042-76B3-471B-9235-F653E1ABE3C0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "samples\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "src\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs b/src/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs rename to src/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs diff --git a/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj b/src/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj rename to src/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj diff --git a/samples/GeekLearning.Storage.BasicSample/Project_Readme.html b/src/GeekLearning.Storage.BasicSample/Project_Readme.html similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/Project_Readme.html rename to src/GeekLearning.Storage.BasicSample/Project_Readme.html diff --git a/samples/GeekLearning.Storage.BasicSample/Properties/launchSettings.json b/src/GeekLearning.Storage.BasicSample/Properties/launchSettings.json similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/Properties/launchSettings.json rename to src/GeekLearning.Storage.BasicSample/Properties/launchSettings.json diff --git a/samples/GeekLearning.Storage.BasicSample/Startup.cs b/src/GeekLearning.Storage.BasicSample/Startup.cs similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/Startup.cs rename to src/GeekLearning.Storage.BasicSample/Startup.cs diff --git a/samples/GeekLearning.Storage.BasicSample/Templates/json.json b/src/GeekLearning.Storage.BasicSample/Templates/json.json similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/Templates/json.json rename to src/GeekLearning.Storage.BasicSample/Templates/json.json diff --git a/samples/GeekLearning.Storage.BasicSample/TemplatesStore.cs b/src/GeekLearning.Storage.BasicSample/TemplatesStore.cs similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/TemplatesStore.cs rename to src/GeekLearning.Storage.BasicSample/TemplatesStore.cs diff --git a/samples/GeekLearning.Storage.BasicSample/appsettings.json b/src/GeekLearning.Storage.BasicSample/appsettings.json similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/appsettings.json rename to src/GeekLearning.Storage.BasicSample/appsettings.json diff --git a/samples/GeekLearning.Storage.BasicSample/project.json b/src/GeekLearning.Storage.BasicSample/project.json similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/project.json rename to src/GeekLearning.Storage.BasicSample/project.json diff --git a/samples/GeekLearning.Storage.BasicSample/wwwroot/web.config b/src/GeekLearning.Storage.BasicSample/wwwroot/web.config similarity index 100% rename from samples/GeekLearning.Storage.BasicSample/wwwroot/web.config rename to src/GeekLearning.Storage.BasicSample/wwwroot/web.config From 33b41e8c5464a502dd94b226922ff3cf70e0310b Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 5 May 2016 01:28:10 +0200 Subject: [PATCH 07/11] remove token replacements as they don't match the build system --- .../GeekLearning.Storage.Azure.nuspec | 6 +++--- .../GeekLearning.FileSystem.nuspec | 6 +++--- src/GeekLearning.Storage/GeekLearning.Storage.nuspec | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.nuspec b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.nuspec index 0762102..f38495c 100644 --- a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.nuspec +++ b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.nuspec @@ -3,9 +3,9 @@ GeekLearning.Storage.Azure $version$ - $author$ - $author$ - $description$ + Geek Learning + Geek Learning + Geek Learning Azure Storage Provider false diff --git a/src/GeekLearning.Storage.FileSystem/GeekLearning.FileSystem.nuspec b/src/GeekLearning.Storage.FileSystem/GeekLearning.FileSystem.nuspec index 5bd2527..b8b1886 100644 --- a/src/GeekLearning.Storage.FileSystem/GeekLearning.FileSystem.nuspec +++ b/src/GeekLearning.Storage.FileSystem/GeekLearning.FileSystem.nuspec @@ -3,9 +3,9 @@ GeekLearning.Storage.FileSystem $version$ - $author$ - $author$ - $description$ + Geek Learning + Geek Learning + Geek Learning FileSystem Storage Provider false diff --git a/src/GeekLearning.Storage/GeekLearning.Storage.nuspec b/src/GeekLearning.Storage/GeekLearning.Storage.nuspec index c6520e9..06e184c 100644 --- a/src/GeekLearning.Storage/GeekLearning.Storage.nuspec +++ b/src/GeekLearning.Storage/GeekLearning.Storage.nuspec @@ -3,9 +3,9 @@ GeekLearning.Storage $version$ - $author$ - $author$ - $description$ + Geek Learning + Geek Learning + Geek Learning Storage abstraction false From 5807b39ec8cca96bcc6dbb70378af6c25f7dc901 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 5 May 2016 02:29:13 +0200 Subject: [PATCH 08/11] activate produce output on build --- .../GeekLearning.Storage.Azure.xproj | 7 ++++--- src/GeekLearning.Storage/GeekLearning.Storage.xproj | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj index 481039f..8732985 100644 --- a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj +++ b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj @@ -4,7 +4,6 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - fd8bb8f9-9af5-4c12-b962-9e08c30b01e2 @@ -12,9 +11,11 @@ ..\artifacts\obj\$(MSBuildProjectName) ..\artifacts\bin\$(MSBuildProjectName)\ - 2.0 + + True + - + \ No newline at end of file diff --git a/src/GeekLearning.Storage/GeekLearning.Storage.xproj b/src/GeekLearning.Storage/GeekLearning.Storage.xproj index 5eb4fd1..ce459e9 100644 --- a/src/GeekLearning.Storage/GeekLearning.Storage.xproj +++ b/src/GeekLearning.Storage/GeekLearning.Storage.xproj @@ -14,5 +14,8 @@ 2.0 + + True + \ No newline at end of file From 9853476069528c7173fe7de11c406d2bc2379cb0 Mon Sep 17 00:00:00 2001 From: Cyprien Autexier Date: Thu, 5 May 2016 18:05:09 +0200 Subject: [PATCH 09/11] relax version --- src/GeekLearning.Storage.Azure/project.json | 2 +- src/GeekLearning.Storage.BasicSample/project.json | 6 +++--- src/GeekLearning.Storage.FileSystem/project.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GeekLearning.Storage.Azure/project.json b/src/GeekLearning.Storage.Azure/project.json index 5edce38..e61d766 100644 --- a/src/GeekLearning.Storage.Azure/project.json +++ b/src/GeekLearning.Storage.Azure/project.json @@ -6,7 +6,7 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "GeekLearning.Storage": "0.0.1-*", + "GeekLearning.Storage": "", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", "WindowsAzure.Storage": "6.2.2-preview" diff --git a/src/GeekLearning.Storage.BasicSample/project.json b/src/GeekLearning.Storage.BasicSample/project.json index 1c72399..2849acb 100644 --- a/src/GeekLearning.Storage.BasicSample/project.json +++ b/src/GeekLearning.Storage.BasicSample/project.json @@ -5,9 +5,9 @@ }, "dependencies": { - "GeekLearning.Storage": "0.0.1-*", - "GeekLearning.Storage.Azure": "0.0.1-*", - "GeekLearning.Storage.FileSystem": "0.0.1-*", + "GeekLearning.Storage": "", + "GeekLearning.Storage.Azure": "", + "GeekLearning.Storage.FileSystem": "", "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final", "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final", diff --git a/src/GeekLearning.Storage.FileSystem/project.json b/src/GeekLearning.Storage.FileSystem/project.json index a7e2640..cdc60c4 100644 --- a/src/GeekLearning.Storage.FileSystem/project.json +++ b/src/GeekLearning.Storage.FileSystem/project.json @@ -27,7 +27,7 @@ } }, "dependencies": { - "GeekLearning.Storage": "0.0.1-*", + "GeekLearning.Storage": "", "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final" } From cdb405bf4199438949d6936906ecdcee8d2c23b0 Mon Sep 17 00:00:00 2001 From: Sandor Date: Fri, 6 May 2016 12:32:58 +0200 Subject: [PATCH 10/11] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 699b8f3..2e0c97f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ # gl-dotnet-storage Coming Soon! + +#Storage Abstraction + +#FileSystem provider + +#Azure blob provider From 9f41fe9444a9814cc5cb19b2e63d8c5550b00d16 Mon Sep 17 00:00:00 2001 From: Sandor Date: Fri, 6 May 2016 12:44:59 +0200 Subject: [PATCH 11/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2e0c97f..88621ef 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +![](https://geeklearning.visualstudio.com/_apis/public/build/definitions/f841b266-7595-4d01-9ee1-4864cf65aa73/5/badge) # gl-dotnet-storage Coming Soon!