diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln
index 1c39f88..aa1ace3 100644
--- a/GeekLearning.Storage.sln
+++ b/GeekLearning.Storage.sln
@@ -1,18 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.10
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}"
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", "{63416AEA-DA51-4D62-B566-DB7D9BC800DC}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2DAF5EF9-8F8E-4C51-BE2D-8D63CA143360}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{6BEB33C6-FA17-4F58-ACC3-83C1EB28B604}"
@@ -20,18 +12,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{6BEB33C6
.gitattributes = .gitattributes
.gitignore = .gitignore
GitVersion.yml = GitVersion.yml
- global.json = global.json
LICENSE.md = LICENSE.md
README.md = README.md
EndProjectSection
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
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.Integration.Test", "tests\GeekLearning.Storage.Integration.Test\GeekLearning.Storage.Integration.Test.xproj", "{590B21B0-2AFA-4329-82AD-EF180C50EB5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage", "src\GeekLearning.Storage\GeekLearning.Storage.csproj", "{1F419C53-73C6-4460-B284-6A49AE41C596}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage.Azure", "src\GeekLearning.Storage.Azure\GeekLearning.Storage.Azure.csproj", "{FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage.FileSystem", "src\GeekLearning.Storage.FileSystem\GeekLearning.Storage.FileSystem.csproj", "{4A12B042-76B3-471B-9235-F653E1ABE3C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage.BasicSample", "samples\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.csproj", "{63416AEA-DA51-4D62-B566-DB7D9BC800DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage.FileSystem.Server", "src\GeekLearning.Storage.FileSystem.Server\GeekLearning.Storage.FileSystem.Server.csproj", "{9D94CD6C-9451-449A-BED2-1C07D624A8E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage.Integration.Test", "tests\GeekLearning.Storage.Integration.Test\GeekLearning.Storage.Integration.Test.csproj", "{590B21B0-2AFA-4329-82AD-EF180C50EB5C}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem", "src\GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem\GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.xproj", "{8C02EBBE-9EC8-4F47-9464-5A94BDE25A8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem", "src\GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem\GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.csproj", "{8C02EBBE-9EC8-4F47-9464-5A94BDE25A8F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/global.json b/global.json
deleted file mode 100644
index 65e97c5..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "projects": [ "src", "tests", "samples" ],
- "sdk": {
- "version": "1.0.0-preview2-1-003177"
- }
-}
\ No newline at end of file
diff --git a/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.csproj b/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.csproj
new file mode 100644
index 0000000..d9d597a
--- /dev/null
+++ b/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.csproj
@@ -0,0 +1,40 @@
+
+
+
+ netcoreapp1.1
+ true
+ GeekLearning.Storage.BasicSample
+ Exe
+ GeekLearning.Storage.BasicSample
+ 1.1.1
+ $(PackageTargetFallback);portable-net45+win8
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj b/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj
deleted file mode 100644
index 1a43cd3..0000000
--- a/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 63416aea-da51-4d62-b566-db7d9bc800dc
- GeekLearning.Storage.BasicSample
- .\obj
- .\bin\
- v4.5.2
-
-
- 2.0
-
-
-
diff --git a/samples/GeekLearning.Storage.BasicSample/project.json b/samples/GeekLearning.Storage.BasicSample/project.json
deleted file mode 100644
index cb6d25b..0000000
--- a/samples/GeekLearning.Storage.BasicSample/project.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.1.0",
- "type": "platform"
- },
- "Microsoft.AspNetCore.Mvc": "1.1.0",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
- "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0",
- "Microsoft.Extensions.Configuration.Json": "1.1.0",
- "Microsoft.Extensions.Logging": "1.1.0",
- "Microsoft.Extensions.Logging.Console": "1.1.0",
- "Microsoft.Extensions.Logging.Debug": "1.1.0",
- "Microsoft.Extensions.Options": "1.1.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
-
- "GeekLearning.Storage": "*",
- "GeekLearning.Storage.Azure": "*",
- "GeekLearning.Storage.FileSystem": "*",
- "GeekLearning.Storage.FileSystem.Server": "*"
- },
-
- "tools": {
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
- },
-
- "frameworks": {
- "netcoreapp1.1": {
- "imports": [
- "portable-net45+win8"
- ]
- }
- },
-
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
-
- "runtimeOptions": {
- "configProperties": {
- "System.GC.Server": true
- }
- },
-
- "publishOptions": {
- "include": [
- "wwwroot",
- "Views",
- "appsettings.json",
- "web.config",
- "Templates"
- ]
- },
-
- "scripts": {
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}
diff --git a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj
new file mode 100644
index 0000000..9165231
--- /dev/null
+++ b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj
@@ -0,0 +1,34 @@
+
+
+
+ Azure Storage Provider for Geek Learning Storage Abstractions.
+ 0.0.1
+ Geek Learning;Cyprien Autexier;Adrien Siffermann
+ net45;netstandard1.3
+ GeekLearning.Storage.Azure
+ GeekLearning.Storage.Azure
+ 1.6.1
+ $(PackageTargetFallback);portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj
deleted file mode 100644
index 7a8c151..0000000
--- a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- fd8bb8f9-9af5-4c12-b962-9e08c30b01e2
- GeekLearning.Storage.Azure
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/src/GeekLearning.Storage.Azure/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage.Azure/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0b37cfb..0000000
--- a/src/GeekLearning.Storage.Azure/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GeekLearning.Storage.Azure")]
-[assembly: AssemblyDescription("Azure Storage Provider for Geek Learning Storage Abstractions.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Geek Learning")]
-[assembly: AssemblyProduct("GeekLearning.Storage")]
-[assembly: AssemblyCopyright("Copyright © Geek Learning 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fd8bb8f9-9af5-4c12-b962-9e08c30b01e2")]
diff --git a/src/GeekLearning.Storage.Azure/project.json b/src/GeekLearning.Storage.Azure/project.json
deleted file mode 100644
index 9fc3c0a..0000000
--- a/src/GeekLearning.Storage.Azure/project.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "version": "0.0.1-*",
- "description": "Azure Storage Provider for Geek Learning Storage Abstractions.",
- "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
- "packOptions": {
- "tags": [],
- "projectUrl": "",
- "licenseUrl": ""
- },
-
- "dependencies": {
- "NETStandard.Library": "1.6.1",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0",
- "Microsoft.Extensions.Options": "1.1.0",
- "Microsoft.Extensions.FileSystemGlobbing": "1.1.0",
-
- "WindowsAzure.Storage": "8.0.0",
-
- "GeekLearning.Storage": "*"
- },
-
- "frameworks": {
- "net45": {},
- "netstandard1.3": {
- "imports": [
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/FileSystemExtendedPropertiesExtensions.cs b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/FileSystemExtendedPropertiesExtensions.cs
index 5d489bd..a124b75 100644
--- a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/FileSystemExtendedPropertiesExtensions.cs
+++ b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/FileSystemExtendedPropertiesExtensions.cs
@@ -8,9 +8,14 @@
public static class FileSystemExtendedPropertiesExtensions
{
- public static IServiceCollection AddFileSystemExtendedProperties(this IServiceCollection services, Action configure)
+ public static IServiceCollection AddFileSystemExtendedProperties(this IServiceCollection services, Action configure = null)
{
- services.Configure(configure);
+ if (configure == null)
+ {
+ configure = o => { };
+ }
+
+ services.Configure(configure);
services.AddTransient();
return services;
}
diff --git a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.csproj b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.csproj
new file mode 100644
index 0000000..4aac9ec
--- /dev/null
+++ b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.csproj
@@ -0,0 +1,33 @@
+
+
+
+ File System based extended properties storage provider for the FileSystem provider.
+ 0.0.1
+ Geek Learning;Adrien Siffermann;Cyprien Autexier
+ net45;netstandard1.3
+ GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem
+ GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem
+ 1.6.1
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.xproj b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.xproj
deleted file mode 100644
index 7354067..0000000
--- a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 8c02ebbe-9ec8-4f47-9464-5a94bde25a8f
- GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem
- .\obj
- .\bin\
- v4.6.2
-
-
-
- 2.0
-
-
-
diff --git a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6c872e6..0000000
--- a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8c02ebbe-9ec8-4f47-9464-5a94bde25a8f")]
diff --git a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/project.json b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/project.json
deleted file mode 100644
index af100df..0000000
--- a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/project.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "version": "0.0.1-*",
- "description": "File System based extended properties storage provider for the FileSystem provider.",
- "authors": [ "Geek Learning", "Adrien Siffermann", "Cyprien Autexier" ],
- "packOptions": {
- "tags": [],
- "projectUrl": "",
- "licenseUrl": ""
- },
-
- "dependencies": {
- "NETStandard.Library": "1.6.1",
- "Newtonsoft.Json": "9.0.1",
-
- "GeekLearning.Storage.FileSystem": "*"
- },
-
- "frameworks": {
- "net45": {},
- "netstandard1.3": {}
- }
-}
diff --git a/src/GeekLearning.Storage.FileSystem.Server/GeekLearning.Storage.FileSystem.Server.csproj b/src/GeekLearning.Storage.FileSystem.Server/GeekLearning.Storage.FileSystem.Server.csproj
new file mode 100644
index 0000000..d82a11c
--- /dev/null
+++ b/src/GeekLearning.Storage.FileSystem.Server/GeekLearning.Storage.FileSystem.Server.csproj
@@ -0,0 +1,32 @@
+
+
+
+ Geek Learning File Server based on FileSystem Storage Provider.
+ 0.0.1
+ Geek Learning;Cyprien Autexier;Adrien Siffermann
+ net451;netstandard1.4
+ GeekLearning.Storage.FileSystem.Server
+ GeekLearning.Storage.FileSystem.Server
+ 1.6.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GeekLearning.Storage.FileSystem.Server/GeekLearning.Storage.FileSystem.Server.xproj b/src/GeekLearning.Storage.FileSystem.Server/GeekLearning.Storage.FileSystem.Server.xproj
deleted file mode 100644
index c90d136..0000000
--- a/src/GeekLearning.Storage.FileSystem.Server/GeekLearning.Storage.FileSystem.Server.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 9d94cd6c-9451-449a-bed2-1c07d624a8e0
- GeekLearning.Storage.FileSystem.Server
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/src/GeekLearning.Storage.FileSystem.Server/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage.FileSystem.Server/Properties/AssemblyInfo.cs
deleted file mode 100644
index f86cb40..0000000
--- a/src/GeekLearning.Storage.FileSystem.Server/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GeekLearning.Storage.FileSystem.Server")]
-[assembly: AssemblyDescription("Geek Learning File Server based on FileSystem Storage Provider.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Geek Learning")]
-[assembly: AssemblyProduct("GeekLearning.Storage")]
-[assembly: AssemblyCopyright("Copyright © Geek Learning 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9d94cd6c-9451-449a-bed2-1c07d624a8e0")]
diff --git a/src/GeekLearning.Storage.FileSystem.Server/project.json b/src/GeekLearning.Storage.FileSystem.Server/project.json
deleted file mode 100644
index a809676..0000000
--- a/src/GeekLearning.Storage.FileSystem.Server/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "version": "0.0.1-*",
- "description": "Geek Learning File Server based on FileSystem Storage Provider.",
- "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
- "packOptions": {
- "tags": [],
- "projectUrl": "",
- "licenseUrl": ""
- },
-
- "dependencies": {
- "NETStandard.Library": "1.6.1",
- "Microsoft.AspNetCore.Http.Abstractions": "1.1.0",
- "Microsoft.Extensions.Logging.Abstractions": "1.1.0",
- "Microsoft.IdentityModel.Tokens": "5.1.0",
-
- "GeekLearning.Storage.FileSystem": "*"
- },
-
- "frameworks": {
- "net451": {},
- "netstandard1.4": {}
- }
-}
diff --git a/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.csproj b/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.csproj
new file mode 100644
index 0000000..24c0baa
--- /dev/null
+++ b/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.csproj
@@ -0,0 +1,32 @@
+
+
+
+ FileSystem Provider for Geek Learning Storage Abstractions.
+ 0.0.1
+ Geek Learning;Cyprien Autexier;Adrien Siffermann
+ net45;netstandard1.3
+ GeekLearning.Storage.FileSystem
+ GeekLearning.Storage.FileSystem
+ 1.6.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.xproj b/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.xproj
deleted file mode 100644
index 97fe046..0000000
--- a/src/GeekLearning.Storage.FileSystem/GeekLearning.Storage.FileSystem.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 4a12b042-76b3-471b-9235-f653e1abe3c0
- GeekLearning.Storage.FileSystem
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/src/GeekLearning.Storage.FileSystem/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage.FileSystem/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4d9786a..0000000
--- a/src/GeekLearning.Storage.FileSystem/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GeekLearning.Storage.FileSystem")]
-[assembly: AssemblyDescription("Geek Learning FileSystem Storage Provider")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Geek Learning")]
-[assembly: AssemblyProduct("GeekLearning.Storage")]
-[assembly: AssemblyCopyright("Copyright © Geek Learning 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4a12b042-76b3-471b-9235-f653e1abe3c0")]
diff --git a/src/GeekLearning.Storage.FileSystem/project.json b/src/GeekLearning.Storage.FileSystem/project.json
deleted file mode 100644
index e708da4..0000000
--- a/src/GeekLearning.Storage.FileSystem/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "version": "0.0.1-*",
- "description": "FileSystem Provider for Geek Learning Storage Abstractions.",
- "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
- "packOptions": {
- "tags": [],
- "projectUrl": "",
- "licenseUrl": ""
- },
-
- "dependencies": {
- "NETStandard.Library": "1.6.1",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0",
- "Microsoft.Extensions.Options": "1.1.0",
- "Microsoft.Extensions.FileSystemGlobbing": "1.1.0",
-
- "GeekLearning.Storage": "*"
- },
-
- "frameworks": {
- "net45": {},
- "netstandard1.3": {}
- }
-}
diff --git a/src/GeekLearning.Storage/GeekLearning.Storage.csproj b/src/GeekLearning.Storage/GeekLearning.Storage.csproj
new file mode 100644
index 0000000..e61058f
--- /dev/null
+++ b/src/GeekLearning.Storage/GeekLearning.Storage.csproj
@@ -0,0 +1,22 @@
+
+
+
+ File Storage abstractions with providers.
+ 0.0.1
+ Geek Learning;Cyprien Autexier;Adrien Siffermann
+ netstandard1.1
+ GeekLearning.Storage
+ GeekLearning.Storage
+ 1.6.1
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GeekLearning.Storage/GeekLearning.Storage.xproj b/src/GeekLearning.Storage/GeekLearning.Storage.xproj
deleted file mode 100644
index a5570c8..0000000
--- a/src/GeekLearning.Storage/GeekLearning.Storage.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 1f419c53-73c6-4460-b284-6a49ae41c596
- GeekLearning.Storage
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/src/GeekLearning.Storage/Properties/AssemblyInfo.cs b/src/GeekLearning.Storage/Properties/AssemblyInfo.cs
deleted file mode 100644
index 82a6b4c..0000000
--- a/src/GeekLearning.Storage/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GeekLearning.Storage")]
-[assembly: AssemblyDescription("File Storage abstractions with providers.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Geek Learning")]
-[assembly: AssemblyProduct("GeekLearning.Storage")]
-[assembly: AssemblyCopyright("Copyright © Geek Learning 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1f419c53-73c6-4460-b284-6a49ae41c596")]
diff --git a/src/GeekLearning.Storage/project.json b/src/GeekLearning.Storage/project.json
deleted file mode 100644
index e8a24b8..0000000
--- a/src/GeekLearning.Storage/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": "0.0.1-*",
- "description": "File Storage abstractions with providers.",
- "authors": [ "Geek Learning", "Cyprien Autexier", "Adrien Siffermann" ],
- "packOptions": {
- "tags": [],
- "projectUrl": "",
- "licenseUrl": ""
- },
-
- "dependencies": {
- "NETStandard.Library": "1.6.1",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0",
- "Microsoft.Extensions.Options": "1.1.0"
- },
-
- "frameworks": {
- "netstandard1.1": {}
- }
-}
diff --git a/tests/GeekLearning.Storage.Integration.Test/GeekLearning.Storage.Integration.Test.csproj b/tests/GeekLearning.Storage.Integration.Test/GeekLearning.Storage.Integration.Test.csproj
new file mode 100644
index 0000000..9dd8e42
--- /dev/null
+++ b/tests/GeekLearning.Storage.Integration.Test/GeekLearning.Storage.Integration.Test.csproj
@@ -0,0 +1,53 @@
+
+
+
+ netcoreapp1.0;net451
+ GeekLearning.Storage.Integration.Test
+ GeekLearning.Storage.Integration.Test
+ true
+ $(PackageTargetFallback);dotnet;portable-net45+win8
+ 1.0.4
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/GeekLearning.Storage.Integration.Test/GeekLearning.Storage.Integration.Test.xproj b/tests/GeekLearning.Storage.Integration.Test/GeekLearning.Storage.Integration.Test.xproj
deleted file mode 100644
index bb63879..0000000
--- a/tests/GeekLearning.Storage.Integration.Test/GeekLearning.Storage.Integration.Test.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 590b21b0-2afa-4329-82ad-ef180c50eb5c
- GeekLearning.Storage.Integration.Test
- .\obj
- .\bin\
- v4.5.2
-
-
- 2.0
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/GeekLearning.Storage.Integration.Test/Properties/AssemblyInfo.cs b/tests/GeekLearning.Storage.Integration.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index 07776c7..0000000
--- a/tests/GeekLearning.Storage.Integration.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("GeekLearning.Storage.Integration.Test")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("590b21b0-2afa-4329-82ad-ef180c50eb5c")]
diff --git a/tests/GeekLearning.Storage.Integration.Test/StoresFixture.cs b/tests/GeekLearning.Storage.Integration.Test/StoresFixture.cs
index 19e3e75..3d000ee 100644
--- a/tests/GeekLearning.Storage.Integration.Test/StoresFixture.cs
+++ b/tests/GeekLearning.Storage.Integration.Test/StoresFixture.cs
@@ -39,8 +39,8 @@ public StoresFixture()
services.AddStorage()
.AddAzureStorage()
- .AddFileSystemStorage(BasePath)
- .AddFileSystemExtendedProperties(o => { });
+ .AddFileSystemStorage(this.FileSystemRootPath)
+ .AddFileSystemExtendedProperties();
services.Configure(Configuration.GetSection("Storage"));
services.Configure(Configuration.GetSection("TestStore"));
@@ -50,18 +50,50 @@ public StoresFixture()
ResetStores();
}
+ public IConfigurationRoot Configuration { get; }
+
+ public IServiceProvider Services { get; }
+
+ public string BasePath { get; }
+
+ public string FileSystemRootPath => Path.Combine(this.BasePath, "FileVault");
+
+ public void Dispose()
+ {
+ this.DeleteRootResources();
+ }
+
+ private void DeleteRootResources()
+ {
+ if (this.container != null)
+ {
+ this.container.DeleteIfExistsAsync().Wait();
+ }
+
+ if (Directory.Exists(this.FileSystemRootPath))
+ {
+ Directory.Delete(this.FileSystemRootPath, true);
+ }
+ }
+
private void ResetStores()
{
- ResetAzureStore();
- ResetFileSystemStore();
+ this.DeleteRootResources();
+ this.ResetAzureStore();
+ this.ResetFileSystemStore();
}
private void ResetFileSystemStore()
{
+ if (!Directory.Exists(this.FileSystemRootPath))
+ {
+ Directory.CreateDirectory(this.FileSystemRootPath);
+ }
+
var directoryName = Configuration["Storage:Stores:filesystem:Parameters:Path"];
var process = Process.Start(new ProcessStartInfo("robocopy.exe")
{
- Arguments = $"\"{Path.Combine(BasePath, "SampleDirectory")}\" \"{Path.Combine(BasePath, directoryName)}\" /MIR"
+ Arguments = $"\"{Path.Combine(this.BasePath, "SampleDirectory")}\" \"{Path.Combine(this.FileSystemRootPath, directoryName)}\" /MIR"
});
if (!process.WaitForExit(30000))
@@ -72,7 +104,7 @@ private void ResetFileSystemStore()
private void ResetAzureStore()
{
- var azCopy = System.IO.Path.Combine(
+ var azCopy = Path.Combine(
Environment.ExpandEnvironmentVariables(Configuration["AzCopyPath"]),
"AzCopy.exe");
@@ -83,12 +115,12 @@ private void ResetAzureStore()
var client = cloudStorageAccount.CreateCloudBlobClient();
- container = client.GetContainerReference(containerName);
- container.CreateAsync().Wait();
+ this.container = client.GetContainerReference(containerName);
+ this.container.CreateAsync().Wait();
var process = Process.Start(new ProcessStartInfo(azCopy)
{
- Arguments = $"/Source:\"{System.IO.Path.Combine(BasePath, "SampleDirectory")}\" /Dest:\"{dest}\" /DestKey:{key} /S"
+ Arguments = $"/Source:\"{Path.Combine(this.BasePath, "SampleDirectory")}\" /Dest:\"{dest}\" /DestKey:{key} /S"
});
if (!process.WaitForExit(30000))
@@ -96,31 +128,5 @@ private void ResetAzureStore()
throw new TimeoutException("Azure store was not reset properly");
}
}
-
- public IConfigurationRoot Configuration { get; }
-
- public IServiceProvider Services { get; }
-
- public string BasePath { get; }
-
- public void Dispose()
- {
- container.DeleteIfExistsAsync().Wait();
-
- var fileSystemPath = Configuration["Storage:Stores:filesystem:Parameters:Path"];
- var folderNameFormat = Configuration["Storage:ExtendedPropertiesFolderNameFormat"];
-
- var directoryName = Path.Combine(BasePath, fileSystemPath);
- if (Directory.Exists(directoryName))
- {
- Directory.Delete(directoryName, true);
- }
-
- directoryName = Path.Combine(BasePath, string.Format(folderNameFormat, fileSystemPath));
- if (Directory.Exists(directoryName))
- {
- Directory.Delete(directoryName, true);
- }
- }
}
}
diff --git a/tests/GeekLearning.Storage.Integration.Test/appsettings.json b/tests/GeekLearning.Storage.Integration.Test/appsettings.json
index 7b59261..2c8e21c 100644
--- a/tests/GeekLearning.Storage.Integration.Test/appsettings.json
+++ b/tests/GeekLearning.Storage.Integration.Test/appsettings.json
@@ -15,8 +15,7 @@
"Container": "templates"
}
}
- },
- "ExtendedPropertiesFolderNameFormat": ".{0}-extended-properties"
+ }
},
"TestStore": {
"Provider": "FileSystem",
diff --git a/tests/GeekLearning.Storage.Integration.Test/project.json b/tests/GeekLearning.Storage.Integration.Test/project.json
deleted file mode 100644
index 56f3c44..0000000
--- a/tests/GeekLearning.Storage.Integration.Test/project.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "version": "1.0.0-*",
-
- "buildOptions": {
- "copyToOutput": [
- "SampleDirectory/**/*.*",
- "appsettings.json",
- "appsettings.*.json"
- ]
- },
-
- "testRunner": "xunit",
-
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "dotnet-test-xunit": "2.2.0-preview2-build1029",
- "xunit": "2.2.0-beta2-build3300",
- "xunit.runner.visualstudio": "2.2.0-beta2-build1149",
- "Microsoft.Extensions.DependencyInjection": "1.1.0",
- "Microsoft.Extensions.PlatformAbstractions": "1.1.0",
- "Microsoft.Extensions.Configuration": "1.1.0",
- "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0",
- "Microsoft.Extensions.Configuration.Json": "1.1.0",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
- "Microsoft.Extensions.Options": "1.1.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
-
- "GeekLearning.Storage": "*",
- "GeekLearning.Storage.Azure": "*",
- "GeekLearning.Storage.FileSystem": "*",
- "GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem": "*"
- },
-
- "frameworks": {
- "netcoreapp1.0": {
- "imports": [ "dotnet", "portable-net45+win8" ],
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
- }
- },
- "net451": {
- "frameworkAssemblies": {},
- "dependencies": {}
- }
- }
-}