diff --git a/.github/workflows/main-release.yml b/.github/workflows/main-release.yml index db8a7f5..763d58b 100644 --- a/.github/workflows/main-release.yml +++ b/.github/workflows/main-release.yml @@ -21,10 +21,10 @@ jobs: uses: actions/checkout@v1 with: fetch-depth: 0 - - name: Setup .NET 5 + - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.x' + dotnet-version: '6.0.x' - name: Setup GitVersion uses: gittools/actions/gitversion/setup@v0.9.7 with: @@ -35,9 +35,9 @@ jobs: - name: Restore dependencies run: dotnet restore --verbosity normal - name: Build - run: dotnet build --configuration Release --verbosity normal src/** + run: dotnet build --configuration Release --verbosity normal src/Mockaco/Mockaco.csproj - name: Test - run: dotnet test --configuration Release --verbosity normal test/** + run: dotnet test --configuration Release --verbosity normal test/Mockaco.Tests/Mockaco.Tests.csproj - name: Bump version and push tag if: "github.ref == 'refs/heads/master' && !contains(github.event.head_commit.message, 'skip-release')" id: tag_version diff --git a/Mockaco.sln b/Mockaco.sln index e24bffe..4c7c701 100644 --- a/Mockaco.sln +++ b/Mockaco.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32210.238 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mockaco", "src\Mockaco\Mockaco.csproj", "{8BAA1EC5-0BF5-4DA2-87F7-ED0C7B652517}" EndProject @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mockaco.Tests", "test\Mockaco.Tests\Mockaco.Tests.csproj", "{EE57B1B4-29D2-4AE3-8F23-5E622302C30F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mockaco.AspNetCore", "src\Mockaco.AspNetCore\Mockaco.AspNetCore.csproj", "{7766C592-9887-4162-8B9C-51003ED30335}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,6 +31,12 @@ Global {EE57B1B4-29D2-4AE3-8F23-5E622302C30F}.Nuget|Any CPU.ActiveCfg = Release|Any CPU {EE57B1B4-29D2-4AE3-8F23-5E622302C30F}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE57B1B4-29D2-4AE3-8F23-5E622302C30F}.Release|Any CPU.Build.0 = Release|Any CPU + {7766C592-9887-4162-8B9C-51003ED30335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7766C592-9887-4162-8B9C-51003ED30335}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7766C592-9887-4162-8B9C-51003ED30335}.Nuget|Any CPU.ActiveCfg = Debug|Any CPU + {7766C592-9887-4162-8B9C-51003ED30335}.Nuget|Any CPU.Build.0 = Debug|Any CPU + {7766C592-9887-4162-8B9C-51003ED30335}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7766C592-9887-4162-8B9C-51003ED30335}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/checkBuild.ps1 b/checkBuild.ps1 new file mode 100644 index 0000000..0f412c2 --- /dev/null +++ b/checkBuild.ps1 @@ -0,0 +1,16 @@ +dotnet restore --verbosity normal +dotnet build --configuration Release --verbosity normal .\src\Mockaco\Mockaco.csproj +dotnet test --configuration Release --verbosity normal .\test\Mockaco.Tests\Mockaco.Tests.csproj +dotnet pack --configuration Nuget --output ./nupkg +docker build -f ./src/Mockaco/Docker/Dockerfile -t mockaco:local . + +$containerName = [guid]::NewGuid().ToString() +try { + docker run --name $containerName -d -p 5000:5000 -v ${PSScriptRoot}/src/Mockaco/Mocks:/app/Mocks mockaco:local + Start-Sleep -Seconds 5 + docker run --rm -v ${PSScriptRoot}/test/_postman:/etc/newman -t postman/newman:alpine run Mockaco.postman_collection.json +} +finally { + docker container stop $containerName + docker container rm $containerName +} diff --git a/src/Mockaco/Common/HttpContentTypes.cs b/src/Mockaco.AspNetCore/Common/HttpContentTypes.cs similarity index 87% rename from src/Mockaco/Common/HttpContentTypes.cs rename to src/Mockaco.AspNetCore/Common/HttpContentTypes.cs index 6bc95b9..3e685a4 100644 --- a/src/Mockaco/Common/HttpContentTypes.cs +++ b/src/Mockaco.AspNetCore/Common/HttpContentTypes.cs @@ -1,6 +1,6 @@ namespace Mockaco { - public static class HttpContentTypes + internal static class HttpContentTypes { public const string ApplicationOctetStream = "application/octet-stream"; public const string ApplicationJson = "application/json"; diff --git a/src/Mockaco/Common/HttpHeaders.cs b/src/Mockaco.AspNetCore/Common/HttpHeaders.cs similarity index 80% rename from src/Mockaco/Common/HttpHeaders.cs rename to src/Mockaco.AspNetCore/Common/HttpHeaders.cs index e2c6977..bb221fa 100644 --- a/src/Mockaco/Common/HttpHeaders.cs +++ b/src/Mockaco.AspNetCore/Common/HttpHeaders.cs @@ -1,6 +1,6 @@ namespace Mockaco { - public static class HttpHeaders + internal static class HttpHeaders { public const string ContentType = "Content-Type"; public const string AcceptLanguage = "Accept-Language"; diff --git a/src/Mockaco/Common/RouteMatcher.cs b/src/Mockaco.AspNetCore/Common/RouteMatcher.cs similarity index 97% rename from src/Mockaco/Common/RouteMatcher.cs rename to src/Mockaco.AspNetCore/Common/RouteMatcher.cs index 34d6d17..06e926c 100644 --- a/src/Mockaco/Common/RouteMatcher.cs +++ b/src/Mockaco.AspNetCore/Common/RouteMatcher.cs @@ -3,7 +3,7 @@ namespace Mockaco { - public class RouteMatcher + internal class RouteMatcher { public RouteValueDictionary Match(string routeTemplate, string requestPath) { diff --git a/src/Mockaco/Common/StringDictionary.cs b/src/Mockaco.AspNetCore/Common/StringDictionary.cs similarity index 100% rename from src/Mockaco/Common/StringDictionary.cs rename to src/Mockaco.AspNetCore/Common/StringDictionary.cs diff --git a/src/Mockaco.AspNetCore/DependencyInjection/MockacoApplicationBuilder.cs b/src/Mockaco.AspNetCore/DependencyInjection/MockacoApplicationBuilder.cs new file mode 100644 index 0000000..1b788d8 --- /dev/null +++ b/src/Mockaco.AspNetCore/DependencyInjection/MockacoApplicationBuilder.cs @@ -0,0 +1,29 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; +using Mockaco; +using Mockaco.Verifyer; + +namespace Microsoft.AspNetCore.Builder +{ + public static class MockacoApplicationBuilder + { + public static IApplicationBuilder UseMockaco(this IApplicationBuilder app, Action configure) + { + var options = app.ApplicationServices.GetRequiredService>().Value; + app.UseEndpoints(endpoints => endpoints.Map($"/{options.VerificationEndpointPrefix}/{options.VerificationEndpointName}", VerifyerExtensions.Verify)); + + app.UseMiddleware(); + configure(app); + app + .UseMiddleware() + .UseMiddleware() + .UseMiddleware() + .UseMiddleware(); + + return app; + } + + public static IApplicationBuilder UseMockaco(this IApplicationBuilder app) => + app.UseMockaco(_ => { }); + } +} diff --git a/src/Mockaco.AspNetCore/DependencyInjection/MockacoServiceCollection.cs b/src/Mockaco.AspNetCore/DependencyInjection/MockacoServiceCollection.cs new file mode 100644 index 0000000..aa70416 --- /dev/null +++ b/src/Mockaco.AspNetCore/DependencyInjection/MockacoServiceCollection.cs @@ -0,0 +1,74 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Options; +using Mockaco; +using Mockaco.Settings; + +namespace Microsoft.Extensions.DependencyInjection +{ + public static class MockacoServiceCollection + { + public static IServiceCollection AddMockaco(this IServiceCollection services) => + services.AddMockaco(_ => { }); + + public static IServiceCollection AddMockaco(this IServiceCollection services, Action config) => + services + .AddOptions().Configure(config).Services + .AddOptions() + .Configure>((options, parent) => options = parent.Value.TemplateFileProvider) + .Services + .AddCommonServices(); + + + public static IServiceCollection AddMockaco(this IServiceCollection services, IConfiguration config) => + services + .AddConfiguration(config) + .AddCommonServices(); + + private static IServiceCollection AddConfiguration(this IServiceCollection services, IConfiguration config) => + services + .AddOptions() + .Configure(config) + .Configure(config.GetSection("TemplateFileProvider")); + + private static IServiceCollection AddCommonServices(this IServiceCollection services) => + services + .AddMemoryCache() + .AddHttpClient() + .AddInternalServices() + .AddHostedService(); + + private static IServiceCollection AddInternalServices(this IServiceCollection services) => + services + .AddSingleton() + .AddScoped() + .AddScoped() + .AddTransient() + + .AddSingleton() + + .AddSingleton() + .AddSingleton() + .AddSingleton() + + .AddScoped() + .AddScoped() + .AddScoped() + + .AddTransient() + + .AddTransient() + .AddTransient() + .AddTransient() + + .AddTransient() + + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + + .AddTransient() + + .AddTemplatesGenerating(); + } +} diff --git a/src/Mockaco/Extensions/EnumerableExtensions.cs b/src/Mockaco.AspNetCore/Extensions/EnumerableExtensions.cs similarity index 96% rename from src/Mockaco/Extensions/EnumerableExtensions.cs rename to src/Mockaco.AspNetCore/Extensions/EnumerableExtensions.cs index d1b544d..9b18510 100644 --- a/src/Mockaco/Extensions/EnumerableExtensions.cs +++ b/src/Mockaco.AspNetCore/Extensions/EnumerableExtensions.cs @@ -2,7 +2,7 @@ namespace System.Collections.Generic { - public static class EnumerableExtensions + internal static class EnumerableExtensions { public static async Task AllAsync(this IEnumerable source, Func> predicate) { diff --git a/src/Mockaco/Extensions/HttpRequestExtensions.cs b/src/Mockaco.AspNetCore/Extensions/HttpRequestExtensions.cs similarity index 98% rename from src/Mockaco/Extensions/HttpRequestExtensions.cs rename to src/Mockaco.AspNetCore/Extensions/HttpRequestExtensions.cs index 6ab5c50..65cb407 100644 --- a/src/Mockaco/Extensions/HttpRequestExtensions.cs +++ b/src/Mockaco.AspNetCore/Extensions/HttpRequestExtensions.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Http /// /// Set of extension methods for Microsoft.AspNetCore.Http.HttpRequest /// - public static class HttpRequestExtensions + internal static class HttpRequestExtensions { private const string UnknownHostName = "UNKNOWN-HOST"; diff --git a/src/Mockaco/Extensions/ObjectExtensions.cs b/src/Mockaco.AspNetCore/Extensions/ObjectExtensions.cs similarity index 96% rename from src/Mockaco/Extensions/ObjectExtensions.cs rename to src/Mockaco.AspNetCore/Extensions/ObjectExtensions.cs index 11e2a47..9f0f239 100644 --- a/src/Mockaco/Extensions/ObjectExtensions.cs +++ b/src/Mockaco.AspNetCore/Extensions/ObjectExtensions.cs @@ -5,7 +5,7 @@ namespace System { - public static class ObjectExtensions + internal static class ObjectExtensions { private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings { diff --git a/src/Mockaco/Extensions/StringDictionaryExtensions.cs b/src/Mockaco.AspNetCore/Extensions/StringDictionaryExtensions.cs similarity index 92% rename from src/Mockaco/Extensions/StringDictionaryExtensions.cs rename to src/Mockaco.AspNetCore/Extensions/StringDictionaryExtensions.cs index 34ad1e2..f23216a 100644 --- a/src/Mockaco/Extensions/StringDictionaryExtensions.cs +++ b/src/Mockaco.AspNetCore/Extensions/StringDictionaryExtensions.cs @@ -2,7 +2,7 @@ namespace System.Collections.Generic { - public static class StringDictionaryExtensions + internal static class StringDictionaryExtensions { public static StringDictionary ToStringDictionary( this IEnumerable source, diff --git a/src/Mockaco/Extensions/StringExtensions.cs b/src/Mockaco.AspNetCore/Extensions/StringExtensions.cs similarity index 95% rename from src/Mockaco/Extensions/StringExtensions.cs rename to src/Mockaco.AspNetCore/Extensions/StringExtensions.cs index b476874..a5eebfd 100644 --- a/src/Mockaco/Extensions/StringExtensions.cs +++ b/src/Mockaco.AspNetCore/Extensions/StringExtensions.cs @@ -2,7 +2,7 @@ namespace System { - public static class StringExtensions + internal static class StringExtensions { public static string ToMD5Hash(this string input) { diff --git a/src/Mockaco/IMockProvider.cs b/src/Mockaco.AspNetCore/IMockProvider.cs similarity index 86% rename from src/Mockaco/IMockProvider.cs rename to src/Mockaco.AspNetCore/IMockProvider.cs index cbe32f8..fec6dd9 100644 --- a/src/Mockaco/IMockProvider.cs +++ b/src/Mockaco.AspNetCore/IMockProvider.cs @@ -3,7 +3,7 @@ namespace Mockaco { - public interface IMockProvider + internal interface IMockProvider { List GetMocks(); diff --git a/src/Mockaco/IMockacoContext.cs b/src/Mockaco.AspNetCore/IMockacoContext.cs similarity index 86% rename from src/Mockaco/IMockacoContext.cs rename to src/Mockaco.AspNetCore/IMockacoContext.cs index 5d6d8ab..9a0d20b 100644 --- a/src/Mockaco/IMockacoContext.cs +++ b/src/Mockaco.AspNetCore/IMockacoContext.cs @@ -2,7 +2,7 @@ namespace Mockaco { - public interface IMockacoContext + internal interface IMockacoContext { IScriptContext ScriptContext { get; } diff --git a/src/Mockaco.AspNetCore/InternalsVisibleTo.cs b/src/Mockaco.AspNetCore/InternalsVisibleTo.cs new file mode 100644 index 0000000..d6d1d59 --- /dev/null +++ b/src/Mockaco.AspNetCore/InternalsVisibleTo.cs @@ -0,0 +1,4 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Mockaco.Tests")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Mockaco/Middlewares/CallbackMiddleware.cs b/src/Mockaco.AspNetCore/Middlewares/CallbackMiddleware.cs similarity index 99% rename from src/Mockaco/Middlewares/CallbackMiddleware.cs rename to src/Mockaco.AspNetCore/Middlewares/CallbackMiddleware.cs index c26c7c6..00830ac 100644 --- a/src/Mockaco/Middlewares/CallbackMiddleware.cs +++ b/src/Mockaco.AspNetCore/Middlewares/CallbackMiddleware.cs @@ -14,7 +14,7 @@ namespace Mockaco { - public class CallbackMiddleware + internal class CallbackMiddleware { private readonly RequestDelegate _next; private readonly ILogger _logger; diff --git a/src/Mockaco/Middlewares/ErrorHandlingMiddleware.cs b/src/Mockaco.AspNetCore/Middlewares/ErrorHandlingMiddleware.cs similarity index 97% rename from src/Mockaco/Middlewares/ErrorHandlingMiddleware.cs rename to src/Mockaco.AspNetCore/Middlewares/ErrorHandlingMiddleware.cs index dc6cdba..879d140 100644 --- a/src/Mockaco/Middlewares/ErrorHandlingMiddleware.cs +++ b/src/Mockaco.AspNetCore/Middlewares/ErrorHandlingMiddleware.cs @@ -7,7 +7,7 @@ namespace Mockaco { - public class ErrorHandlingMiddleware + internal class ErrorHandlingMiddleware { private readonly RequestDelegate _next; diff --git a/src/Mockaco/Middlewares/RequestMatchingMiddleware.cs b/src/Mockaco.AspNetCore/Middlewares/RequestMatchingMiddleware.cs similarity index 98% rename from src/Mockaco/Middlewares/RequestMatchingMiddleware.cs rename to src/Mockaco.AspNetCore/Middlewares/RequestMatchingMiddleware.cs index c1e7be2..e43181d 100644 --- a/src/Mockaco/Middlewares/RequestMatchingMiddleware.cs +++ b/src/Mockaco.AspNetCore/Middlewares/RequestMatchingMiddleware.cs @@ -9,7 +9,7 @@ namespace Mockaco { - public class RequestMatchingMiddleware + internal class RequestMatchingMiddleware { private readonly RequestDelegate _next; private readonly ILogger _logger; diff --git a/src/Mockaco/Middlewares/ResponseDelayMiddleware.cs b/src/Mockaco.AspNetCore/Middlewares/ResponseDelayMiddleware.cs similarity index 95% rename from src/Mockaco/Middlewares/ResponseDelayMiddleware.cs rename to src/Mockaco.AspNetCore/Middlewares/ResponseDelayMiddleware.cs index 3a6c5cd..53ddd15 100644 --- a/src/Mockaco/Middlewares/ResponseDelayMiddleware.cs +++ b/src/Mockaco.AspNetCore/Middlewares/ResponseDelayMiddleware.cs @@ -5,7 +5,7 @@ namespace Mockaco { - public class ResponseDelayMiddleware + internal class ResponseDelayMiddleware { private readonly RequestDelegate _next; diff --git a/src/Mockaco/Middlewares/ResponseMockingMiddleware.cs b/src/Mockaco.AspNetCore/Middlewares/ResponseMockingMiddleware.cs similarity index 98% rename from src/Mockaco/Middlewares/ResponseMockingMiddleware.cs rename to src/Mockaco.AspNetCore/Middlewares/ResponseMockingMiddleware.cs index ea1123c..b36f6af 100644 --- a/src/Mockaco/Middlewares/ResponseMockingMiddleware.cs +++ b/src/Mockaco.AspNetCore/Middlewares/ResponseMockingMiddleware.cs @@ -5,7 +5,7 @@ namespace Mockaco { - public class ResponseMockingMiddleware + internal class ResponseMockingMiddleware { private readonly RequestDelegate _next; diff --git a/src/Mockaco/MockProvider.cs b/src/Mockaco.AspNetCore/MockProvider.cs similarity index 98% rename from src/Mockaco/MockProvider.cs rename to src/Mockaco.AspNetCore/MockProvider.cs index 439a9e0..9cac775 100644 --- a/src/Mockaco/MockProvider.cs +++ b/src/Mockaco.AspNetCore/MockProvider.cs @@ -9,7 +9,7 @@ namespace Mockaco { - public class MockProvider : IMockProvider + internal class MockProvider : IMockProvider { private List _cache; private readonly List<(string TemplateName, string ErrorMessage)> _errors = new List<(string TemplateName, string Error)>(); diff --git a/src/Mockaco.AspNetCore/Mockaco.AspNetCore.csproj b/src/Mockaco.AspNetCore/Mockaco.AspNetCore.csproj new file mode 100644 index 0000000..1cecbe2 --- /dev/null +++ b/src/Mockaco.AspNetCore/Mockaco.AspNetCore.csproj @@ -0,0 +1,71 @@ + + + + net6.0 + latest + Mockaco.AspNetCore + Mockaco + enable + Debug;Release;Nuget + true + + + + true + ./nupkg + false + natenho + ASP.NET Core pipeline to mock HTTP requests/responses, useful to stub services and simulate dynamic API responses, leveraging ASP.NET Core features, built-in fake data generation and pure C# scripting + https://github.com/natenho/Mockaco + https://github.com/natenho/Mockaco + mock http aspnetcore + Apache-2.0 + mockaco-icon.png + Mockaco + + + + 1701;1702 + AD0001 + + + + 1701;1702 + AD0001 + + + + 1701;1702 + AD0001 + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + True + / + + + + diff --git a/src/Mockaco/MockacoContext.cs b/src/Mockaco.AspNetCore/MockacoContext.cs similarity index 89% rename from src/Mockaco/MockacoContext.cs rename to src/Mockaco.AspNetCore/MockacoContext.cs index 2abb23f..fbdf35b 100644 --- a/src/Mockaco/MockacoContext.cs +++ b/src/Mockaco.AspNetCore/MockacoContext.cs @@ -2,7 +2,7 @@ namespace Mockaco { - public class MockacoContext : IMockacoContext + internal class MockacoContext : IMockacoContext { public IScriptContext ScriptContext { get; set; } diff --git a/src/Mockaco/Options/MockacoOptions.cs b/src/Mockaco.AspNetCore/Options/MockacoOptions.cs similarity index 64% rename from src/Mockaco/Options/MockacoOptions.cs rename to src/Mockaco.AspNetCore/Options/MockacoOptions.cs index 9242046..d61e01a 100644 --- a/src/Mockaco/Options/MockacoOptions.cs +++ b/src/Mockaco.AspNetCore/Options/MockacoOptions.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Net; +using System.Net; namespace Mockaco { @@ -17,6 +16,12 @@ public class MockacoOptions public int MatchedRoutesCacheDuration { get; set; } + public string VerificationEndpointPrefix { get; set; } + + public string VerificationEndpointName { get; set; } + + public TemplateFileProviderOptions TemplateFileProvider { get; set; } + public MockacoOptions() { DefaultHttpStatusCode = HttpStatusCode.OK; @@ -24,6 +29,10 @@ public MockacoOptions() DefaultHttpContentType = HttpContentTypes.ApplicationJson; References = new List(); Imports = new List(); + MatchedRoutesCacheDuration = 60; + VerificationEndpointPrefix = "_mockaco"; + VerificationEndpointName = "verification"; + TemplateFileProvider = new(); } } } diff --git a/src/Mockaco/Options/TemplateFileProviderOptions.cs b/src/Mockaco.AspNetCore/Options/TemplateFileProviderOptions.cs similarity index 89% rename from src/Mockaco/Options/TemplateFileProviderOptions.cs rename to src/Mockaco.AspNetCore/Options/TemplateFileProviderOptions.cs index 258e12a..2c86fa0 100644 --- a/src/Mockaco/Options/TemplateFileProviderOptions.cs +++ b/src/Mockaco.AspNetCore/Options/TemplateFileProviderOptions.cs @@ -11,7 +11,7 @@ public class TemplateFileProviderOptions public TemplateFileProviderOptions() { - Path = string.Empty; + Path = "Mocks"; } } } diff --git a/src/Mockaco/Plugins/PhoneNumberExtensions.cs b/src/Mockaco.AspNetCore/Plugins/PhoneNumberExtensions.cs similarity index 94% rename from src/Mockaco/Plugins/PhoneNumberExtensions.cs rename to src/Mockaco.AspNetCore/Plugins/PhoneNumberExtensions.cs index 67821fe..f4b01a4 100644 --- a/src/Mockaco/Plugins/PhoneNumberExtensions.cs +++ b/src/Mockaco.AspNetCore/Plugins/PhoneNumberExtensions.cs @@ -3,7 +3,7 @@ namespace Bogus { // TODO Move to plugin - public static class PhoneNumberExtensions + internal static class PhoneNumberExtensions { public static string BrazilianPhoneNumber(this PhoneNumbers phoneNumbers) { diff --git a/src/Mockaco/Plugins/Readme.md b/src/Mockaco.AspNetCore/PublicAPI.Shipped.txt similarity index 100% rename from src/Mockaco/Plugins/Readme.md rename to src/Mockaco.AspNetCore/PublicAPI.Shipped.txt diff --git a/src/Mockaco.AspNetCore/PublicAPI.Unshipped.txt b/src/Mockaco.AspNetCore/PublicAPI.Unshipped.txt new file mode 100644 index 0000000..9952890 --- /dev/null +++ b/src/Mockaco.AspNetCore/PublicAPI.Unshipped.txt @@ -0,0 +1,109 @@ +Microsoft.AspNetCore.Builder.MockacoApplicationBuilder +Microsoft.Extensions.DependencyInjection.MockacoServiceCollection +Mockaco.IFakerFactory +Mockaco.IFakerFactory.GetDefaultFaker() -> Bogus.Faker +Mockaco.IFakerFactory.GetFaker(System.Collections.Generic.IEnumerable acceptLanguages) -> Bogus.Faker +Mockaco.IGlobalVariableStorage +Mockaco.IGlobalVariableStorage.Clear() -> void +Mockaco.IGlobalVariableStorage.DisableWriting() -> void +Mockaco.IGlobalVariableStorage.EnableWriting() -> void +Mockaco.IGlobalVariableStorage.this[string name].get -> object +Mockaco.IGlobalVariableStorage.this[string name].set -> void +Mockaco.IRawTemplate +Mockaco.IRawTemplate.Content.get -> string +Mockaco.IRawTemplate.Hash.get -> string +Mockaco.IRawTemplate.Name.get -> string +Mockaco.IRequestBodyFactory +Mockaco.IRequestBodyFactory.ReadBodyAsJson(Microsoft.AspNetCore.Http.HttpRequest httpRequest) -> System.Threading.Tasks.Task +Mockaco.IScriptContext +Mockaco.IScriptContext.AttachRequest(Microsoft.AspNetCore.Http.HttpRequest httpRequest) -> System.Threading.Tasks.Task +Mockaco.IScriptContext.AttachResponse(Microsoft.AspNetCore.Http.HttpResponse httpResponse, Mockaco.ResponseTemplate responseTemplate) -> System.Threading.Tasks.Task +Mockaco.IScriptContext.AttachRouteParameters(Microsoft.AspNetCore.Http.HttpRequest httpRequest, Mockaco.Mock route) -> System.Threading.Tasks.Task +Mockaco.IScriptContext.Faker.get -> Bogus.Faker +Mockaco.IScriptContext.Global.get -> Mockaco.IGlobalVariableStorage +Mockaco.IScriptContext.Request.get -> Mockaco.ScriptContextRequest +Mockaco.IScriptContext.Request.set -> void +Mockaco.IScriptContext.Response.get -> Mockaco.ScriptContextResponse +Mockaco.IScriptContext.Response.set -> void +Mockaco.Mock +Mockaco.Mock.HasCondition.get -> bool +Mockaco.Mock.HasCondition.set -> void +Mockaco.Mock.Method.get -> string +Mockaco.Mock.Method.set -> void +Mockaco.Mock.Mock(string method, string route, Mockaco.IRawTemplate rawTemplate, bool hasCondition) -> void +Mockaco.Mock.RawTemplate.get -> Mockaco.IRawTemplate +Mockaco.Mock.RawTemplate.set -> void +Mockaco.Mock.Route.get -> string +Mockaco.Mock.Route.set -> void +Mockaco.MockacoOptions +Mockaco.MockacoOptions.DefaultHttpContentType.get -> string +Mockaco.MockacoOptions.DefaultHttpContentType.set -> void +Mockaco.MockacoOptions.DefaultHttpStatusCode.get -> System.Net.HttpStatusCode +Mockaco.MockacoOptions.DefaultHttpStatusCode.set -> void +Mockaco.MockacoOptions.ErrorHttpStatusCode.get -> System.Net.HttpStatusCode +Mockaco.MockacoOptions.ErrorHttpStatusCode.set -> void +Mockaco.MockacoOptions.Imports.get -> System.Collections.Generic.List +Mockaco.MockacoOptions.Imports.set -> void +Mockaco.MockacoOptions.MatchedRoutesCacheDuration.get -> int +Mockaco.MockacoOptions.MatchedRoutesCacheDuration.set -> void +Mockaco.MockacoOptions.MockacoOptions() -> void +Mockaco.MockacoOptions.References.get -> System.Collections.Generic.List +Mockaco.MockacoOptions.References.set -> void +Mockaco.MockacoOptions.TemplateFileProvider.get -> Mockaco.TemplateFileProviderOptions +Mockaco.MockacoOptions.TemplateFileProvider.set -> void +Mockaco.MockacoOptions.VerificationEndpointName.get -> string +Mockaco.MockacoOptions.VerificationEndpointName.set -> void +Mockaco.MockacoOptions.VerificationEndpointPrefix.get -> string +Mockaco.MockacoOptions.VerificationEndpointPrefix.set -> void +Mockaco.ResponseTemplate +Mockaco.ResponseTemplate.Body.get -> Newtonsoft.Json.Linq.JToken +Mockaco.ResponseTemplate.Body.set -> void +Mockaco.ResponseTemplate.Delay.get -> int? +Mockaco.ResponseTemplate.Delay.set -> void +Mockaco.ResponseTemplate.File.get -> string +Mockaco.ResponseTemplate.File.set -> void +Mockaco.ResponseTemplate.Headers.get -> System.Collections.Generic.IDictionary +Mockaco.ResponseTemplate.Headers.set -> void +Mockaco.ResponseTemplate.Indented.get -> bool? +Mockaco.ResponseTemplate.Indented.set -> void +Mockaco.ResponseTemplate.ResponseTemplate() -> void +Mockaco.ResponseTemplate.Status.get -> System.Net.HttpStatusCode +Mockaco.ResponseTemplate.Status.set -> void +Mockaco.ScriptContext +Mockaco.ScriptContext.AttachRequest(Microsoft.AspNetCore.Http.HttpRequest httpRequest) -> System.Threading.Tasks.Task +Mockaco.ScriptContext.AttachResponse(Microsoft.AspNetCore.Http.HttpResponse httpResponse, Mockaco.ResponseTemplate responseTemplate) -> System.Threading.Tasks.Task +Mockaco.ScriptContext.AttachRouteParameters(Microsoft.AspNetCore.Http.HttpRequest httpRequest, Mockaco.Mock mock) -> System.Threading.Tasks.Task +Mockaco.ScriptContext.Faker.get -> Bogus.Faker +Mockaco.ScriptContext.Global.get -> Mockaco.IGlobalVariableStorage +Mockaco.ScriptContext.Request.get -> Mockaco.ScriptContextRequest +Mockaco.ScriptContext.Request.set -> void +Mockaco.ScriptContext.Response.get -> Mockaco.ScriptContextResponse +Mockaco.ScriptContext.Response.set -> void +Mockaco.ScriptContext.ScriptContext(Mockaco.IFakerFactory fakerFactory, Mockaco.IRequestBodyFactory requestBodyFactory, Mockaco.IGlobalVariableStorage globalVarialeStorage) -> void +Mockaco.ScriptContextRequest +Mockaco.ScriptContextRequest.Body.get -> Newtonsoft.Json.Linq.JToken +Mockaco.ScriptContextRequest.Header.get -> System.Collections.Generic.IReadOnlyDictionary +Mockaco.ScriptContextRequest.Query.get -> System.Collections.Generic.IReadOnlyDictionary +Mockaco.ScriptContextRequest.Route.get -> System.Collections.Generic.IReadOnlyDictionary +Mockaco.ScriptContextRequest.ScriptContextRequest(System.Uri url, System.Collections.Generic.IReadOnlyDictionary route, System.Collections.Generic.IReadOnlyDictionary query, System.Collections.Generic.IReadOnlyDictionary header, Newtonsoft.Json.Linq.JToken body) -> void +Mockaco.ScriptContextRequest.Url.get -> System.Uri +Mockaco.ScriptContextResponse +Mockaco.ScriptContextResponse.Body.get -> Newtonsoft.Json.Linq.JToken +Mockaco.ScriptContextResponse.Header.get -> System.Collections.Generic.IReadOnlyDictionary +Mockaco.ScriptContextResponse.ScriptContextResponse(Mockaco.StringDictionary header, Newtonsoft.Json.Linq.JToken body) -> void +Mockaco.StringDictionary +Mockaco.StringDictionary.Add(string key, string value) -> void +Mockaco.StringDictionary.Replace(string key, string value) -> void +Mockaco.StringDictionary.StringDictionary() -> void +Mockaco.StringDictionary.this[string key].get -> string +Mockaco.StringDictionary.this[string key].set -> void +Mockaco.TemplateFileProviderOptions +Mockaco.TemplateFileProviderOptions.Path.get -> string +Mockaco.TemplateFileProviderOptions.Path.set -> void +Mockaco.TemplateFileProviderOptions.TemplateFileProviderOptions() -> void +override Mockaco.Mock.ToString() -> string +static Microsoft.AspNetCore.Builder.MockacoApplicationBuilder.UseMockaco(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) -> Microsoft.AspNetCore.Builder.IApplicationBuilder +static Microsoft.AspNetCore.Builder.MockacoApplicationBuilder.UseMockaco(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, System.Action configure) -> Microsoft.AspNetCore.Builder.IApplicationBuilder +static Microsoft.Extensions.DependencyInjection.MockacoServiceCollection.AddMockaco(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection +static Microsoft.Extensions.DependencyInjection.MockacoServiceCollection.AddMockaco(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfiguration config) -> Microsoft.Extensions.DependencyInjection.IServiceCollection +static Microsoft.Extensions.DependencyInjection.MockacoServiceCollection.AddMockaco(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action config) -> Microsoft.Extensions.DependencyInjection.IServiceCollection diff --git a/src/Mockaco.AspNetCore/Resources/mockaco-icon.png b/src/Mockaco.AspNetCore/Resources/mockaco-icon.png new file mode 100644 index 0000000..d7a9b27 Binary files /dev/null and b/src/Mockaco.AspNetCore/Resources/mockaco-icon.png differ diff --git a/src/Mockaco/Settings/VerificationRouteValueTransformer.cs b/src/Mockaco.AspNetCore/Settings/VerificationRouteValueTransformer.cs similarity index 54% rename from src/Mockaco/Settings/VerificationRouteValueTransformer.cs rename to src/Mockaco.AspNetCore/Settings/VerificationRouteValueTransformer.cs index f02518d..1f3d800 100644 --- a/src/Mockaco/Settings/VerificationRouteValueTransformer.cs +++ b/src/Mockaco.AspNetCore/Settings/VerificationRouteValueTransformer.cs @@ -5,14 +5,14 @@ using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Routing; - class VerificationRouteValueTransformer : DynamicRouteValueTransformer + internal class VerificationRouteValueTransformer : DynamicRouteValueTransformer { - public override async ValueTask TransformAsync(HttpContext httpContext, RouteValueDictionary values) + public override ValueTask TransformAsync(HttpContext httpContext, RouteValueDictionary values) { values["controller"] = "verify"; values["action"] = "Get"; - return values; + return ValueTask.FromResult(values); } } } \ No newline at end of file diff --git a/src/Mockaco/Templating/Generating/Cli/GeneratorRunner.cs b/src/Mockaco.AspNetCore/Templating/Generating/Cli/GeneratorRunner.cs similarity index 95% rename from src/Mockaco/Templating/Generating/Cli/GeneratorRunner.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Cli/GeneratorRunner.cs index 305dfd4..d48645a 100644 --- a/src/Mockaco/Templating/Generating/Cli/GeneratorRunner.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Cli/GeneratorRunner.cs @@ -6,7 +6,7 @@ namespace Mockaco.Templating.Generating.Cli { - public class GeneratorRunner + internal class GeneratorRunner { private readonly IServiceProvider _serviceProvider; diff --git a/src/Mockaco/Templating/Generating/GeneratedTemplate.cs b/src/Mockaco.AspNetCore/Templating/Generating/GeneratedTemplate.cs similarity index 66% rename from src/Mockaco/Templating/Generating/GeneratedTemplate.cs rename to src/Mockaco.AspNetCore/Templating/Generating/GeneratedTemplate.cs index f3db355..66145bd 100644 --- a/src/Mockaco/Templating/Generating/GeneratedTemplate.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/GeneratedTemplate.cs @@ -1,6 +1,6 @@ namespace Mockaco.Templating.Generating { - public class GeneratedTemplate : Template + internal class GeneratedTemplate : Template { public string Name { get; set; } } diff --git a/src/Mockaco/Templating/Generating/GeneratingOptions.cs b/src/Mockaco.AspNetCore/Templating/Generating/GeneratingOptions.cs similarity index 95% rename from src/Mockaco/Templating/Generating/GeneratingOptions.cs rename to src/Mockaco.AspNetCore/Templating/Generating/GeneratingOptions.cs index 0178013..3d2509b 100644 --- a/src/Mockaco/Templating/Generating/GeneratingOptions.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/GeneratingOptions.cs @@ -3,7 +3,7 @@ namespace Mockaco.Templating.Generating { - public class GeneratingOptions + internal class GeneratingOptions { public string Source { get; set; } diff --git a/src/Mockaco/Templating/Generating/Providers/GeneratedTemplateProviderFactory.cs b/src/Mockaco.AspNetCore/Templating/Generating/Providers/GeneratedTemplateProviderFactory.cs similarity index 91% rename from src/Mockaco/Templating/Generating/Providers/GeneratedTemplateProviderFactory.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Providers/GeneratedTemplateProviderFactory.cs index 4e757d5..e6ac827 100644 --- a/src/Mockaco/Templating/Generating/Providers/GeneratedTemplateProviderFactory.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Providers/GeneratedTemplateProviderFactory.cs @@ -4,7 +4,7 @@ namespace Mockaco.Templating.Generating.Providers { - public class GeneratedTemplateProviderFactory : IGeneratedTemplateProviderFactory + internal class GeneratedTemplateProviderFactory : IGeneratedTemplateProviderFactory { private readonly IServiceProvider _serviceProvider; diff --git a/src/Mockaco/Templating/Generating/Providers/IGeneratedTemplateProvider.cs b/src/Mockaco.AspNetCore/Templating/Generating/Providers/IGeneratedTemplateProvider.cs similarity index 85% rename from src/Mockaco/Templating/Generating/Providers/IGeneratedTemplateProvider.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Providers/IGeneratedTemplateProvider.cs index 1f22e05..51b1da7 100644 --- a/src/Mockaco/Templating/Generating/Providers/IGeneratedTemplateProvider.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Providers/IGeneratedTemplateProvider.cs @@ -5,7 +5,7 @@ namespace Mockaco.Templating.Generating.Providers { - public interface IGeneratedTemplateProvider + internal interface IGeneratedTemplateProvider { Task> GetTemplatesAsync(Stream sourceStream, CancellationToken cancellationToken = default); } diff --git a/src/Mockaco/Templating/Generating/Providers/IGeneratedTemplateProviderFactory.cs b/src/Mockaco.AspNetCore/Templating/Generating/Providers/IGeneratedTemplateProviderFactory.cs similarity index 69% rename from src/Mockaco/Templating/Generating/Providers/IGeneratedTemplateProviderFactory.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Providers/IGeneratedTemplateProviderFactory.cs index ced2145..ab68891 100644 --- a/src/Mockaco/Templating/Generating/Providers/IGeneratedTemplateProviderFactory.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Providers/IGeneratedTemplateProviderFactory.cs @@ -1,6 +1,6 @@ namespace Mockaco.Templating.Generating.Providers { - public interface IGeneratedTemplateProviderFactory + internal interface IGeneratedTemplateProviderFactory { IGeneratedTemplateProvider Create(string providerType); } diff --git a/src/Mockaco/Templating/Generating/Providers/OpenApiTemplateProvider.cs b/src/Mockaco.AspNetCore/Templating/Generating/Providers/OpenApiTemplateProvider.cs similarity index 98% rename from src/Mockaco/Templating/Generating/Providers/OpenApiTemplateProvider.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Providers/OpenApiTemplateProvider.cs index 04018a9..a9d4468 100644 --- a/src/Mockaco/Templating/Generating/Providers/OpenApiTemplateProvider.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Providers/OpenApiTemplateProvider.cs @@ -12,7 +12,7 @@ namespace Mockaco.Templating.Generating.Providers { - public class OpenApiTemplateProvider : IGeneratedTemplateProvider + internal class OpenApiTemplateProvider : IGeneratedTemplateProvider { private readonly ILogger _logger; diff --git a/src/Mockaco/Templating/Generating/ServiceCollectionExtensions.cs b/src/Mockaco.AspNetCore/Templating/Generating/ServiceCollectionExtensions.cs similarity index 93% rename from src/Mockaco/Templating/Generating/ServiceCollectionExtensions.cs rename to src/Mockaco.AspNetCore/Templating/Generating/ServiceCollectionExtensions.cs index e3ad7ed..25dfe64 100644 --- a/src/Mockaco/Templating/Generating/ServiceCollectionExtensions.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/ServiceCollectionExtensions.cs @@ -1,14 +1,12 @@ -using System; -using System.CommandLine; -using System.CommandLine.Invocation; -using System.Threading; -using Microsoft.Extensions.DependencyInjection; +using Mockaco.Templating.Generating; using Mockaco.Templating.Generating.Cli; using Mockaco.Templating.Generating.Providers; using Mockaco.Templating.Generating.Source; using Mockaco.Templating.Generating.Store; +using System.CommandLine; +using System.CommandLine.Invocation; -namespace Mockaco.Templating.Generating +namespace Microsoft.Extensions.DependencyInjection { internal static class ServiceCollectionExtensions { @@ -44,7 +42,6 @@ public static IServiceCollection AddTemplatesGenerating(this IServiceCollection cmd.Handler = CommandHandler.Create( provider.GetRequiredService().ExecuteAsync); - return cmd; }); diff --git a/src/Mockaco/Templating/Generating/Source/HttpContentProvider.cs b/src/Mockaco.AspNetCore/Templating/Generating/Source/HttpContentProvider.cs similarity index 100% rename from src/Mockaco/Templating/Generating/Source/HttpContentProvider.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Source/HttpContentProvider.cs diff --git a/src/Mockaco/Templating/Generating/Source/ISourceContentProvider.cs b/src/Mockaco.AspNetCore/Templating/Generating/Source/ISourceContentProvider.cs similarity index 83% rename from src/Mockaco/Templating/Generating/Source/ISourceContentProvider.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Source/ISourceContentProvider.cs index cb76990..e76479e 100644 --- a/src/Mockaco/Templating/Generating/Source/ISourceContentProvider.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Source/ISourceContentProvider.cs @@ -5,7 +5,7 @@ namespace Mockaco.Templating.Generating.Source { - public interface ISourceContentProvider + internal interface ISourceContentProvider { Task GetStreamAsync(Uri sourceUri, CancellationToken cancellationToken); } diff --git a/src/Mockaco/Templating/Generating/Source/LocalFileContentProvider.cs b/src/Mockaco.AspNetCore/Templating/Generating/Source/LocalFileContentProvider.cs similarity index 100% rename from src/Mockaco/Templating/Generating/Source/LocalFileContentProvider.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Source/LocalFileContentProvider.cs diff --git a/src/Mockaco/Templating/Generating/Source/SourceContentProviderComposite.cs b/src/Mockaco.AspNetCore/Templating/Generating/Source/SourceContentProviderComposite.cs similarity index 96% rename from src/Mockaco/Templating/Generating/Source/SourceContentProviderComposite.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Source/SourceContentProviderComposite.cs index 09b926b..49fde94 100644 --- a/src/Mockaco/Templating/Generating/Source/SourceContentProviderComposite.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Source/SourceContentProviderComposite.cs @@ -7,7 +7,7 @@ namespace Mockaco.Templating.Generating.Source { - public class SourceContentProviderComposite : ISourceContentProvider + internal class SourceContentProviderComposite : ISourceContentProvider { private readonly IServiceProvider _serviceProvider; private readonly IDictionary, Type> _providersRegistry = new Dictionary, Type>(); diff --git a/src/Mockaco/Templating/Generating/Store/GeneratedTemplateStore.cs b/src/Mockaco.AspNetCore/Templating/Generating/Store/GeneratedTemplateStore.cs similarity index 92% rename from src/Mockaco/Templating/Generating/Store/GeneratedTemplateStore.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Store/GeneratedTemplateStore.cs index 8a8c79e..e296da7 100644 --- a/src/Mockaco/Templating/Generating/Store/GeneratedTemplateStore.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Store/GeneratedTemplateStore.cs @@ -8,7 +8,7 @@ namespace Mockaco.Templating.Generating.Store { - public class GeneratedTemplateStore : IGeneratedTemplateStore + internal class GeneratedTemplateStore : IGeneratedTemplateStore { private const string FileExtension = ".json"; @@ -22,7 +22,7 @@ public GeneratedTemplateStore(IOptions options, ILogger _options.Value.RootDir; - + public async Task SaveAsync(GeneratedTemplate template, CancellationToken cancellationToken = default) { var templateFileName = GetFileName(template); @@ -38,7 +38,7 @@ private byte[] GetTemplateContent(GeneratedTemplate template) { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, WriteIndented = true, - IgnoreNullValues = true, + DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull }); } diff --git a/src/Mockaco/Templating/Generating/Store/IGeneratedTemplateStore.cs b/src/Mockaco.AspNetCore/Templating/Generating/Store/IGeneratedTemplateStore.cs similarity index 88% rename from src/Mockaco/Templating/Generating/Store/IGeneratedTemplateStore.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Store/IGeneratedTemplateStore.cs index 4c60194..9a6ffb3 100644 --- a/src/Mockaco/Templating/Generating/Store/IGeneratedTemplateStore.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Store/IGeneratedTemplateStore.cs @@ -4,7 +4,7 @@ namespace Mockaco.Templating.Generating.Store { - public interface IGeneratedTemplateStore + internal interface IGeneratedTemplateStore { Task SaveAsync(GeneratedTemplate template, CancellationToken cancellationToken = default); diff --git a/src/Mockaco/Templating/Generating/Store/TemplateStoreOptions.cs b/src/Mockaco.AspNetCore/Templating/Generating/Store/TemplateStoreOptions.cs similarity index 72% rename from src/Mockaco/Templating/Generating/Store/TemplateStoreOptions.cs rename to src/Mockaco.AspNetCore/Templating/Generating/Store/TemplateStoreOptions.cs index 8bc9c4b..be575ad 100644 --- a/src/Mockaco/Templating/Generating/Store/TemplateStoreOptions.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/Store/TemplateStoreOptions.cs @@ -1,6 +1,6 @@ namespace Mockaco.Templating.Generating.Store { - public class TemplateStoreOptions + internal class TemplateStoreOptions { public string RootDir { get; set; } } diff --git a/src/Mockaco/Templating/Generating/TemplatesGenerator.cs b/src/Mockaco.AspNetCore/Templating/Generating/TemplatesGenerator.cs similarity index 97% rename from src/Mockaco/Templating/Generating/TemplatesGenerator.cs rename to src/Mockaco.AspNetCore/Templating/Generating/TemplatesGenerator.cs index 95acb4c..7b9038f 100644 --- a/src/Mockaco/Templating/Generating/TemplatesGenerator.cs +++ b/src/Mockaco.AspNetCore/Templating/Generating/TemplatesGenerator.cs @@ -6,7 +6,7 @@ namespace Mockaco.Templating.Generating { - public class TemplatesGenerator + internal class TemplatesGenerator { private readonly ISourceContentProvider _sourceContentProvider; private readonly IGeneratedTemplateProviderFactory _providerFactory; diff --git a/src/Mockaco/Templating/ITemplateTransformer.cs b/src/Mockaco.AspNetCore/Templating/ITemplateTransformer.cs similarity index 87% rename from src/Mockaco/Templating/ITemplateTransformer.cs rename to src/Mockaco.AspNetCore/Templating/ITemplateTransformer.cs index d50b264..bfe00bc 100644 --- a/src/Mockaco/Templating/ITemplateTransformer.cs +++ b/src/Mockaco.AspNetCore/Templating/ITemplateTransformer.cs @@ -2,7 +2,7 @@ namespace Mockaco { - public interface ITemplateTransformer + internal interface ITemplateTransformer { //TODO Improve this abstraction Task