diff --git a/server/FilterLists.sln b/server/FilterLists.sln index d8192fa13..1c384cfb7 100644 --- a/server/FilterLists.sln +++ b/server/FilterLists.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Agent", "src\Fi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data", "src\FilterLists.Data\FilterLists.Data.csproj", "{E604D351-D471-41FD-BA82-BAE12B342B4D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Migrations", "src\FilterLists.Data.Migrations\FilterLists.Data.Migrations.csproj", "{312A8819-5CAB-4F43-B182-50CAD5D8FEF9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Services", "src\FilterLists.Services\FilterLists.Services.csproj", "{51186C58-1627-4743-B86D-4B355D8A152B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Api", "src\FilterLists.Api\FilterLists.Api.csproj", "{1B8105E2-0721-4DC0-8243-02932A05D98B}" @@ -45,6 +47,10 @@ Global {1B8105E2-0721-4DC0-8243-02932A05D98B}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B8105E2-0721-4DC0-8243-02932A05D98B}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B8105E2-0721-4DC0-8243-02932A05D98B}.Release|Any CPU.Build.0 = Release|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Release|Any CPU.Build.0 = Release|Any CPU {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Debug|Any CPU.Build.0 = Debug|Any CPU {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -70,6 +76,7 @@ Global {E604D351-D471-41FD-BA82-BAE12B342B4D} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} {51186C58-1627-4743-B86D-4B355D8A152B} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} {1B8105E2-0721-4DC0-8243-02932A05D98B} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} {668D27A9-FD28-4F2A-BA4C-37BBAED95617} = {EA11453B-FB14-4F0E-A19B-B8089498F677} {EB65E67D-3C29-4555-8D9B-C90801880F51} = {EA11453B-FB14-4F0E-A19B-B8089498F677} {0F419F45-EC3F-409B-95A2-F6AEE21E4041} = {EA11453B-FB14-4F0E-A19B-B8089498F677} diff --git a/server/src/FilterLists.Api/Dockerfile b/server/src/FilterLists.Api/Dockerfile index ed00eaab5..164a1b003 100644 --- a/server/src/FilterLists.Api/Dockerfile +++ b/server/src/FilterLists.Api/Dockerfile @@ -20,6 +20,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build # restore WORKDIR /app/src COPY server/src/FilterLists.Data/FilterLists.Data.csproj FilterLists.Data/ +COPY server/src/FilterLists.Data.Migrations/FilterLists.Data.Migrations.csproj FilterLists.Data.Migrations/ COPY server/src/FilterLists.Services/FilterLists.Services.csproj FilterLists.Services/ WORKDIR /app/src/FilterLists.Api COPY server/src/FilterLists.Api/FilterLists.Api.csproj . @@ -28,6 +29,7 @@ RUN dotnet restore # build WORKDIR /app/src COPY server/src/FilterLists.Data/. FilterLists.Data/ +COPY server/src/FilterLists.Data.Migrations/. FilterLists.Data.Migrations/ COPY server/src/FilterLists.Services/. FilterLists.Services/ WORKDIR /app/src/FilterLists.Api COPY server/src/FilterLists.Api/. . diff --git a/server/src/FilterLists.Data/.editorconfig b/server/src/FilterLists.Data.Migrations/.editorconfig similarity index 100% rename from server/src/FilterLists.Data/.editorconfig rename to server/src/FilterLists.Data.Migrations/.editorconfig diff --git a/server/src/FilterLists.Data.Migrations/FilterLists.Data.Migrations.csproj b/server/src/FilterLists.Data.Migrations/FilterLists.Data.Migrations.csproj new file mode 100644 index 000000000..775a07ac6 --- /dev/null +++ b/server/src/FilterLists.Data.Migrations/FilterLists.Data.Migrations.csproj @@ -0,0 +1,21 @@ + + + + netstandard2.1 + + + + Collin M. Barrett + Collin M. Barrett + FilterLists + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + git + + + + + + + diff --git a/server/src/FilterLists.Data/Migrations/20180210130730_InitialCreate.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180210130730_InitialCreate.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180210130730_InitialCreate.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180210130730_InitialCreate.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180210130730_InitialCreate.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180210130730_InitialCreate.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180210130730_InitialCreate.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180210130730_InitialCreate.cs diff --git a/server/src/FilterLists.Data/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs diff --git a/server/src/FilterLists.Data/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180210234702_AddSnapshotModifiedDateUtc.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs diff --git a/server/src/FilterLists.Data/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180213171240_AddDefaultLicenseId.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180213171240_AddDefaultLicenseId.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180213171240_AddDefaultLicenseId.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180213171240_AddDefaultLicenseId.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180213171240_AddDefaultLicenseId.cs diff --git a/server/src/FilterLists.Data/Migrations/20180214152734_AddPublishedDate.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180214152734_AddPublishedDate.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180214152734_AddPublishedDate.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180214152734_AddPublishedDate.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180214152734_AddPublishedDate.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180214152734_AddPublishedDate.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180214152734_AddPublishedDate.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180214152734_AddPublishedDate.cs diff --git a/server/src/FilterLists.Data/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180214153140_DefaultOptionalDatesToNull.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180214153140_DefaultOptionalDatesToNull.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180214153140_DefaultOptionalDatesToNull.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180214153140_DefaultOptionalDatesToNull.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180214153140_DefaultOptionalDatesToNull.cs diff --git a/server/src/FilterLists.Data/Migrations/20180324001253_addChatUrl.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180324001253_addChatUrl.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180324001253_addChatUrl.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180324001253_addChatUrl.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180324001253_addChatUrl.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180324001253_addChatUrl.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180324001253_addChatUrl.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180324001253_addChatUrl.cs diff --git a/server/src/FilterLists.Data/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs diff --git a/server/src/FilterLists.Data/Migrations/20180815233049_AddCantSnapshot.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180815233049_AddCantSnapshot.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180815233049_AddCantSnapshot.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180815233049_AddCantSnapshot.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180815233049_AddCantSnapshot.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180815233049_AddCantSnapshot.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180815233049_AddCantSnapshot.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180815233049_AddCantSnapshot.cs diff --git a/server/src/FilterLists.Data/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180818204956_AddRuleRawUniqueIndex.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180818204956_AddRuleRawUniqueIndex.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180818204956_AddRuleRawUniqueIndex.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180818204956_AddRuleRawUniqueIndex.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180818204956_AddRuleRawUniqueIndex.cs diff --git a/server/src/FilterLists.Data/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180819211516_ShortenRuleRawForUniqueIndex.cs diff --git a/server/src/FilterLists.Data/Migrations/20180821200425_AddTag.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180821200425_AddTag.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180821200425_AddTag.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180821200425_AddTag.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180821200425_AddTag.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180821200425_AddTag.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180821200425_AddTag.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180821200425_AddTag.cs diff --git a/server/src/FilterLists.Data/Migrations/20180822231632_LengthenRuleRaw.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180822231632_LengthenRuleRaw.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180822231632_LengthenRuleRaw.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180822231632_LengthenRuleRaw.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180822231632_LengthenRuleRaw.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180822231632_LengthenRuleRaw.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180822231632_LengthenRuleRaw.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180822231632_LengthenRuleRaw.cs diff --git a/server/src/FilterLists.Data/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180823174733_SimplifySnapshotRuleModel.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180823174733_SimplifySnapshotRuleModel.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180823174733_SimplifySnapshotRuleModel.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180823174733_SimplifySnapshotRuleModel.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180823174733_SimplifySnapshotRuleModel.cs diff --git a/server/src/FilterLists.Data/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180823204701_DropRuleRawUniqueIndexAndTrimming.cs diff --git a/server/src/FilterLists.Data/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180824155224_AddWaybackTimestamp.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180824155224_AddWaybackTimestamp.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180824155224_AddWaybackTimestamp.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180824155224_AddWaybackTimestamp.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180824155224_AddWaybackTimestamp.cs diff --git a/server/src/FilterLists.Data/Migrations/20180824223021_AddBatchSize.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180824223021_AddBatchSize.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180824223021_AddBatchSize.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180824223021_AddBatchSize.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180824223021_AddBatchSize.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180824223021_AddBatchSize.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180824223021_AddBatchSize.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180824223021_AddBatchSize.cs diff --git a/server/src/FilterLists.Data/Migrations/20180825130502_ExpandBatchSize.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180825130502_ExpandBatchSize.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180825130502_ExpandBatchSize.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180825130502_ExpandBatchSize.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180825130502_ExpandBatchSize.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180825130502_ExpandBatchSize.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180825130502_ExpandBatchSize.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180825130502_ExpandBatchSize.cs diff --git a/server/src/FilterLists.Data/Migrations/20180827001701_DropBatchSize.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180827001701_DropBatchSize.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180827001701_DropBatchSize.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180827001701_DropBatchSize.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180827001701_DropBatchSize.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180827001701_DropBatchSize.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180827001701_DropBatchSize.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180827001701_DropBatchSize.cs diff --git a/server/src/FilterLists.Data/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180827112409_DropSnapshotRuleCreatedDateUtc.cs diff --git a/server/src/FilterLists.Data/Migrations/20180828124832_AddWaybackUrl.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180828124832_AddWaybackUrl.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180828124832_AddWaybackUrl.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180828124832_AddWaybackUrl.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180828124832_AddWaybackUrl.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180828124832_AddWaybackUrl.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180828124832_AddWaybackUrl.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180828124832_AddWaybackUrl.cs diff --git a/server/src/FilterLists.Data/Migrations/20180829152737_DropCantSnapshot.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180829152737_DropCantSnapshot.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180829152737_DropCantSnapshot.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180829152737_DropCantSnapshot.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180829152737_DropCantSnapshot.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180829152737_DropCantSnapshot.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180829152737_DropCantSnapshot.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180829152737_DropCantSnapshot.cs diff --git a/server/src/FilterLists.Data/Migrations/20180830220606_AddMd5Checksum.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180830220606_AddMd5Checksum.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180830220606_AddMd5Checksum.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180830220606_AddMd5Checksum.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180830220606_AddMd5Checksum.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180830220606_AddMd5Checksum.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180830220606_AddMd5Checksum.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180830220606_AddMd5Checksum.cs diff --git a/server/src/FilterLists.Data/Migrations/20180901010618_AddWasUpdated.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180901010618_AddWasUpdated.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180901010618_AddWasUpdated.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180901010618_AddWasUpdated.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180901010618_AddWasUpdated.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180901010618_AddWasUpdated.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180901010618_AddWasUpdated.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180901010618_AddWasUpdated.cs diff --git a/server/src/FilterLists.Data/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180901154239_RemoveLicenseRequirementToPreventOnDeleteCascade.cs diff --git a/server/src/FilterLists.Data/Migrations/20180909161810_AddDependent.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180909161810_AddDependent.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180909161810_AddDependent.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180909161810_AddDependent.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180909161810_AddDependent.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180909161810_AddDependent.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180909161810_AddDependent.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180909161810_AddDependent.cs diff --git a/server/src/FilterLists.Data/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180909190202_AddViewUrlMirrors.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180909190202_AddViewUrlMirrors.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180909190202_AddViewUrlMirrors.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180909190202_AddViewUrlMirrors.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180909190202_AddViewUrlMirrors.cs diff --git a/server/src/FilterLists.Data/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180916131916_AddIsAbpSubscribable.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20180916131916_AddIsAbpSubscribable.cs b/server/src/FilterLists.Data.Migrations/Migrations/20180916131916_AddIsAbpSubscribable.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20180916131916_AddIsAbpSubscribable.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20180916131916_AddIsAbpSubscribable.cs diff --git a/server/src/FilterLists.Data/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181005170600_RenameDiscontinuedToUpdated.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181005170600_RenameDiscontinuedToUpdated.cs diff --git a/server/src/FilterLists.Data/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181005182658_ConvertPublishedAndUpdatedToDateTime.cs diff --git a/server/src/FilterLists.Data/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181018170013_UseSignedPrimaryKeys.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20181018170013_UseSignedPrimaryKeys.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181018170013_UseSignedPrimaryKeys.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181018170013_UseSignedPrimaryKeys.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181018170013_UseSignedPrimaryKeys.cs diff --git a/server/src/FilterLists.Data/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs b/server/src/FilterLists.Data.Migrations/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20181019122801_CleanupUseSignedPrimaryKeys.cs diff --git a/server/src/FilterLists.Data/Migrations/20200210010407_InitialEfCoreSeeding.Designer.cs b/server/src/FilterLists.Data.Migrations/Migrations/20200210010407_InitialEfCoreSeeding.Designer.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20200210010407_InitialEfCoreSeeding.Designer.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20200210010407_InitialEfCoreSeeding.Designer.cs diff --git a/server/src/FilterLists.Data/Migrations/20200210010407_InitialEfCoreSeeding.cs b/server/src/FilterLists.Data.Migrations/Migrations/20200210010407_InitialEfCoreSeeding.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/20200210010407_InitialEfCoreSeeding.cs rename to server/src/FilterLists.Data.Migrations/Migrations/20200210010407_InitialEfCoreSeeding.cs diff --git a/server/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs b/server/src/FilterLists.Data.Migrations/Migrations/FilterListsDbContextModelSnapshot.cs similarity index 100% rename from server/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs rename to server/src/FilterLists.Data.Migrations/Migrations/FilterListsDbContextModelSnapshot.cs diff --git a/server/src/FilterLists.Data/Constants.cs b/server/src/FilterLists.Data/Constants.cs index 24c46409f..9814d1c4d 100644 --- a/server/src/FilterLists.Data/Constants.cs +++ b/server/src/FilterLists.Data/Constants.cs @@ -7,5 +7,7 @@ namespace FilterLists.Data public static class Constants { public static readonly ServerVersion ServerVersion = new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb); + + public const string MigrationsAssembly = "FilterLists.Data.Migrations"; } } \ No newline at end of file diff --git a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 7f7e511fa..a880a8601 100644 --- a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -22,7 +22,7 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I services.AddSingleton(c => config); services.AddDbContextPool(o => o.UseMySql(config.GetConnectionString("FilterListsConnection"), - m => m.MigrationsAssembly("FilterLists.Data") + m => m.MigrationsAssembly(Constants.MigrationsAssembly) .ServerVersion(Constants.ServerVersion))); services.TryAddScoped(); services.TryAddScoped(); diff --git a/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs b/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs index 94d73964b..1681ffed7 100644 --- a/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs +++ b/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs @@ -15,7 +15,7 @@ public void Migrate_DoesNotThrowException() const string connString = "Server=mariadb;Database=filterlists;Uid=filterlists;Pwd=filterlists;"; var options = new DbContextOptionsBuilder() - .UseMySql(connString, m => m.MigrationsAssembly("FilterLists.Data") + .UseMySql(connString, m => m.MigrationsAssembly(Constants.MigrationsAssembly) .ServerVersion(Constants.ServerVersion)) .Options;