diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e19d399..f612280 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./coverage/lcov.info - name: Package - run: dotnet pack --no-restore src/prismicio.AspNetCore/prismicio.AspNetCore.csproj + run: dotnet pack --no-restore src/prismic/prismic.csproj \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 12fd8fa..4598fee 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -22,7 +22,7 @@ "/p:CoverletOutputFormat=lcov", ], "options": { - "cwd": "${workspaceFolder}/tests/prismicio.AspNetCore.Tests/" + "cwd": "${workspaceFolder}/tests/prismic.tests/" }, "problemMatcher": "$msCompile" } diff --git a/csharp-kit.sln b/csharp-kit.sln index 4e5a7ae..e0acb5f 100644 --- a/csharp-kit.sln +++ b/csharp-kit.sln @@ -5,13 +5,11 @@ VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7E5C0C00-6452-4B41-A12E-CEFE34C7F3CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prismicio.AspNetCore", "src\prismicio.AspNetCore\prismicio.AspNetCore.csproj", "{B37858DD-1563-4087-977E-21D5A3C34123}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prismic", "src\prismic\prismicio.csproj", "{B37858DD-1563-4087-977E-21D5A3C34123}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C7AAB71-A3E0-46F0-9685-AF48587AA50B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prismicio.AspNetCore.Tests", "tests\prismicio.AspNetCore.Tests\prismicio.AspNetCore.Tests.csproj", "{B8B4EEBC-D8E2-426C-ACFC-944E41BA5FC9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{37A70584-1361-4C1B-97CB-0F3FFE976ECE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prismic.tests", "tests\prismic.tests\prismicio.tests.csproj", "{B8B4EEBC-D8E2-426C-ACFC-944E41BA5FC9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/prismicio.AspNetCore/AlternateLanguage.cs b/src/prismic/AlternateLanguage.cs similarity index 100% rename from src/prismicio.AspNetCore/AlternateLanguage.cs rename to src/prismic/AlternateLanguage.cs diff --git a/src/prismicio.AspNetCore/Api.cs b/src/prismic/Api.cs similarity index 100% rename from src/prismicio.AspNetCore/Api.cs rename to src/prismic/Api.cs diff --git a/src/prismicio.AspNetCore/ApiData.cs b/src/prismic/ApiData.cs similarity index 100% rename from src/prismicio.AspNetCore/ApiData.cs rename to src/prismic/ApiData.cs diff --git a/src/prismicio.AspNetCore/BooleanFragment.cs b/src/prismic/BooleanFragment.cs similarity index 100% rename from src/prismicio.AspNetCore/BooleanFragment.cs rename to src/prismic/BooleanFragment.cs diff --git a/src/prismicio.AspNetCore/DefaultPrismicApiAccessor.cs b/src/prismic/DefaultPrismicApiAccessor.cs similarity index 100% rename from src/prismicio.AspNetCore/DefaultPrismicApiAccessor.cs rename to src/prismic/DefaultPrismicApiAccessor.cs diff --git a/src/prismicio.AspNetCore/DictionaryExtensions.cs b/src/prismic/DictionaryExtensions.cs similarity index 100% rename from src/prismicio.AspNetCore/DictionaryExtensions.cs rename to src/prismic/DictionaryExtensions.cs diff --git a/src/prismicio.AspNetCore/Document.cs b/src/prismic/Document.cs similarity index 100% rename from src/prismicio.AspNetCore/Document.cs rename to src/prismic/Document.cs diff --git a/src/prismicio.AspNetCore/DocumentLinkResolver.cs b/src/prismic/DocumentLinkResolver.cs similarity index 100% rename from src/prismicio.AspNetCore/DocumentLinkResolver.cs rename to src/prismic/DocumentLinkResolver.cs diff --git a/src/prismicio.AspNetCore/Experiments.cs b/src/prismic/Experiments.cs similarity index 100% rename from src/prismicio.AspNetCore/Experiments.cs rename to src/prismic/Experiments.cs diff --git a/src/prismicio.AspNetCore/Form.cs b/src/prismic/Form.cs similarity index 100% rename from src/prismicio.AspNetCore/Form.cs rename to src/prismic/Form.cs diff --git a/src/prismicio.AspNetCore/Fragment.cs b/src/prismic/Fragment.cs similarity index 100% rename from src/prismicio.AspNetCore/Fragment.cs rename to src/prismic/Fragment.cs diff --git a/src/prismicio.AspNetCore/GroupDoc.cs b/src/prismic/GroupDoc.cs similarity index 100% rename from src/prismicio.AspNetCore/GroupDoc.cs rename to src/prismic/GroupDoc.cs diff --git a/src/prismicio.AspNetCore/HtmlExtensions.cs b/src/prismic/HtmlExtensions.cs similarity index 100% rename from src/prismicio.AspNetCore/HtmlExtensions.cs rename to src/prismic/HtmlExtensions.cs diff --git a/src/prismicio.AspNetCore/HtmlSerializer.cs b/src/prismic/HtmlSerializer.cs similarity index 100% rename from src/prismicio.AspNetCore/HtmlSerializer.cs rename to src/prismic/HtmlSerializer.cs diff --git a/src/prismicio.AspNetCore/ICache.cs b/src/prismic/ICache.cs similarity index 100% rename from src/prismicio.AspNetCore/ICache.cs rename to src/prismic/ICache.cs diff --git a/src/prismicio.AspNetCore/IPrismicApiAccessor.cs b/src/prismic/IPrismicApiAccessor.cs similarity index 100% rename from src/prismicio.AspNetCore/IPrismicApiAccessor.cs rename to src/prismic/IPrismicApiAccessor.cs diff --git a/src/prismicio.AspNetCore/InMemoryCache.cs b/src/prismic/InMemoryCache.cs similarity index 100% rename from src/prismicio.AspNetCore/InMemoryCache.cs rename to src/prismic/InMemoryCache.cs diff --git a/src/prismicio.AspNetCore/JTokenExtensions.cs b/src/prismic/JTokenExtensions.cs similarity index 100% rename from src/prismicio.AspNetCore/JTokenExtensions.cs rename to src/prismic/JTokenExtensions.cs diff --git a/src/prismicio.AspNetCore/Middleware/PreviewExpiredExceptionHandlerMiddleware.cs b/src/prismic/Middleware/PreviewExpiredExceptionHandlerMiddleware.cs similarity index 100% rename from src/prismicio.AspNetCore/Middleware/PreviewExpiredExceptionHandlerMiddleware.cs rename to src/prismic/Middleware/PreviewExpiredExceptionHandlerMiddleware.cs diff --git a/src/prismicio.AspNetCore/Middleware/PrismicMiddlewareExtensions.cs b/src/prismic/Middleware/PrismicMiddlewareExtensions.cs similarity index 100% rename from src/prismicio.AspNetCore/Middleware/PrismicMiddlewareExtensions.cs rename to src/prismic/Middleware/PrismicMiddlewareExtensions.cs diff --git a/src/prismicio.AspNetCore/Predicates.cs b/src/prismic/Predicates.cs similarity index 100% rename from src/prismicio.AspNetCore/Predicates.cs rename to src/prismic/Predicates.cs diff --git a/src/prismicio.AspNetCore/PrismicClientException.cs b/src/prismic/PrismicClientException.cs similarity index 100% rename from src/prismicio.AspNetCore/PrismicClientException.cs rename to src/prismic/PrismicClientException.cs diff --git a/src/prismicio.AspNetCore/PrismicHttpClient.cs b/src/prismic/PrismicHttpClient.cs similarity index 100% rename from src/prismicio.AspNetCore/PrismicHttpClient.cs rename to src/prismic/PrismicHttpClient.cs diff --git a/src/prismicio.AspNetCore/PrismicSettings.cs b/src/prismic/PrismicSettings.cs similarity index 100% rename from src/prismicio.AspNetCore/PrismicSettings.cs rename to src/prismic/PrismicSettings.cs diff --git a/src/prismicio.AspNetCore/Ref.cs b/src/prismic/Ref.cs similarity index 100% rename from src/prismicio.AspNetCore/Ref.cs rename to src/prismic/Ref.cs diff --git a/src/prismicio.AspNetCore/Response.cs b/src/prismic/Response.cs similarity index 100% rename from src/prismicio.AspNetCore/Response.cs rename to src/prismic/Response.cs diff --git a/src/prismicio.AspNetCore/ServiceCollectionExtensions.cs b/src/prismic/ServiceCollectionExtensions.cs similarity index 100% rename from src/prismicio.AspNetCore/ServiceCollectionExtensions.cs rename to src/prismic/ServiceCollectionExtensions.cs diff --git a/src/prismicio.AspNetCore/StructuredText.cs b/src/prismic/StructuredText.cs similarity index 100% rename from src/prismicio.AspNetCore/StructuredText.cs rename to src/prismic/StructuredText.cs diff --git a/src/prismicio.AspNetCore/WithFragments.cs b/src/prismic/WithFragments.cs similarity index 100% rename from src/prismicio.AspNetCore/WithFragments.cs rename to src/prismic/WithFragments.cs diff --git a/src/prismicio.AspNetCore/prismicio.AspNetCore.csproj b/src/prismic/prismicio.csproj similarity index 100% rename from src/prismicio.AspNetCore/prismicio.AspNetCore.csproj rename to src/prismic/prismicio.csproj diff --git a/tests/prismicio.AspNetCore.Tests/ApiTests.cs b/tests/prismic.tests/ApiTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/ApiTests.cs rename to tests/prismic.tests/ApiTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/DocTest.cs b/tests/prismic.tests/DocTest.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/DocTest.cs rename to tests/prismic.tests/DocTest.cs diff --git a/tests/prismicio.AspNetCore.Tests/Fixtures.cs b/tests/prismic.tests/Fixtures.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/Fixtures.cs rename to tests/prismic.tests/Fixtures.cs diff --git a/tests/prismicio.AspNetCore.Tests/FormTests.cs b/tests/prismic.tests/FormTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/FormTests.cs rename to tests/prismic.tests/FormTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/FragmentsTests.cs b/tests/prismic.tests/FragmentsTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/FragmentsTests.cs rename to tests/prismic.tests/FragmentsTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/ImageTests.cs b/tests/prismic.tests/ImageTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/ImageTests.cs rename to tests/prismic.tests/ImageTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/InMemoryCacheTests.cs b/tests/prismic.tests/InMemoryCacheTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/InMemoryCacheTests.cs rename to tests/prismic.tests/InMemoryCacheTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/PredicatesTest.cs b/tests/prismic.tests/PredicatesTest.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/PredicatesTest.cs rename to tests/prismic.tests/PredicatesTest.cs diff --git a/tests/prismicio.AspNetCore.Tests/PreviewExpiredExceptionHandlerTests.cs b/tests/prismic.tests/PreviewExpiredExceptionHandlerTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/PreviewExpiredExceptionHandlerTests.cs rename to tests/prismic.tests/PreviewExpiredExceptionHandlerTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/PrismicApiAccessorTests.cs b/tests/prismic.tests/PrismicApiAccessorTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/PrismicApiAccessorTests.cs rename to tests/prismic.tests/PrismicApiAccessorTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/PrismicClientTests.cs b/tests/prismic.tests/PrismicClientTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/PrismicClientTests.cs rename to tests/prismic.tests/PrismicClientTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/ServiceCollectionExtensionsTests.cs b/tests/prismic.tests/ServiceCollectionExtensionsTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/ServiceCollectionExtensionsTests.cs rename to tests/prismic.tests/ServiceCollectionExtensionsTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/SliceZoneParsingTests.cs b/tests/prismic.tests/SliceZoneParsingTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/SliceZoneParsingTests.cs rename to tests/prismic.tests/SliceZoneParsingTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/StructuredTextLinkTests.cs b/tests/prismic.tests/StructuredTextLinkTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/StructuredTextLinkTests.cs rename to tests/prismic.tests/StructuredTextLinkTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/StructuredTextSpanTests.cs b/tests/prismic.tests/StructuredTextSpanTests.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/StructuredTextSpanTests.cs rename to tests/prismic.tests/StructuredTextSpanTests.cs diff --git a/tests/prismicio.AspNetCore.Tests/TestHelper.cs b/tests/prismic.tests/TestHelper.cs similarity index 100% rename from tests/prismicio.AspNetCore.Tests/TestHelper.cs rename to tests/prismic.tests/TestHelper.cs diff --git a/tests/prismicio.AspNetCore.Tests/TestResults/lcov.opencover.xml b/tests/prismic.tests/TestResults/lcov.opencover.xml similarity index 100% rename from tests/prismicio.AspNetCore.Tests/TestResults/lcov.opencover.xml rename to tests/prismic.tests/TestResults/lcov.opencover.xml diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/api_data.json b/tests/prismic.tests/fixtures/api_data.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/api_data.json rename to tests/prismic.tests/fixtures/api_data.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/composite_slices.json b/tests/prismic.tests/fixtures/composite_slices.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/composite_slices.json rename to tests/prismic.tests/fixtures/composite_slices.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/composite_slices_linked_documents.json b/tests/prismic.tests/fixtures/composite_slices_linked_documents.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/composite_slices_linked_documents.json rename to tests/prismic.tests/fixtures/composite_slices_linked_documents.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/fragments.json b/tests/prismic.tests/fixtures/fragments.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/fragments.json rename to tests/prismic.tests/fixtures/fragments.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/image.json b/tests/prismic.tests/fixtures/image.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/image.json rename to tests/prismic.tests/fixtures/image.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/language.json b/tests/prismic.tests/fixtures/language.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/language.json rename to tests/prismic.tests/fixtures/language.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/rawexample.json b/tests/prismic.tests/fixtures/rawexample.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/rawexample.json rename to tests/prismic.tests/fixtures/rawexample.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/response.json b/tests/prismic.tests/fixtures/response.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/response.json rename to tests/prismic.tests/fixtures/response.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/simple_slices.json b/tests/prismic.tests/fixtures/simple_slices.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/simple_slices.json rename to tests/prismic.tests/fixtures/simple_slices.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/soundcloud.json b/tests/prismic.tests/fixtures/soundcloud.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/soundcloud.json rename to tests/prismic.tests/fixtures/soundcloud.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/structuredtext_links.json b/tests/prismic.tests/fixtures/structuredtext_links.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/structuredtext_links.json rename to tests/prismic.tests/fixtures/structuredtext_links.json diff --git a/tests/prismicio.AspNetCore.Tests/fixtures/structuredtext_spans.json b/tests/prismic.tests/fixtures/structuredtext_spans.json similarity index 100% rename from tests/prismicio.AspNetCore.Tests/fixtures/structuredtext_spans.json rename to tests/prismic.tests/fixtures/structuredtext_spans.json diff --git a/tests/prismicio.AspNetCore.Tests/prismicio.AspNetCore.Tests.csproj b/tests/prismic.tests/prismicio.tests.csproj similarity index 89% rename from tests/prismicio.AspNetCore.Tests/prismicio.AspNetCore.Tests.csproj rename to tests/prismic.tests/prismicio.tests.csproj index 30d2f16..192a27f 100644 --- a/tests/prismicio.AspNetCore.Tests/prismicio.AspNetCore.Tests.csproj +++ b/tests/prismic.tests/prismicio.tests.csproj @@ -17,7 +17,7 @@ - +