diff --git a/Netmash.Test.Api/Netmash.Test.Api.csproj b/Netmash.Test.Api/Netmash.Test.Api.csproj index 28c1cfe..b477d71 100644 --- a/Netmash.Test.Api/Netmash.Test.Api.csproj +++ b/Netmash.Test.Api/Netmash.Test.Api.csproj @@ -9,8 +9,8 @@ - + diff --git a/Netmash.sln b/Netmash.sln index 1040227..7097a92 100644 --- a/Netmash.sln +++ b/Netmash.sln @@ -22,14 +22,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "swagger", "swagger", "{FB4E71FD-9E32-4B5C-8019-1E8EBB9DDE9F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Extensions.Swagger", "Netmash.Extensions.Swagger\Netmash.Extensions.Swagger.csproj", "{CB9BDFCC-DB01-4A13-8091-9A241BE85CCD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "application", "application", "{564B5266-6F7E-4AFA-A7D4-B0E8F2E7107E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "http", "http", "{C1301480-5C4C-4F73-8D26-DD3E798FAFD5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Extensions.Http", "Netmash.Extensions.Http\Netmash.Extensions.Http.csproj", "{28D5CE9E-D975-4842-8B30-5063B82979C6}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{7D49E538-B89A-4BC2-AD5A-5A658F4B74E4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosting", "hosting", "{9F1BAC15-1625-40F7-9B7E-7C9CB6345DFF}" @@ -46,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Security.Authentica EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "caching", "caching", "{A206A484-3ACF-4032-8B36-AC93A72B0B88}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Extensions.Caching", "Netmash.Extensions.Caching\Netmash.Extensions.Caching.csproj", "{3E045EE6-A290-467C-B503-3A6CB0065C97}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CCEE458E-02A8-42FD-8F5F-A35481A23303}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Test.Api", "Netmash.Test.Api\Netmash.Test.Api.csproj", "{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}" @@ -66,6 +60,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Application.DataCon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.DataAccess.SqlServer", "src\data\Netmash.DataAccess.SqlServer\Netmash.DataAccess.SqlServer.csproj", "{1FA553EE-AA6F-4AB8-9C01-E37C01222217}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Extensions.Caching", "src\extensions\caching\Netmash.Extensions.Caching\Netmash.Extensions.Caching.csproj", "{49FE9F88-9FED-487C-89BF-5164500A6F99}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Extensions.Http", "src\extensions\http\Netmash.Extensions.Http\Netmash.Extensions.Http.csproj", "{30B1D32D-9187-401F-821E-DD3D17DD4A5B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Extensions.Swagger", "src\extensions\swagger\Netmash.Extensions.Swagger\Netmash.Extensions.Swagger.csproj", "{81E17C59-5620-4E61-BEF6-44E1FF4808F4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -80,22 +80,10 @@ Global {74E221BE-C097-468B-93E4-AAE1B2173C49}.Debug|Any CPU.Build.0 = Debug|Any CPU {74E221BE-C097-468B-93E4-AAE1B2173C49}.Release|Any CPU.ActiveCfg = Release|Any CPU {74E221BE-C097-468B-93E4-AAE1B2173C49}.Release|Any CPU.Build.0 = Release|Any CPU - {CB9BDFCC-DB01-4A13-8091-9A241BE85CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB9BDFCC-DB01-4A13-8091-9A241BE85CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB9BDFCC-DB01-4A13-8091-9A241BE85CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB9BDFCC-DB01-4A13-8091-9A241BE85CCD}.Release|Any CPU.Build.0 = Release|Any CPU - {28D5CE9E-D975-4842-8B30-5063B82979C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28D5CE9E-D975-4842-8B30-5063B82979C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28D5CE9E-D975-4842-8B30-5063B82979C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28D5CE9E-D975-4842-8B30-5063B82979C6}.Release|Any CPU.Build.0 = Release|Any CPU {5C0637C8-6BA4-4EAE-97CA-BB8D98B2991A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C0637C8-6BA4-4EAE-97CA-BB8D98B2991A}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C0637C8-6BA4-4EAE-97CA-BB8D98B2991A}.Release|Any CPU.ActiveCfg = Release|Any CPU {5C0637C8-6BA4-4EAE-97CA-BB8D98B2991A}.Release|Any CPU.Build.0 = Release|Any CPU - {3E045EE6-A290-467C-B503-3A6CB0065C97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E045EE6-A290-467C-B503-3A6CB0065C97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E045EE6-A290-467C-B503-3A6CB0065C97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E045EE6-A290-467C-B503-3A6CB0065C97}.Release|Any CPU.Build.0 = Release|Any CPU {F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Debug|Any CPU.Build.0 = Debug|Any CPU {F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -124,6 +112,18 @@ Global {1FA553EE-AA6F-4AB8-9C01-E37C01222217}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FA553EE-AA6F-4AB8-9C01-E37C01222217}.Release|Any CPU.ActiveCfg = Release|Any CPU {1FA553EE-AA6F-4AB8-9C01-E37C01222217}.Release|Any CPU.Build.0 = Release|Any CPU + {49FE9F88-9FED-487C-89BF-5164500A6F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49FE9F88-9FED-487C-89BF-5164500A6F99}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49FE9F88-9FED-487C-89BF-5164500A6F99}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49FE9F88-9FED-487C-89BF-5164500A6F99}.Release|Any CPU.Build.0 = Release|Any CPU + {30B1D32D-9187-401F-821E-DD3D17DD4A5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30B1D32D-9187-401F-821E-DD3D17DD4A5B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30B1D32D-9187-401F-821E-DD3D17DD4A5B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30B1D32D-9187-401F-821E-DD3D17DD4A5B}.Release|Any CPU.Build.0 = Release|Any CPU + {81E17C59-5620-4E61-BEF6-44E1FF4808F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {81E17C59-5620-4E61-BEF6-44E1FF4808F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81E17C59-5620-4E61-BEF6-44E1FF4808F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {81E17C59-5620-4E61-BEF6-44E1FF4808F4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -133,10 +133,8 @@ Global {74E221BE-C097-468B-93E4-AAE1B2173C49} = {06D5F056-4099-4636-A45C-D6C3B2CCDD66} {B50B55F0-9E6E-4061-9100-E2329A44E76B} = {E0202271-4E92-4DB8-900D-B5FD745B9278} {FB4E71FD-9E32-4B5C-8019-1E8EBB9DDE9F} = {B50B55F0-9E6E-4061-9100-E2329A44E76B} - {CB9BDFCC-DB01-4A13-8091-9A241BE85CCD} = {FB4E71FD-9E32-4B5C-8019-1E8EBB9DDE9F} {564B5266-6F7E-4AFA-A7D4-B0E8F2E7107E} = {E0202271-4E92-4DB8-900D-B5FD745B9278} {C1301480-5C4C-4F73-8D26-DD3E798FAFD5} = {B50B55F0-9E6E-4061-9100-E2329A44E76B} - {28D5CE9E-D975-4842-8B30-5063B82979C6} = {C1301480-5C4C-4F73-8D26-DD3E798FAFD5} {7D49E538-B89A-4BC2-AD5A-5A658F4B74E4} = {E0202271-4E92-4DB8-900D-B5FD745B9278} {9F1BAC15-1625-40F7-9B7E-7C9CB6345DFF} = {E0202271-4E92-4DB8-900D-B5FD745B9278} {06D5F056-4099-4636-A45C-D6C3B2CCDD66} = {E0202271-4E92-4DB8-900D-B5FD745B9278} @@ -145,7 +143,6 @@ Global {B8132F39-6677-4D70-84CA-9747DC9086B3} = {420A97AE-8E1E-4ECF-AAC5-455ABAA9B17E} {5C0637C8-6BA4-4EAE-97CA-BB8D98B2991A} = {B8132F39-6677-4D70-84CA-9747DC9086B3} {A206A484-3ACF-4032-8B36-AC93A72B0B88} = {B50B55F0-9E6E-4061-9100-E2329A44E76B} - {3E045EE6-A290-467C-B503-3A6CB0065C97} = {A206A484-3ACF-4032-8B36-AC93A72B0B88} {CCEE458E-02A8-42FD-8F5F-A35481A23303} = {E0202271-4E92-4DB8-900D-B5FD745B9278} {F717BE3D-F5F4-4D99-B96D-D0A23E8BED01} = {CCEE458E-02A8-42FD-8F5F-A35481A23303} {15650720-30F3-4FF3-8D4A-9B21BBA5E273} = {7D49E538-B89A-4BC2-AD5A-5A658F4B74E4} @@ -155,6 +152,9 @@ Global {102F3BFF-B2A6-4F36-B4CA-A44A55AE5FA7} = {1C1D634E-06CC-4707-9564-E31A76F27D9E} {42AAE1F3-4B57-49B0-A4B7-17AA3A04D0E9} = {564B5266-6F7E-4AFA-A7D4-B0E8F2E7107E} {1FA553EE-AA6F-4AB8-9C01-E37C01222217} = {7D49E538-B89A-4BC2-AD5A-5A658F4B74E4} + {49FE9F88-9FED-487C-89BF-5164500A6F99} = {A206A484-3ACF-4032-8B36-AC93A72B0B88} + {30B1D32D-9187-401F-821E-DD3D17DD4A5B} = {C1301480-5C4C-4F73-8D26-DD3E798FAFD5} + {81E17C59-5620-4E61-BEF6-44E1FF4808F4} = {FB4E71FD-9E32-4B5C-8019-1E8EBB9DDE9F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {87541BAB-3FAC-4ADB-A7FB-8228DA87843D} diff --git a/Netmash.Extensions.Caching/CachingExtensions.cs b/src/extensions/caching/Netmash.Extensions.Caching/CachingExtensions.cs similarity index 100% rename from Netmash.Extensions.Caching/CachingExtensions.cs rename to src/extensions/caching/Netmash.Extensions.Caching/CachingExtensions.cs diff --git a/Netmash.Extensions.Caching/DistributedCachingExtensions.cs b/src/extensions/caching/Netmash.Extensions.Caching/DistributedCachingExtensions.cs similarity index 100% rename from Netmash.Extensions.Caching/DistributedCachingExtensions.cs rename to src/extensions/caching/Netmash.Extensions.Caching/DistributedCachingExtensions.cs diff --git a/Netmash.Extensions.Caching/Netmash.Extensions.Caching.csproj b/src/extensions/caching/Netmash.Extensions.Caching/Netmash.Extensions.Caching.csproj similarity index 100% rename from Netmash.Extensions.Caching/Netmash.Extensions.Caching.csproj rename to src/extensions/caching/Netmash.Extensions.Caching/Netmash.Extensions.Caching.csproj diff --git a/Netmash.Extensions.Caching/Services/CacheService.cs b/src/extensions/caching/Netmash.Extensions.Caching/Services/CacheService.cs similarity index 100% rename from Netmash.Extensions.Caching/Services/CacheService.cs rename to src/extensions/caching/Netmash.Extensions.Caching/Services/CacheService.cs diff --git a/Netmash.Extensions.Caching/Services/ICacheService.cs b/src/extensions/caching/Netmash.Extensions.Caching/Services/ICacheService.cs similarity index 100% rename from Netmash.Extensions.Caching/Services/ICacheService.cs rename to src/extensions/caching/Netmash.Extensions.Caching/Services/ICacheService.cs diff --git a/Netmash.Extensions.Http/HttpClientExtensions.cs b/src/extensions/http/Netmash.Extensions.Http/HttpClientExtensions.cs similarity index 100% rename from Netmash.Extensions.Http/HttpClientExtensions.cs rename to src/extensions/http/Netmash.Extensions.Http/HttpClientExtensions.cs diff --git a/Netmash.Extensions.Http/Netmash.Extensions.Http.csproj b/src/extensions/http/Netmash.Extensions.Http/Netmash.Extensions.Http.csproj similarity index 100% rename from Netmash.Extensions.Http/Netmash.Extensions.Http.csproj rename to src/extensions/http/Netmash.Extensions.Http/Netmash.Extensions.Http.csproj diff --git a/Netmash.Extensions.Swagger/Constants/AuthorizationType.cs b/src/extensions/swagger/Netmash.Extensions.Swagger/Constants/AuthorizationType.cs similarity index 100% rename from Netmash.Extensions.Swagger/Constants/AuthorizationType.cs rename to src/extensions/swagger/Netmash.Extensions.Swagger/Constants/AuthorizationType.cs diff --git a/Netmash.Extensions.Swagger/Filters/DtoSchemaFilter.cs b/src/extensions/swagger/Netmash.Extensions.Swagger/Filters/DtoSchemaFilter.cs similarity index 100% rename from Netmash.Extensions.Swagger/Filters/DtoSchemaFilter.cs rename to src/extensions/swagger/Netmash.Extensions.Swagger/Filters/DtoSchemaFilter.cs diff --git a/Netmash.Extensions.Swagger/Filters/PathParamsOperationFilter.cs b/src/extensions/swagger/Netmash.Extensions.Swagger/Filters/PathParamsOperationFilter.cs similarity index 100% rename from Netmash.Extensions.Swagger/Filters/PathParamsOperationFilter.cs rename to src/extensions/swagger/Netmash.Extensions.Swagger/Filters/PathParamsOperationFilter.cs diff --git a/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj b/src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj similarity index 83% rename from Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj rename to src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj index 61db206..913cca5 100644 --- a/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj +++ b/src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj @@ -16,7 +16,7 @@ - + diff --git a/Netmash.Extensions.Swagger/ReverseProxy/ReverseProxyHelper.cs b/src/extensions/swagger/Netmash.Extensions.Swagger/ReverseProxy/ReverseProxyHelper.cs similarity index 100% rename from Netmash.Extensions.Swagger/ReverseProxy/ReverseProxyHelper.cs rename to src/extensions/swagger/Netmash.Extensions.Swagger/ReverseProxy/ReverseProxyHelper.cs diff --git a/Netmash.Extensions.Swagger/SwaggerExtensions.cs b/src/extensions/swagger/Netmash.Extensions.Swagger/SwaggerExtensions.cs similarity index 100% rename from Netmash.Extensions.Swagger/SwaggerExtensions.cs rename to src/extensions/swagger/Netmash.Extensions.Swagger/SwaggerExtensions.cs