diff --git a/Makefile b/Makefile index 3d74cf4e..e63c680c 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,14 @@ -include common.mk all: Yavsc -$(SUBDIRS): - $(MAKE) -C $@ VERSION=$(VERSION) - Yavsc.Abstract: $(MAKE) -C Yavsc.Abstract VERSION=$(VERSION) -%-deploy-pkg: - $(MAKE) -C $(basename $@ -deploy-pkg) deploy-pkg VERSION=$(VERSION) - Yavsc.Server: Yavsc.Abstract + $(MAKE) -C Yavsc.Server VERSION=$(VERSION) -Yavsc: Yavsc.Server Yavsc.Server-deploy-pkg +Yavsc: Yavsc.Server make -C Yavsc restore make -C Yavsc VERSION=$(VERSION) @@ -23,9 +17,6 @@ cli-deploy-pkg: cli: Yavsc -%: - make -C $@ - memo: vim ~/TODO.md diff --git a/Yavsc.Server/Makefile b/Yavsc.Server/Makefile index d156a636..c67c2111 100644 --- a/Yavsc.Server/Makefile +++ b/Yavsc.Server/Makefile @@ -1,23 +1,2 @@ include ../common.mk - -# Useless, defaults to the directory name. -# -PRJNAME=Yavsc.Server - -$(PACKAGE): $(BINARY) - nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIG) - -clean: - rm $(PACKAGE) - -$(BINARY): project.lock.json - dnu build --configuration $(CONFIG) - -project.lock.json: project.json - dnu restore - -deploy-pkg: $(PACKAGE) - cp $(PACKAGE) $(NUGETSOURCE) - -.PHONY: $(BINARY) diff --git a/Yavsc/Migrations/20160315144017_init.Designer.cs b/Yavsc.Server/Migrations/20160315144017_init.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160315144017_init.Designer.cs rename to Yavsc.Server/Migrations/20160315144017_init.Designer.cs diff --git a/Yavsc/Migrations/20160315144017_init.cs b/Yavsc.Server/Migrations/20160315144017_init.cs similarity index 100% rename from Yavsc/Migrations/20160315144017_init.cs rename to Yavsc.Server/Migrations/20160315144017_init.cs diff --git a/Yavsc/Migrations/20160317215718_command.Designer.cs b/Yavsc.Server/Migrations/20160317215718_command.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160317215718_command.Designer.cs rename to Yavsc.Server/Migrations/20160317215718_command.Designer.cs diff --git a/Yavsc/Migrations/20160317215718_command.cs b/Yavsc.Server/Migrations/20160317215718_command.cs similarity index 100% rename from Yavsc/Migrations/20160317215718_command.cs rename to Yavsc.Server/Migrations/20160317215718_command.cs diff --git a/Yavsc/Migrations/20160320170252_bank.Designer.cs b/Yavsc.Server/Migrations/20160320170252_bank.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160320170252_bank.Designer.cs rename to Yavsc.Server/Migrations/20160320170252_bank.Designer.cs diff --git a/Yavsc/Migrations/20160320170252_bank.cs b/Yavsc.Server/Migrations/20160320170252_bank.cs similarity index 100% rename from Yavsc/Migrations/20160320170252_bank.cs rename to Yavsc.Server/Migrations/20160320170252_bank.cs diff --git a/Yavsc/Migrations/20160322144500_contact.Designer.cs b/Yavsc.Server/Migrations/20160322144500_contact.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160322144500_contact.Designer.cs rename to Yavsc.Server/Migrations/20160322144500_contact.Designer.cs diff --git a/Yavsc/Migrations/20160322144500_contact.cs b/Yavsc.Server/Migrations/20160322144500_contact.cs similarity index 100% rename from Yavsc/Migrations/20160322144500_contact.cs rename to Yavsc.Server/Migrations/20160322144500_contact.cs diff --git a/Yavsc/Migrations/20160322152206_balance.Designer.cs b/Yavsc.Server/Migrations/20160322152206_balance.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160322152206_balance.Designer.cs rename to Yavsc.Server/Migrations/20160322152206_balance.Designer.cs diff --git a/Yavsc/Migrations/20160322152206_balance.cs b/Yavsc.Server/Migrations/20160322152206_balance.cs similarity index 100% rename from Yavsc/Migrations/20160322152206_balance.cs rename to Yavsc.Server/Migrations/20160322152206_balance.cs diff --git a/Yavsc/Migrations/20160401233357_circle.Designer.cs b/Yavsc.Server/Migrations/20160401233357_circle.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160401233357_circle.Designer.cs rename to Yavsc.Server/Migrations/20160401233357_circle.Designer.cs diff --git a/Yavsc/Migrations/20160401233357_circle.cs b/Yavsc.Server/Migrations/20160401233357_circle.cs similarity index 100% rename from Yavsc/Migrations/20160401233357_circle.cs rename to Yavsc.Server/Migrations/20160401233357_circle.cs diff --git a/Yavsc/Migrations/20160402135146_calendar.Designer.cs b/Yavsc.Server/Migrations/20160402135146_calendar.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160402135146_calendar.Designer.cs rename to Yavsc.Server/Migrations/20160402135146_calendar.Designer.cs diff --git a/Yavsc/Migrations/20160402135146_calendar.cs b/Yavsc.Server/Migrations/20160402135146_calendar.cs similarity index 100% rename from Yavsc/Migrations/20160402135146_calendar.cs rename to Yavsc.Server/Migrations/20160402135146_calendar.cs diff --git a/Yavsc/Migrations/20160404110708_files.Designer.cs b/Yavsc.Server/Migrations/20160404110708_files.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160404110708_files.Designer.cs rename to Yavsc.Server/Migrations/20160404110708_files.Designer.cs diff --git a/Yavsc/Migrations/20160404110708_files.cs b/Yavsc.Server/Migrations/20160404110708_files.cs similarity index 100% rename from Yavsc/Migrations/20160404110708_files.cs rename to Yavsc.Server/Migrations/20160404110708_files.cs diff --git a/Yavsc/Migrations/20160404121446_estimate.Designer.cs b/Yavsc.Server/Migrations/20160404121446_estimate.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160404121446_estimate.Designer.cs rename to Yavsc.Server/Migrations/20160404121446_estimate.Designer.cs diff --git a/Yavsc/Migrations/20160404121446_estimate.cs b/Yavsc.Server/Migrations/20160404121446_estimate.cs similarity index 100% rename from Yavsc/Migrations/20160404121446_estimate.cs rename to Yavsc.Server/Migrations/20160404121446_estimate.cs diff --git a/Yavsc/Migrations/20160404130359_estimateCommand.Designer.cs b/Yavsc.Server/Migrations/20160404130359_estimateCommand.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160404130359_estimateCommand.Designer.cs rename to Yavsc.Server/Migrations/20160404130359_estimateCommand.Designer.cs diff --git a/Yavsc/Migrations/20160404130359_estimateCommand.cs b/Yavsc.Server/Migrations/20160404130359_estimateCommand.cs similarity index 100% rename from Yavsc/Migrations/20160404130359_estimateCommand.cs rename to Yavsc.Server/Migrations/20160404130359_estimateCommand.cs diff --git a/Yavsc/Migrations/20160405091432_booking.Designer.cs b/Yavsc.Server/Migrations/20160405091432_booking.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160405091432_booking.Designer.cs rename to Yavsc.Server/Migrations/20160405091432_booking.Designer.cs diff --git a/Yavsc/Migrations/20160405091432_booking.cs b/Yavsc.Server/Migrations/20160405091432_booking.cs similarity index 100% rename from Yavsc/Migrations/20160405091432_booking.cs rename to Yavsc.Server/Migrations/20160405091432_booking.cs diff --git a/Yavsc/Migrations/20160407112403_dailycost.Designer.cs b/Yavsc.Server/Migrations/20160407112403_dailycost.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160407112403_dailycost.Designer.cs rename to Yavsc.Server/Migrations/20160407112403_dailycost.Designer.cs diff --git a/Yavsc/Migrations/20160407112403_dailycost.cs b/Yavsc.Server/Migrations/20160407112403_dailycost.cs similarity index 100% rename from Yavsc/Migrations/20160407112403_dailycost.cs rename to Yavsc.Server/Migrations/20160407112403_dailycost.cs diff --git a/Yavsc/Migrations/20160418114001_commandCreation.Designer.cs b/Yavsc.Server/Migrations/20160418114001_commandCreation.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160418114001_commandCreation.Designer.cs rename to Yavsc.Server/Migrations/20160418114001_commandCreation.Designer.cs diff --git a/Yavsc/Migrations/20160418114001_commandCreation.cs b/Yavsc.Server/Migrations/20160418114001_commandCreation.cs similarity index 100% rename from Yavsc/Migrations/20160418114001_commandCreation.cs rename to Yavsc.Server/Migrations/20160418114001_commandCreation.cs diff --git a/Yavsc/Migrations/20160427123737_perfoffer.Designer.cs b/Yavsc.Server/Migrations/20160427123737_perfoffer.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160427123737_perfoffer.Designer.cs rename to Yavsc.Server/Migrations/20160427123737_perfoffer.Designer.cs diff --git a/Yavsc/Migrations/20160427123737_perfoffer.cs b/Yavsc.Server/Migrations/20160427123737_perfoffer.cs similarity index 100% rename from Yavsc/Migrations/20160427123737_perfoffer.cs rename to Yavsc.Server/Migrations/20160427123737_perfoffer.cs diff --git a/Yavsc/Migrations/20160506154628_siren.Designer.cs b/Yavsc.Server/Migrations/20160506154628_siren.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160506154628_siren.Designer.cs rename to Yavsc.Server/Migrations/20160506154628_siren.Designer.cs diff --git a/Yavsc/Migrations/20160506154628_siren.cs b/Yavsc.Server/Migrations/20160506154628_siren.cs similarity index 100% rename from Yavsc/Migrations/20160506154628_siren.cs rename to Yavsc.Server/Migrations/20160506154628_siren.cs diff --git a/Yavsc/Migrations/20160515142434_tokenExpiresIn.Designer.cs b/Yavsc.Server/Migrations/20160515142434_tokenExpiresIn.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160515142434_tokenExpiresIn.Designer.cs rename to Yavsc.Server/Migrations/20160515142434_tokenExpiresIn.Designer.cs diff --git a/Yavsc/Migrations/20160515142434_tokenExpiresIn.cs b/Yavsc.Server/Migrations/20160515142434_tokenExpiresIn.cs similarity index 100% rename from Yavsc/Migrations/20160515142434_tokenExpiresIn.cs rename to Yavsc.Server/Migrations/20160515142434_tokenExpiresIn.cs diff --git a/Yavsc/Migrations/20160529205859_ModeratorGroupName.Designer.cs b/Yavsc.Server/Migrations/20160529205859_ModeratorGroupName.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160529205859_ModeratorGroupName.Designer.cs rename to Yavsc.Server/Migrations/20160529205859_ModeratorGroupName.Designer.cs diff --git a/Yavsc/Migrations/20160529205859_ModeratorGroupName.cs b/Yavsc.Server/Migrations/20160529205859_ModeratorGroupName.cs similarity index 100% rename from Yavsc/Migrations/20160529205859_ModeratorGroupName.cs rename to Yavsc.Server/Migrations/20160529205859_ModeratorGroupName.cs diff --git a/Yavsc/Migrations/20160610153353_client.Designer.cs b/Yavsc.Server/Migrations/20160610153353_client.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160610153353_client.Designer.cs rename to Yavsc.Server/Migrations/20160610153353_client.Designer.cs diff --git a/Yavsc/Migrations/20160610153353_client.cs b/Yavsc.Server/Migrations/20160610153353_client.cs similarity index 100% rename from Yavsc/Migrations/20160610153353_client.cs rename to Yavsc.Server/Migrations/20160610153353_client.cs diff --git a/Yavsc/Migrations/20160613142037_devices.Designer.cs b/Yavsc.Server/Migrations/20160613142037_devices.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160613142037_devices.Designer.cs rename to Yavsc.Server/Migrations/20160613142037_devices.Designer.cs diff --git a/Yavsc/Migrations/20160613142037_devices.cs b/Yavsc.Server/Migrations/20160613142037_devices.cs similarity index 100% rename from Yavsc/Migrations/20160613142037_devices.cs rename to Yavsc.Server/Migrations/20160613142037_devices.cs diff --git a/Yavsc/Migrations/20160614010545_bookquery.Designer.cs b/Yavsc.Server/Migrations/20160614010545_bookquery.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160614010545_bookquery.Designer.cs rename to Yavsc.Server/Migrations/20160614010545_bookquery.Designer.cs diff --git a/Yavsc/Migrations/20160614010545_bookquery.cs b/Yavsc.Server/Migrations/20160614010545_bookquery.cs similarity index 100% rename from Yavsc/Migrations/20160614010545_bookquery.cs rename to Yavsc.Server/Migrations/20160614010545_bookquery.cs diff --git a/Yavsc/Migrations/20160702195348_GCMinfos.Designer.cs b/Yavsc.Server/Migrations/20160702195348_GCMinfos.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160702195348_GCMinfos.Designer.cs rename to Yavsc.Server/Migrations/20160702195348_GCMinfos.Designer.cs diff --git a/Yavsc/Migrations/20160702195348_GCMinfos.cs b/Yavsc.Server/Migrations/20160702195348_GCMinfos.cs similarity index 100% rename from Yavsc/Migrations/20160702195348_GCMinfos.cs rename to Yavsc.Server/Migrations/20160702195348_GCMinfos.cs diff --git a/Yavsc/Migrations/20160723164231_GCMRedDate.Designer.cs b/Yavsc.Server/Migrations/20160723164231_GCMRedDate.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160723164231_GCMRedDate.Designer.cs rename to Yavsc.Server/Migrations/20160723164231_GCMRedDate.Designer.cs diff --git a/Yavsc/Migrations/20160723164231_GCMRedDate.cs b/Yavsc.Server/Migrations/20160723164231_GCMRedDate.cs similarity index 100% rename from Yavsc/Migrations/20160723164231_GCMRedDate.cs rename to Yavsc.Server/Migrations/20160723164231_GCMRedDate.cs diff --git a/Yavsc/Migrations/20160725145306_estimates.Designer.cs b/Yavsc.Server/Migrations/20160725145306_estimates.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160725145306_estimates.Designer.cs rename to Yavsc.Server/Migrations/20160725145306_estimates.Designer.cs diff --git a/Yavsc/Migrations/20160725145306_estimates.cs b/Yavsc.Server/Migrations/20160725145306_estimates.cs similarity index 100% rename from Yavsc/Migrations/20160725145306_estimates.cs rename to Yavsc.Server/Migrations/20160725145306_estimates.cs diff --git a/Yavsc/Migrations/20160726131331_performerIdTypo.Designer.cs b/Yavsc.Server/Migrations/20160726131331_performerIdTypo.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160726131331_performerIdTypo.Designer.cs rename to Yavsc.Server/Migrations/20160726131331_performerIdTypo.Designer.cs diff --git a/Yavsc/Migrations/20160726131331_performerIdTypo.cs b/Yavsc.Server/Migrations/20160726131331_performerIdTypo.cs similarity index 100% rename from Yavsc/Migrations/20160726131331_performerIdTypo.cs rename to Yavsc.Server/Migrations/20160726131331_performerIdTypo.cs diff --git a/Yavsc/Migrations/20160726133002_otherOrtho.Designer.cs b/Yavsc.Server/Migrations/20160726133002_otherOrtho.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160726133002_otherOrtho.Designer.cs rename to Yavsc.Server/Migrations/20160726133002_otherOrtho.Designer.cs diff --git a/Yavsc/Migrations/20160726133002_otherOrtho.cs b/Yavsc.Server/Migrations/20160726133002_otherOrtho.cs similarity index 100% rename from Yavsc/Migrations/20160726133002_otherOrtho.cs rename to Yavsc.Server/Migrations/20160726133002_otherOrtho.cs diff --git a/Yavsc/Migrations/20160726161530_ExceptionsSIREN.Designer.cs b/Yavsc.Server/Migrations/20160726161530_ExceptionsSIREN.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160726161530_ExceptionsSIREN.Designer.cs rename to Yavsc.Server/Migrations/20160726161530_ExceptionsSIREN.Designer.cs diff --git a/Yavsc/Migrations/20160726161530_ExceptionsSIREN.cs b/Yavsc.Server/Migrations/20160726161530_ExceptionsSIREN.cs similarity index 100% rename from Yavsc/Migrations/20160726161530_ExceptionsSIREN.cs rename to Yavsc.Server/Migrations/20160726161530_ExceptionsSIREN.cs diff --git a/Yavsc/Migrations/20160802143258_bcontentornot.Designer.cs b/Yavsc.Server/Migrations/20160802143258_bcontentornot.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160802143258_bcontentornot.Designer.cs rename to Yavsc.Server/Migrations/20160802143258_bcontentornot.Designer.cs diff --git a/Yavsc/Migrations/20160802143258_bcontentornot.cs b/Yavsc.Server/Migrations/20160802143258_bcontentornot.cs similarity index 100% rename from Yavsc/Migrations/20160802143258_bcontentornot.cs rename to Yavsc.Server/Migrations/20160802143258_bcontentornot.cs diff --git a/Yavsc/Migrations/20160802145351_camelCaseBlog.Designer.cs b/Yavsc.Server/Migrations/20160802145351_camelCaseBlog.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160802145351_camelCaseBlog.Designer.cs rename to Yavsc.Server/Migrations/20160802145351_camelCaseBlog.Designer.cs diff --git a/Yavsc/Migrations/20160802145351_camelCaseBlog.cs b/Yavsc.Server/Migrations/20160802145351_camelCaseBlog.cs similarity index 100% rename from Yavsc/Migrations/20160802145351_camelCaseBlog.cs rename to Yavsc.Server/Migrations/20160802145351_camelCaseBlog.cs diff --git a/Yavsc/Migrations/20160901145646_products.Designer.cs b/Yavsc.Server/Migrations/20160901145646_products.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160901145646_products.Designer.cs rename to Yavsc.Server/Migrations/20160901145646_products.Designer.cs diff --git a/Yavsc/Migrations/20160901145646_products.cs b/Yavsc.Server/Migrations/20160901145646_products.cs similarity index 100% rename from Yavsc/Migrations/20160901145646_products.cs rename to Yavsc.Server/Migrations/20160901145646_products.cs diff --git a/Yavsc/Migrations/20160905095708_tags.Designer.cs b/Yavsc.Server/Migrations/20160905095708_tags.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160905095708_tags.Designer.cs rename to Yavsc.Server/Migrations/20160905095708_tags.Designer.cs diff --git a/Yavsc/Migrations/20160905095708_tags.cs b/Yavsc.Server/Migrations/20160905095708_tags.cs similarity index 100% rename from Yavsc/Migrations/20160905095708_tags.cs rename to Yavsc.Server/Migrations/20160905095708_tags.cs diff --git a/Yavsc/Migrations/20160916075415_estimateFreeFromCatalog.Designer.cs b/Yavsc.Server/Migrations/20160916075415_estimateFreeFromCatalog.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160916075415_estimateFreeFromCatalog.Designer.cs rename to Yavsc.Server/Migrations/20160916075415_estimateFreeFromCatalog.Designer.cs diff --git a/Yavsc/Migrations/20160916075415_estimateFreeFromCatalog.cs b/Yavsc.Server/Migrations/20160916075415_estimateFreeFromCatalog.cs similarity index 100% rename from Yavsc/Migrations/20160916075415_estimateFreeFromCatalog.cs rename to Yavsc.Server/Migrations/20160916075415_estimateFreeFromCatalog.cs diff --git a/Yavsc/Migrations/20160917010249_yaev.Designer.cs b/Yavsc.Server/Migrations/20160917010249_yaev.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160917010249_yaev.Designer.cs rename to Yavsc.Server/Migrations/20160917010249_yaev.Designer.cs diff --git a/Yavsc/Migrations/20160917010249_yaev.cs b/Yavsc.Server/Migrations/20160917010249_yaev.cs similarity index 100% rename from Yavsc/Migrations/20160917010249_yaev.cs rename to Yavsc.Server/Migrations/20160917010249_yaev.cs diff --git a/Yavsc/Migrations/20160920215459_avatar.Designer.cs b/Yavsc.Server/Migrations/20160920215459_avatar.Designer.cs similarity index 100% rename from Yavsc/Migrations/20160920215459_avatar.Designer.cs rename to Yavsc.Server/Migrations/20160920215459_avatar.Designer.cs diff --git a/Yavsc/Migrations/20160920215459_avatar.cs b/Yavsc.Server/Migrations/20160920215459_avatar.cs similarity index 100% rename from Yavsc/Migrations/20160920215459_avatar.cs rename to Yavsc.Server/Migrations/20160920215459_avatar.cs diff --git a/Yavsc/Migrations/20161010102616_recontact.Designer.cs b/Yavsc.Server/Migrations/20161010102616_recontact.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161010102616_recontact.Designer.cs rename to Yavsc.Server/Migrations/20161010102616_recontact.Designer.cs diff --git a/Yavsc/Migrations/20161010102616_recontact.cs b/Yavsc.Server/Migrations/20161010102616_recontact.cs similarity index 100% rename from Yavsc/Migrations/20161010102616_recontact.cs rename to Yavsc.Server/Migrations/20161010102616_recontact.cs diff --git a/Yavsc/Migrations/20161020143022_estimateClientApprouval.Designer.cs b/Yavsc.Server/Migrations/20161020143022_estimateClientApprouval.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161020143022_estimateClientApprouval.Designer.cs rename to Yavsc.Server/Migrations/20161020143022_estimateClientApprouval.Designer.cs diff --git a/Yavsc/Migrations/20161020143022_estimateClientApprouval.cs b/Yavsc.Server/Migrations/20161020143022_estimateClientApprouval.cs similarity index 100% rename from Yavsc/Migrations/20161020143022_estimateClientApprouval.cs rename to Yavsc.Server/Migrations/20161020143022_estimateClientApprouval.cs diff --git a/Yavsc/Migrations/20161020212947_userAddress.Designer.cs b/Yavsc.Server/Migrations/20161020212947_userAddress.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161020212947_userAddress.Designer.cs rename to Yavsc.Server/Migrations/20161020212947_userAddress.Designer.cs diff --git a/Yavsc/Migrations/20161020212947_userAddress.cs b/Yavsc.Server/Migrations/20161020212947_userAddress.cs similarity index 100% rename from Yavsc/Migrations/20161020212947_userAddress.cs rename to Yavsc.Server/Migrations/20161020212947_userAddress.cs diff --git a/Yavsc/Migrations/20161021153306_estimateLines.Designer.cs b/Yavsc.Server/Migrations/20161021153306_estimateLines.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161021153306_estimateLines.Designer.cs rename to Yavsc.Server/Migrations/20161021153306_estimateLines.Designer.cs diff --git a/Yavsc/Migrations/20161021153306_estimateLines.cs b/Yavsc.Server/Migrations/20161021153306_estimateLines.cs similarity index 100% rename from Yavsc/Migrations/20161021153306_estimateLines.cs rename to Yavsc.Server/Migrations/20161021153306_estimateLines.cs diff --git a/Yavsc/Migrations/20161101234703_chatConnection.Designer.cs b/Yavsc.Server/Migrations/20161101234703_chatConnection.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161101234703_chatConnection.Designer.cs rename to Yavsc.Server/Migrations/20161101234703_chatConnection.Designer.cs diff --git a/Yavsc/Migrations/20161101234703_chatConnection.cs b/Yavsc.Server/Migrations/20161101234703_chatConnection.cs similarity index 100% rename from Yavsc/Migrations/20161101234703_chatConnection.cs rename to Yavsc.Server/Migrations/20161101234703_chatConnection.cs diff --git a/Yavsc/Migrations/20161102132129_fixCxOwner.Designer.cs b/Yavsc.Server/Migrations/20161102132129_fixCxOwner.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161102132129_fixCxOwner.Designer.cs rename to Yavsc.Server/Migrations/20161102132129_fixCxOwner.Designer.cs diff --git a/Yavsc/Migrations/20161102132129_fixCxOwner.cs b/Yavsc.Server/Migrations/20161102132129_fixCxOwner.cs similarity index 100% rename from Yavsc/Migrations/20161102132129_fixCxOwner.cs rename to Yavsc.Server/Migrations/20161102132129_fixCxOwner.cs diff --git a/Yavsc/Migrations/20161102133253_fix2CxOwner.Designer.cs b/Yavsc.Server/Migrations/20161102133253_fix2CxOwner.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161102133253_fix2CxOwner.Designer.cs rename to Yavsc.Server/Migrations/20161102133253_fix2CxOwner.Designer.cs diff --git a/Yavsc/Migrations/20161102133253_fix2CxOwner.cs b/Yavsc.Server/Migrations/20161102133253_fix2CxOwner.cs similarity index 100% rename from Yavsc/Migrations/20161102133253_fix2CxOwner.cs rename to Yavsc.Server/Migrations/20161102133253_fix2CxOwner.cs diff --git a/Yavsc/Migrations/20161104090806_bankUserProfile.Designer.cs b/Yavsc.Server/Migrations/20161104090806_bankUserProfile.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161104090806_bankUserProfile.Designer.cs rename to Yavsc.Server/Migrations/20161104090806_bankUserProfile.Designer.cs diff --git a/Yavsc/Migrations/20161104090806_bankUserProfile.cs b/Yavsc.Server/Migrations/20161104090806_bankUserProfile.cs similarity index 100% rename from Yavsc/Migrations/20161104090806_bankUserProfile.cs rename to Yavsc.Server/Migrations/20161104090806_bankUserProfile.cs diff --git a/Yavsc/Migrations/20161104164949_dropEstimateStatus.Designer.cs b/Yavsc.Server/Migrations/20161104164949_dropEstimateStatus.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161104164949_dropEstimateStatus.Designer.cs rename to Yavsc.Server/Migrations/20161104164949_dropEstimateStatus.Designer.cs diff --git a/Yavsc/Migrations/20161104164949_dropEstimateStatus.cs b/Yavsc.Server/Migrations/20161104164949_dropEstimateStatus.cs similarity index 100% rename from Yavsc/Migrations/20161104164949_dropEstimateStatus.cs rename to Yavsc.Server/Migrations/20161104164949_dropEstimateStatus.cs diff --git a/Yavsc/Migrations/20161123235323_estimatesignatures.Designer.cs b/Yavsc.Server/Migrations/20161123235323_estimatesignatures.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161123235323_estimatesignatures.Designer.cs rename to Yavsc.Server/Migrations/20161123235323_estimatesignatures.Designer.cs diff --git a/Yavsc/Migrations/20161123235323_estimatesignatures.cs b/Yavsc.Server/Migrations/20161123235323_estimatesignatures.cs similarity index 100% rename from Yavsc/Migrations/20161123235323_estimatesignatures.cs rename to Yavsc.Server/Migrations/20161123235323_estimatesignatures.cs diff --git a/Yavsc/Migrations/20161130084909_diskQuota.Designer.cs b/Yavsc.Server/Migrations/20161130084909_diskQuota.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161130084909_diskQuota.Designer.cs rename to Yavsc.Server/Migrations/20161130084909_diskQuota.Designer.cs diff --git a/Yavsc/Migrations/20161130084909_diskQuota.cs b/Yavsc.Server/Migrations/20161130084909_diskQuota.cs similarity index 100% rename from Yavsc/Migrations/20161130084909_diskQuota.cs rename to Yavsc.Server/Migrations/20161130084909_diskQuota.cs diff --git a/Yavsc/Migrations/20161209121035_bookQueryReason.Designer.cs b/Yavsc.Server/Migrations/20161209121035_bookQueryReason.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161209121035_bookQueryReason.Designer.cs rename to Yavsc.Server/Migrations/20161209121035_bookQueryReason.Designer.cs diff --git a/Yavsc/Migrations/20161209121035_bookQueryReason.cs b/Yavsc.Server/Migrations/20161209121035_bookQueryReason.cs similarity index 100% rename from Yavsc/Migrations/20161209121035_bookQueryReason.cs rename to Yavsc.Server/Migrations/20161209121035_bookQueryReason.cs diff --git a/Yavsc/Migrations/20161231163016_musicalPreferences.Designer.cs b/Yavsc.Server/Migrations/20161231163016_musicalPreferences.Designer.cs similarity index 100% rename from Yavsc/Migrations/20161231163016_musicalPreferences.Designer.cs rename to Yavsc.Server/Migrations/20161231163016_musicalPreferences.Designer.cs diff --git a/Yavsc/Migrations/20161231163016_musicalPreferences.cs b/Yavsc.Server/Migrations/20161231163016_musicalPreferences.cs similarity index 100% rename from Yavsc/Migrations/20161231163016_musicalPreferences.cs rename to Yavsc.Server/Migrations/20161231163016_musicalPreferences.cs diff --git a/Yavsc/Migrations/20170102140332_musicalTendencies.Designer.cs b/Yavsc.Server/Migrations/20170102140332_musicalTendencies.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170102140332_musicalTendencies.Designer.cs rename to Yavsc.Server/Migrations/20170102140332_musicalTendencies.Designer.cs diff --git a/Yavsc/Migrations/20170102140332_musicalTendencies.cs b/Yavsc.Server/Migrations/20170102140332_musicalTendencies.cs similarity index 100% rename from Yavsc/Migrations/20170102140332_musicalTendencies.cs rename to Yavsc.Server/Migrations/20170102140332_musicalTendencies.cs diff --git a/Yavsc/Migrations/20170102152745_locationTypes.Designer.cs b/Yavsc.Server/Migrations/20170102152745_locationTypes.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170102152745_locationTypes.Designer.cs rename to Yavsc.Server/Migrations/20170102152745_locationTypes.Designer.cs diff --git a/Yavsc/Migrations/20170102152745_locationTypes.cs b/Yavsc.Server/Migrations/20170102152745_locationTypes.cs similarity index 100% rename from Yavsc/Migrations/20170102152745_locationTypes.cs rename to Yavsc.Server/Migrations/20170102152745_locationTypes.cs diff --git a/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs b/Yavsc.Server/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs rename to Yavsc.Server/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs diff --git a/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.cs b/Yavsc.Server/Migrations/20170106092028_WFActivityParentAndProfiles.cs similarity index 100% rename from Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.cs rename to Yavsc.Server/Migrations/20170106092028_WFActivityParentAndProfiles.cs diff --git a/Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs b/Yavsc.Server/Migrations/20170106113614_ownerProfile.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs rename to Yavsc.Server/Migrations/20170106113614_ownerProfile.Designer.cs diff --git a/Yavsc/Migrations/20170106113614_ownerProfile.cs b/Yavsc.Server/Migrations/20170106113614_ownerProfile.cs similarity index 100% rename from Yavsc/Migrations/20170106113614_ownerProfile.cs rename to Yavsc.Server/Migrations/20170106113614_ownerProfile.cs diff --git a/Yavsc/Migrations/20170106122307_Instruments.Designer.cs b/Yavsc.Server/Migrations/20170106122307_Instruments.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170106122307_Instruments.Designer.cs rename to Yavsc.Server/Migrations/20170106122307_Instruments.Designer.cs diff --git a/Yavsc/Migrations/20170106122307_Instruments.cs b/Yavsc.Server/Migrations/20170106122307_Instruments.cs similarity index 100% rename from Yavsc/Migrations/20170106122307_Instruments.cs rename to Yavsc.Server/Migrations/20170106122307_Instruments.cs diff --git a/Yavsc/Migrations/20170106124548_instrumentation.Designer.cs b/Yavsc.Server/Migrations/20170106124548_instrumentation.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170106124548_instrumentation.Designer.cs rename to Yavsc.Server/Migrations/20170106124548_instrumentation.Designer.cs diff --git a/Yavsc/Migrations/20170106124548_instrumentation.cs b/Yavsc.Server/Migrations/20170106124548_instrumentation.cs similarity index 100% rename from Yavsc/Migrations/20170106124548_instrumentation.cs rename to Yavsc.Server/Migrations/20170106124548_instrumentation.cs diff --git a/Yavsc/Migrations/20170106144035_activityRate.Designer.cs b/Yavsc.Server/Migrations/20170106144035_activityRate.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170106144035_activityRate.Designer.cs rename to Yavsc.Server/Migrations/20170106144035_activityRate.Designer.cs diff --git a/Yavsc/Migrations/20170106144035_activityRate.cs b/Yavsc.Server/Migrations/20170106144035_activityRate.cs similarity index 100% rename from Yavsc/Migrations/20170106144035_activityRate.cs rename to Yavsc.Server/Migrations/20170106144035_activityRate.cs diff --git a/Yavsc/Migrations/20170106235954_weight.Designer.cs b/Yavsc.Server/Migrations/20170106235954_weight.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170106235954_weight.Designer.cs rename to Yavsc.Server/Migrations/20170106235954_weight.Designer.cs diff --git a/Yavsc/Migrations/20170106235954_weight.cs b/Yavsc.Server/Migrations/20170106235954_weight.cs similarity index 100% rename from Yavsc/Migrations/20170106235954_weight.cs rename to Yavsc.Server/Migrations/20170106235954_weight.cs diff --git a/Yavsc/Migrations/20170107004233_userActivitiesValidity.Designer.cs b/Yavsc.Server/Migrations/20170107004233_userActivitiesValidity.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170107004233_userActivitiesValidity.Designer.cs rename to Yavsc.Server/Migrations/20170107004233_userActivitiesValidity.Designer.cs diff --git a/Yavsc/Migrations/20170107004233_userActivitiesValidity.cs b/Yavsc.Server/Migrations/20170107004233_userActivitiesValidity.cs similarity index 100% rename from Yavsc/Migrations/20170107004233_userActivitiesValidity.cs rename to Yavsc.Server/Migrations/20170107004233_userActivitiesValidity.cs diff --git a/Yavsc/Migrations/20170113022807_SettingsClassName.Designer.cs b/Yavsc.Server/Migrations/20170113022807_SettingsClassName.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170113022807_SettingsClassName.Designer.cs rename to Yavsc.Server/Migrations/20170113022807_SettingsClassName.Designer.cs diff --git a/Yavsc/Migrations/20170113022807_SettingsClassName.cs b/Yavsc.Server/Migrations/20170113022807_SettingsClassName.cs similarity index 100% rename from Yavsc/Migrations/20170113022807_SettingsClassName.cs rename to Yavsc.Server/Migrations/20170113022807_SettingsClassName.cs diff --git a/Yavsc/Migrations/20170113150714_instrumentationReloaded.Designer.cs b/Yavsc.Server/Migrations/20170113150714_instrumentationReloaded.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170113150714_instrumentationReloaded.Designer.cs rename to Yavsc.Server/Migrations/20170113150714_instrumentationReloaded.Designer.cs diff --git a/Yavsc/Migrations/20170113150714_instrumentationReloaded.cs b/Yavsc.Server/Migrations/20170113150714_instrumentationReloaded.cs similarity index 100% rename from Yavsc/Migrations/20170113150714_instrumentationReloaded.cs rename to Yavsc.Server/Migrations/20170113150714_instrumentationReloaded.cs diff --git a/Yavsc/Migrations/20170116002541_bookQueryActivityCode.Designer.cs b/Yavsc.Server/Migrations/20170116002541_bookQueryActivityCode.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170116002541_bookQueryActivityCode.Designer.cs rename to Yavsc.Server/Migrations/20170116002541_bookQueryActivityCode.Designer.cs diff --git a/Yavsc/Migrations/20170116002541_bookQueryActivityCode.cs b/Yavsc.Server/Migrations/20170116002541_bookQueryActivityCode.cs similarity index 100% rename from Yavsc/Migrations/20170116002541_bookQueryActivityCode.cs rename to Yavsc.Server/Migrations/20170116002541_bookQueryActivityCode.cs diff --git a/Yavsc/Migrations/20170116154735_refactPrproAllowGeo.Designer.cs b/Yavsc.Server/Migrations/20170116154735_refactPrproAllowGeo.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170116154735_refactPrproAllowGeo.Designer.cs rename to Yavsc.Server/Migrations/20170116154735_refactPrproAllowGeo.Designer.cs diff --git a/Yavsc/Migrations/20170116154735_refactPrproAllowGeo.cs b/Yavsc.Server/Migrations/20170116154735_refactPrproAllowGeo.cs similarity index 100% rename from Yavsc/Migrations/20170116154735_refactPrproAllowGeo.cs rename to Yavsc.Server/Migrations/20170116154735_refactPrproAllowGeo.cs diff --git a/Yavsc/Migrations/20170117134339_entityTracking.Designer.cs b/Yavsc.Server/Migrations/20170117134339_entityTracking.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170117134339_entityTracking.Designer.cs rename to Yavsc.Server/Migrations/20170117134339_entityTracking.Designer.cs diff --git a/Yavsc/Migrations/20170117134339_entityTracking.cs b/Yavsc.Server/Migrations/20170117134339_entityTracking.cs similarity index 100% rename from Yavsc/Migrations/20170117134339_entityTracking.cs rename to Yavsc.Server/Migrations/20170117134339_entityTracking.cs diff --git a/Yavsc/Migrations/20170120095258_blogAcl.Designer.cs b/Yavsc.Server/Migrations/20170120095258_blogAcl.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170120095258_blogAcl.Designer.cs rename to Yavsc.Server/Migrations/20170120095258_blogAcl.Designer.cs diff --git a/Yavsc/Migrations/20170120095258_blogAcl.cs b/Yavsc.Server/Migrations/20170120095258_blogAcl.cs similarity index 100% rename from Yavsc/Migrations/20170120095258_blogAcl.cs rename to Yavsc.Server/Migrations/20170120095258_blogAcl.cs diff --git a/Yavsc/Migrations/20170120122324_queryTraking.Designer.cs b/Yavsc.Server/Migrations/20170120122324_queryTraking.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170120122324_queryTraking.Designer.cs rename to Yavsc.Server/Migrations/20170120122324_queryTraking.Designer.cs diff --git a/Yavsc/Migrations/20170120122324_queryTraking.cs b/Yavsc.Server/Migrations/20170120122324_queryTraking.cs similarity index 100% rename from Yavsc/Migrations/20170120122324_queryTraking.cs rename to Yavsc.Server/Migrations/20170120122324_queryTraking.cs diff --git a/Yavsc/Migrations/20170122160343_circlesMemberRefact.Designer.cs b/Yavsc.Server/Migrations/20170122160343_circlesMemberRefact.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170122160343_circlesMemberRefact.Designer.cs rename to Yavsc.Server/Migrations/20170122160343_circlesMemberRefact.Designer.cs diff --git a/Yavsc/Migrations/20170122160343_circlesMemberRefact.cs b/Yavsc.Server/Migrations/20170122160343_circlesMemberRefact.cs similarity index 100% rename from Yavsc/Migrations/20170122160343_circlesMemberRefact.cs rename to Yavsc.Server/Migrations/20170122160343_circlesMemberRefact.cs diff --git a/Yavsc/Migrations/20170124090324_commandForms.Designer.cs b/Yavsc.Server/Migrations/20170124090324_commandForms.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170124090324_commandForms.Designer.cs rename to Yavsc.Server/Migrations/20170124090324_commandForms.Designer.cs diff --git a/Yavsc/Migrations/20170124090324_commandForms.cs b/Yavsc.Server/Migrations/20170124090324_commandForms.cs similarity index 100% rename from Yavsc/Migrations/20170124090324_commandForms.cs rename to Yavsc.Server/Migrations/20170124090324_commandForms.cs diff --git a/Yavsc/Migrations/20170126152454_trackActivity.Designer.cs b/Yavsc.Server/Migrations/20170126152454_trackActivity.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170126152454_trackActivity.Designer.cs rename to Yavsc.Server/Migrations/20170126152454_trackActivity.Designer.cs diff --git a/Yavsc/Migrations/20170126152454_trackActivity.cs b/Yavsc.Server/Migrations/20170126152454_trackActivity.cs similarity index 100% rename from Yavsc/Migrations/20170126152454_trackActivity.cs rename to Yavsc.Server/Migrations/20170126152454_trackActivity.cs diff --git a/Yavsc/Migrations/20170126152651_renameActViewNameToAction.Designer.cs b/Yavsc.Server/Migrations/20170126152651_renameActViewNameToAction.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170126152651_renameActViewNameToAction.Designer.cs rename to Yavsc.Server/Migrations/20170126152651_renameActViewNameToAction.Designer.cs diff --git a/Yavsc/Migrations/20170126152651_renameActViewNameToAction.cs b/Yavsc.Server/Migrations/20170126152651_renameActViewNameToAction.cs similarity index 100% rename from Yavsc/Migrations/20170126152651_renameActViewNameToAction.cs rename to Yavsc.Server/Migrations/20170126152651_renameActViewNameToAction.cs diff --git a/Yavsc/Migrations/20170201002133_blacklisted.Designer.cs b/Yavsc.Server/Migrations/20170201002133_blacklisted.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170201002133_blacklisted.Designer.cs rename to Yavsc.Server/Migrations/20170201002133_blacklisted.Designer.cs diff --git a/Yavsc/Migrations/20170201002133_blacklisted.cs b/Yavsc.Server/Migrations/20170201002133_blacklisted.cs similarity index 100% rename from Yavsc/Migrations/20170201002133_blacklisted.cs rename to Yavsc.Server/Migrations/20170201002133_blacklisted.cs diff --git a/Yavsc/Migrations/20170201162847_defaultAvatar.Designer.cs b/Yavsc.Server/Migrations/20170201162847_defaultAvatar.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170201162847_defaultAvatar.Designer.cs rename to Yavsc.Server/Migrations/20170201162847_defaultAvatar.Designer.cs diff --git a/Yavsc/Migrations/20170201162847_defaultAvatar.cs b/Yavsc.Server/Migrations/20170201162847_defaultAvatar.cs similarity index 100% rename from Yavsc/Migrations/20170201162847_defaultAvatar.cs rename to Yavsc.Server/Migrations/20170201162847_defaultAvatar.cs diff --git a/Yavsc/Migrations/20170202102936_defaultDiskQuota.Designer.cs b/Yavsc.Server/Migrations/20170202102936_defaultDiskQuota.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170202102936_defaultDiskQuota.Designer.cs rename to Yavsc.Server/Migrations/20170202102936_defaultDiskQuota.Designer.cs diff --git a/Yavsc/Migrations/20170202102936_defaultDiskQuota.cs b/Yavsc.Server/Migrations/20170202102936_defaultDiskQuota.cs similarity index 100% rename from Yavsc/Migrations/20170202102936_defaultDiskQuota.cs rename to Yavsc.Server/Migrations/20170202102936_defaultDiskQuota.cs diff --git a/Yavsc/Migrations/20170212005346_haircut.Designer.cs b/Yavsc.Server/Migrations/20170212005346_haircut.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170212005346_haircut.Designer.cs rename to Yavsc.Server/Migrations/20170212005346_haircut.Designer.cs diff --git a/Yavsc/Migrations/20170212005346_haircut.cs b/Yavsc.Server/Migrations/20170212005346_haircut.cs similarity index 100% rename from Yavsc/Migrations/20170212005346_haircut.cs rename to Yavsc.Server/Migrations/20170212005346_haircut.cs diff --git a/Yavsc/Migrations/20170217221646_bookQueryStatus.Designer.cs b/Yavsc.Server/Migrations/20170217221646_bookQueryStatus.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170217221646_bookQueryStatus.Designer.cs rename to Yavsc.Server/Migrations/20170217221646_bookQueryStatus.Designer.cs diff --git a/Yavsc/Migrations/20170217221646_bookQueryStatus.cs b/Yavsc.Server/Migrations/20170217221646_bookQueryStatus.cs similarity index 100% rename from Yavsc/Migrations/20170217221646_bookQueryStatus.cs rename to Yavsc.Server/Migrations/20170217221646_bookQueryStatus.cs diff --git a/Yavsc/Migrations/20170220102125_notifications.Designer.cs b/Yavsc.Server/Migrations/20170220102125_notifications.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170220102125_notifications.Designer.cs rename to Yavsc.Server/Migrations/20170220102125_notifications.Designer.cs diff --git a/Yavsc/Migrations/20170220102125_notifications.cs b/Yavsc.Server/Migrations/20170220102125_notifications.cs similarity index 100% rename from Yavsc/Migrations/20170220102125_notifications.cs rename to Yavsc.Server/Migrations/20170220102125_notifications.cs diff --git a/Yavsc/Migrations/20170220125518_dimissclick.Designer.cs b/Yavsc.Server/Migrations/20170220125518_dimissclick.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170220125518_dimissclick.Designer.cs rename to Yavsc.Server/Migrations/20170220125518_dimissclick.Designer.cs diff --git a/Yavsc/Migrations/20170220125518_dimissclick.cs b/Yavsc.Server/Migrations/20170220125518_dimissclick.cs similarity index 100% rename from Yavsc/Migrations/20170220125518_dimissclick.cs rename to Yavsc.Server/Migrations/20170220125518_dimissclick.cs diff --git a/Yavsc/Migrations/20170220144141_hiddenActivity.Designer.cs b/Yavsc.Server/Migrations/20170220144141_hiddenActivity.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170220144141_hiddenActivity.Designer.cs rename to Yavsc.Server/Migrations/20170220144141_hiddenActivity.Designer.cs diff --git a/Yavsc/Migrations/20170220144141_hiddenActivity.cs b/Yavsc.Server/Migrations/20170220144141_hiddenActivity.cs similarity index 100% rename from Yavsc/Migrations/20170220144141_hiddenActivity.cs rename to Yavsc.Server/Migrations/20170220144141_hiddenActivity.cs diff --git a/Yavsc/Migrations/20170227151759_hairPrestations.Designer.cs b/Yavsc.Server/Migrations/20170227151759_hairPrestations.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170227151759_hairPrestations.Designer.cs rename to Yavsc.Server/Migrations/20170227151759_hairPrestations.Designer.cs diff --git a/Yavsc/Migrations/20170227151759_hairPrestations.cs b/Yavsc.Server/Migrations/20170227151759_hairPrestations.cs similarity index 100% rename from Yavsc/Migrations/20170227151759_hairPrestations.cs rename to Yavsc.Server/Migrations/20170227151759_hairPrestations.cs diff --git a/Yavsc/Migrations/20170228115359_brusherProfile.Designer.cs b/Yavsc.Server/Migrations/20170228115359_brusherProfile.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170228115359_brusherProfile.Designer.cs rename to Yavsc.Server/Migrations/20170228115359_brusherProfile.Designer.cs diff --git a/Yavsc/Migrations/20170228115359_brusherProfile.cs b/Yavsc.Server/Migrations/20170228115359_brusherProfile.cs similarity index 100% rename from Yavsc/Migrations/20170228115359_brusherProfile.cs rename to Yavsc.Server/Migrations/20170228115359_brusherProfile.cs diff --git a/Yavsc/Migrations/20170228145057_actionName.Designer.cs b/Yavsc.Server/Migrations/20170228145057_actionName.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170228145057_actionName.Designer.cs rename to Yavsc.Server/Migrations/20170228145057_actionName.Designer.cs diff --git a/Yavsc/Migrations/20170228145057_actionName.cs b/Yavsc.Server/Migrations/20170228145057_actionName.cs similarity index 100% rename from Yavsc/Migrations/20170228145057_actionName.cs rename to Yavsc.Server/Migrations/20170228145057_actionName.cs diff --git a/Yavsc/Migrations/20170301124608_brusherActiondistance.Designer.cs b/Yavsc.Server/Migrations/20170301124608_brusherActiondistance.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170301124608_brusherActiondistance.Designer.cs rename to Yavsc.Server/Migrations/20170301124608_brusherActiondistance.Designer.cs diff --git a/Yavsc/Migrations/20170301124608_brusherActiondistance.cs b/Yavsc.Server/Migrations/20170301124608_brusherActiondistance.cs similarity index 100% rename from Yavsc/Migrations/20170301124608_brusherActiondistance.cs rename to Yavsc.Server/Migrations/20170301124608_brusherActiondistance.cs diff --git a/Yavsc/Migrations/20170301132531_manbrushing.Designer.cs b/Yavsc.Server/Migrations/20170301132531_manbrushing.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170301132531_manbrushing.Designer.cs rename to Yavsc.Server/Migrations/20170301132531_manbrushing.Designer.cs diff --git a/Yavsc/Migrations/20170301132531_manbrushing.cs b/Yavsc.Server/Migrations/20170301132531_manbrushing.cs similarity index 100% rename from Yavsc/Migrations/20170301132531_manbrushing.cs rename to Yavsc.Server/Migrations/20170301132531_manbrushing.cs diff --git a/Yavsc/Migrations/20170301211317_folding.Designer.cs b/Yavsc.Server/Migrations/20170301211317_folding.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170301211317_folding.Designer.cs rename to Yavsc.Server/Migrations/20170301211317_folding.Designer.cs diff --git a/Yavsc/Migrations/20170301211317_folding.cs b/Yavsc.Server/Migrations/20170301211317_folding.cs similarity index 100% rename from Yavsc/Migrations/20170301211317_folding.cs rename to Yavsc.Server/Migrations/20170301211317_folding.cs diff --git a/Yavsc/Migrations/20170302122929_brusherProfileDiscount.Designer.cs b/Yavsc.Server/Migrations/20170302122929_brusherProfileDiscount.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170302122929_brusherProfileDiscount.Designer.cs rename to Yavsc.Server/Migrations/20170302122929_brusherProfileDiscount.Designer.cs diff --git a/Yavsc/Migrations/20170302122929_brusherProfileDiscount.cs b/Yavsc.Server/Migrations/20170302122929_brusherProfileDiscount.cs similarity index 100% rename from Yavsc/Migrations/20170302122929_brusherProfileDiscount.cs rename to Yavsc.Server/Migrations/20170302122929_brusherProfileDiscount.cs diff --git a/Yavsc/Migrations/20170303000800_estimateRequireCommandType.Designer.cs b/Yavsc.Server/Migrations/20170303000800_estimateRequireCommandType.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170303000800_estimateRequireCommandType.Designer.cs rename to Yavsc.Server/Migrations/20170303000800_estimateRequireCommandType.Designer.cs diff --git a/Yavsc/Migrations/20170303000800_estimateRequireCommandType.cs b/Yavsc.Server/Migrations/20170303000800_estimateRequireCommandType.cs similarity index 100% rename from Yavsc/Migrations/20170303000800_estimateRequireCommandType.cs rename to Yavsc.Server/Migrations/20170303000800_estimateRequireCommandType.cs diff --git a/Yavsc/Migrations/20170317213255_cxRequiresUserName.Designer.cs b/Yavsc.Server/Migrations/20170317213255_cxRequiresUserName.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170317213255_cxRequiresUserName.Designer.cs rename to Yavsc.Server/Migrations/20170317213255_cxRequiresUserName.Designer.cs diff --git a/Yavsc/Migrations/20170317213255_cxRequiresUserName.cs b/Yavsc.Server/Migrations/20170317213255_cxRequiresUserName.cs similarity index 100% rename from Yavsc/Migrations/20170317213255_cxRequiresUserName.cs rename to Yavsc.Server/Migrations/20170317213255_cxRequiresUserName.cs diff --git a/Yavsc/Migrations/20170329075249_avatarMayBeNull.Designer.cs b/Yavsc.Server/Migrations/20170329075249_avatarMayBeNull.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170329075249_avatarMayBeNull.Designer.cs rename to Yavsc.Server/Migrations/20170329075249_avatarMayBeNull.Designer.cs diff --git a/Yavsc/Migrations/20170329075249_avatarMayBeNull.cs b/Yavsc.Server/Migrations/20170329075249_avatarMayBeNull.cs similarity index 100% rename from Yavsc/Migrations/20170329075249_avatarMayBeNull.cs rename to Yavsc.Server/Migrations/20170329075249_avatarMayBeNull.cs diff --git a/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs b/Yavsc.Server/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs rename to Yavsc.Server/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs diff --git a/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs b/Yavsc.Server/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs similarity index 100% rename from Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs rename to Yavsc.Server/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs diff --git a/Yavsc/Migrations/20170408055642_haircutqueryAdditionalInfo.Designer.cs b/Yavsc.Server/Migrations/20170408055642_haircutqueryAdditionalInfo.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170408055642_haircutqueryAdditionalInfo.Designer.cs rename to Yavsc.Server/Migrations/20170408055642_haircutqueryAdditionalInfo.Designer.cs diff --git a/Yavsc/Migrations/20170408055642_haircutqueryAdditionalInfo.cs b/Yavsc.Server/Migrations/20170408055642_haircutqueryAdditionalInfo.cs similarity index 100% rename from Yavsc/Migrations/20170408055642_haircutqueryAdditionalInfo.cs rename to Yavsc.Server/Migrations/20170408055642_haircutqueryAdditionalInfo.cs diff --git a/Yavsc/Migrations/20170409004555_haircutCommandTaints.Designer.cs b/Yavsc.Server/Migrations/20170409004555_haircutCommandTaints.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170409004555_haircutCommandTaints.Designer.cs rename to Yavsc.Server/Migrations/20170409004555_haircutCommandTaints.Designer.cs diff --git a/Yavsc/Migrations/20170409004555_haircutCommandTaints.cs b/Yavsc.Server/Migrations/20170409004555_haircutCommandTaints.cs similarity index 100% rename from Yavsc/Migrations/20170409004555_haircutCommandTaints.cs rename to Yavsc.Server/Migrations/20170409004555_haircutCommandTaints.cs diff --git a/Yavsc/Migrations/20170507200834_paypal.Designer.cs b/Yavsc.Server/Migrations/20170507200834_paypal.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170507200834_paypal.Designer.cs rename to Yavsc.Server/Migrations/20170507200834_paypal.Designer.cs diff --git a/Yavsc/Migrations/20170507200834_paypal.cs b/Yavsc.Server/Migrations/20170507200834_paypal.cs similarity index 100% rename from Yavsc/Migrations/20170507200834_paypal.cs rename to Yavsc.Server/Migrations/20170507200834_paypal.cs diff --git a/Yavsc/Migrations/20170510121057_hairCutPaypalPayment.Designer.cs b/Yavsc.Server/Migrations/20170510121057_hairCutPaypalPayment.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170510121057_hairCutPaypalPayment.Designer.cs rename to Yavsc.Server/Migrations/20170510121057_hairCutPaypalPayment.Designer.cs diff --git a/Yavsc/Migrations/20170510121057_hairCutPaypalPayment.cs b/Yavsc.Server/Migrations/20170510121057_hairCutPaypalPayment.cs similarity index 100% rename from Yavsc/Migrations/20170510121057_hairCutPaypalPayment.cs rename to Yavsc.Server/Migrations/20170510121057_hairCutPaypalPayment.cs diff --git a/Yavsc/Migrations/20170512102508_hairCutBill.Designer.cs b/Yavsc.Server/Migrations/20170512102508_hairCutBill.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170512102508_hairCutBill.Designer.cs rename to Yavsc.Server/Migrations/20170512102508_hairCutBill.Designer.cs diff --git a/Yavsc/Migrations/20170512102508_hairCutBill.cs b/Yavsc.Server/Migrations/20170512102508_hairCutBill.cs similarity index 100% rename from Yavsc/Migrations/20170512102508_hairCutBill.cs rename to Yavsc.Server/Migrations/20170512102508_hairCutBill.cs diff --git a/Yavsc/Migrations/20170513213829_paypalids.Designer.cs b/Yavsc.Server/Migrations/20170513213829_paypalids.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170513213829_paypalids.Designer.cs rename to Yavsc.Server/Migrations/20170513213829_paypalids.Designer.cs diff --git a/Yavsc/Migrations/20170513213829_paypalids.cs b/Yavsc.Server/Migrations/20170513213829_paypalids.cs similarity index 100% rename from Yavsc/Migrations/20170513213829_paypalids.cs rename to Yavsc.Server/Migrations/20170513213829_paypalids.cs diff --git a/Yavsc/Migrations/20170514123122_links.Designer.cs b/Yavsc.Server/Migrations/20170514123122_links.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170514123122_links.Designer.cs rename to Yavsc.Server/Migrations/20170514123122_links.Designer.cs diff --git a/Yavsc/Migrations/20170514123122_links.cs b/Yavsc.Server/Migrations/20170514123122_links.cs similarity index 100% rename from Yavsc/Migrations/20170514123122_links.cs rename to Yavsc.Server/Migrations/20170514123122_links.cs diff --git a/Yavsc/Migrations/20170516181745_paymentConsent.Designer.cs b/Yavsc.Server/Migrations/20170516181745_paymentConsent.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170516181745_paymentConsent.Designer.cs rename to Yavsc.Server/Migrations/20170516181745_paymentConsent.Designer.cs diff --git a/Yavsc/Migrations/20170516181745_paymentConsent.cs b/Yavsc.Server/Migrations/20170516181745_paymentConsent.cs similarity index 100% rename from Yavsc/Migrations/20170516181745_paymentConsent.cs rename to Yavsc.Server/Migrations/20170516181745_paymentConsent.cs diff --git a/Yavsc/Migrations/20170517001340_notificatioinTarget.Designer.cs b/Yavsc.Server/Migrations/20170517001340_notificatioinTarget.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170517001340_notificatioinTarget.Designer.cs rename to Yavsc.Server/Migrations/20170517001340_notificatioinTarget.Designer.cs diff --git a/Yavsc/Migrations/20170517001340_notificatioinTarget.cs b/Yavsc.Server/Migrations/20170517001340_notificatioinTarget.cs similarity index 100% rename from Yavsc/Migrations/20170517001340_notificatioinTarget.cs rename to Yavsc.Server/Migrations/20170517001340_notificatioinTarget.cs diff --git a/Yavsc/Migrations/20170524210924_paypalToDeprecated.Designer.cs b/Yavsc.Server/Migrations/20170524210924_paypalToDeprecated.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170524210924_paypalToDeprecated.Designer.cs rename to Yavsc.Server/Migrations/20170524210924_paypalToDeprecated.Designer.cs diff --git a/Yavsc/Migrations/20170524210924_paypalToDeprecated.cs b/Yavsc.Server/Migrations/20170524210924_paypalToDeprecated.cs similarity index 100% rename from Yavsc/Migrations/20170524210924_paypalToDeprecated.cs rename to Yavsc.Server/Migrations/20170524210924_paypalToDeprecated.cs diff --git a/Yavsc/Migrations/20170526020220_rdvPayment.Designer.cs b/Yavsc.Server/Migrations/20170526020220_rdvPayment.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170526020220_rdvPayment.Designer.cs rename to Yavsc.Server/Migrations/20170526020220_rdvPayment.Designer.cs diff --git a/Yavsc/Migrations/20170526020220_rdvPayment.cs b/Yavsc.Server/Migrations/20170526020220_rdvPayment.cs similarity index 100% rename from Yavsc/Migrations/20170526020220_rdvPayment.cs rename to Yavsc.Server/Migrations/20170526020220_rdvPayment.cs diff --git a/Yavsc/Migrations/20170601115553_period.Designer.cs b/Yavsc.Server/Migrations/20170601115553_period.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170601115553_period.Designer.cs rename to Yavsc.Server/Migrations/20170601115553_period.Designer.cs diff --git a/Yavsc/Migrations/20170601115553_period.cs b/Yavsc.Server/Migrations/20170601115553_period.cs similarity index 100% rename from Yavsc/Migrations/20170601115553_period.cs rename to Yavsc.Server/Migrations/20170601115553_period.cs diff --git a/Yavsc/Migrations/20170611141231_BrusherCalendarModel.Designer.cs b/Yavsc.Server/Migrations/20170611141231_BrusherCalendarModel.Designer.cs similarity index 100% rename from Yavsc/Migrations/20170611141231_BrusherCalendarModel.Designer.cs rename to Yavsc.Server/Migrations/20170611141231_BrusherCalendarModel.Designer.cs diff --git a/Yavsc/Migrations/20170611141231_BrusherCalendarModel.cs b/Yavsc.Server/Migrations/20170611141231_BrusherCalendarModel.cs similarity index 100% rename from Yavsc/Migrations/20170611141231_BrusherCalendarModel.cs rename to Yavsc.Server/Migrations/20170611141231_BrusherCalendarModel.cs diff --git a/Yavsc/Migrations/20171002023107_Features.Designer.cs b/Yavsc.Server/Migrations/20171002023107_Features.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171002023107_Features.Designer.cs rename to Yavsc.Server/Migrations/20171002023107_Features.Designer.cs diff --git a/Yavsc/Migrations/20171002023107_Features.cs b/Yavsc.Server/Migrations/20171002023107_Features.cs similarity index 100% rename from Yavsc/Migrations/20171002023107_Features.cs rename to Yavsc.Server/Migrations/20171002023107_Features.cs diff --git a/Yavsc/Migrations/20171002023835_bugs.Designer.cs b/Yavsc.Server/Migrations/20171002023835_bugs.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171002023835_bugs.Designer.cs rename to Yavsc.Server/Migrations/20171002023835_bugs.Designer.cs diff --git a/Yavsc/Migrations/20171002023835_bugs.cs b/Yavsc.Server/Migrations/20171002023835_bugs.cs similarity index 100% rename from Yavsc/Migrations/20171002023835_bugs.cs rename to Yavsc.Server/Migrations/20171002023835_bugs.cs diff --git a/Yavsc/Migrations/20171003195221_BlogRename.Designer.cs b/Yavsc.Server/Migrations/20171003195221_BlogRename.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171003195221_BlogRename.Designer.cs rename to Yavsc.Server/Migrations/20171003195221_BlogRename.Designer.cs diff --git a/Yavsc/Migrations/20171003195221_BlogRename.cs b/Yavsc.Server/Migrations/20171003195221_BlogRename.cs similarity index 100% rename from Yavsc/Migrations/20171003195221_BlogRename.cs rename to Yavsc.Server/Migrations/20171003195221_BlogRename.cs diff --git a/Yavsc/Migrations/20171003203721_BlogComment.Designer.cs b/Yavsc.Server/Migrations/20171003203721_BlogComment.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171003203721_BlogComment.Designer.cs rename to Yavsc.Server/Migrations/20171003203721_BlogComment.Designer.cs diff --git a/Yavsc/Migrations/20171003203721_BlogComment.cs b/Yavsc.Server/Migrations/20171003203721_BlogComment.cs similarity index 100% rename from Yavsc/Migrations/20171003203721_BlogComment.cs rename to Yavsc.Server/Migrations/20171003203721_BlogComment.cs diff --git a/Yavsc/Migrations/20171008184908_annouce.Designer.cs b/Yavsc.Server/Migrations/20171008184908_annouce.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171008184908_annouce.Designer.cs rename to Yavsc.Server/Migrations/20171008184908_annouce.Designer.cs diff --git a/Yavsc/Migrations/20171008184908_annouce.cs b/Yavsc.Server/Migrations/20171008184908_annouce.cs similarity index 100% rename from Yavsc/Migrations/20171008184908_annouce.cs rename to Yavsc.Server/Migrations/20171008184908_annouce.cs diff --git a/Yavsc/Migrations/20171008190234_announceAnwer.Designer.cs b/Yavsc.Server/Migrations/20171008190234_announceAnwer.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171008190234_announceAnwer.Designer.cs rename to Yavsc.Server/Migrations/20171008190234_announceAnwer.Designer.cs diff --git a/Yavsc/Migrations/20171008190234_announceAnwer.cs b/Yavsc.Server/Migrations/20171008190234_announceAnwer.cs similarity index 100% rename from Yavsc/Migrations/20171008190234_announceAnwer.cs rename to Yavsc.Server/Migrations/20171008190234_announceAnwer.cs diff --git a/Yavsc/Migrations/20171016090837_bugDescription.Designer.cs b/Yavsc.Server/Migrations/20171016090837_bugDescription.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171016090837_bugDescription.Designer.cs rename to Yavsc.Server/Migrations/20171016090837_bugDescription.Designer.cs diff --git a/Yavsc/Migrations/20171016090837_bugDescription.cs b/Yavsc.Server/Migrations/20171016090837_bugDescription.cs similarity index 100% rename from Yavsc/Migrations/20171016090837_bugDescription.cs rename to Yavsc.Server/Migrations/20171016090837_bugDescription.cs diff --git a/Yavsc/Migrations/20171019130120_subComment.Designer.cs b/Yavsc.Server/Migrations/20171019130120_subComment.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171019130120_subComment.Designer.cs rename to Yavsc.Server/Migrations/20171019130120_subComment.Designer.cs diff --git a/Yavsc/Migrations/20171019130120_subComment.cs b/Yavsc.Server/Migrations/20171019130120_subComment.cs similarity index 100% rename from Yavsc/Migrations/20171019130120_subComment.cs rename to Yavsc.Server/Migrations/20171019130120_subComment.cs diff --git a/Yavsc/Migrations/20171020090944_commentAuthor.Designer.cs b/Yavsc.Server/Migrations/20171020090944_commentAuthor.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171020090944_commentAuthor.Designer.cs rename to Yavsc.Server/Migrations/20171020090944_commentAuthor.Designer.cs diff --git a/Yavsc/Migrations/20171020090944_commentAuthor.cs b/Yavsc.Server/Migrations/20171020090944_commentAuthor.cs similarity index 100% rename from Yavsc/Migrations/20171020090944_commentAuthor.cs rename to Yavsc.Server/Migrations/20171020090944_commentAuthor.cs diff --git a/Yavsc/Migrations/20171020173835_commentAuthorId.Designer.cs b/Yavsc.Server/Migrations/20171020173835_commentAuthorId.Designer.cs similarity index 100% rename from Yavsc/Migrations/20171020173835_commentAuthorId.Designer.cs rename to Yavsc.Server/Migrations/20171020173835_commentAuthorId.Designer.cs diff --git a/Yavsc/Migrations/20171020173835_commentAuthorId.cs b/Yavsc.Server/Migrations/20171020173835_commentAuthorId.cs similarity index 100% rename from Yavsc/Migrations/20171020173835_commentAuthorId.cs rename to Yavsc.Server/Migrations/20171020173835_commentAuthorId.cs diff --git a/Yavsc/Migrations/20180102153009_chatRooms.Designer.cs b/Yavsc.Server/Migrations/20180102153009_chatRooms.Designer.cs similarity index 100% rename from Yavsc/Migrations/20180102153009_chatRooms.Designer.cs rename to Yavsc.Server/Migrations/20180102153009_chatRooms.Designer.cs diff --git a/Yavsc/Migrations/20180102153009_chatRooms.cs b/Yavsc.Server/Migrations/20180102153009_chatRooms.cs similarity index 100% rename from Yavsc/Migrations/20180102153009_chatRooms.cs rename to Yavsc.Server/Migrations/20180102153009_chatRooms.cs diff --git a/Yavsc/Migrations/20180209144114_rejectQuery.Designer.cs b/Yavsc.Server/Migrations/20180209144114_rejectQuery.Designer.cs similarity index 100% rename from Yavsc/Migrations/20180209144114_rejectQuery.Designer.cs rename to Yavsc.Server/Migrations/20180209144114_rejectQuery.Designer.cs diff --git a/Yavsc/Migrations/20180209144114_rejectQuery.cs b/Yavsc.Server/Migrations/20180209144114_rejectQuery.cs similarity index 100% rename from Yavsc/Migrations/20180209144114_rejectQuery.cs rename to Yavsc.Server/Migrations/20180209144114_rejectQuery.cs diff --git a/Yavsc/Migrations/20180420213912_mailingTemplates.Designer.cs b/Yavsc.Server/Migrations/20180420213912_mailingTemplates.Designer.cs similarity index 100% rename from Yavsc/Migrations/20180420213912_mailingTemplates.Designer.cs rename to Yavsc.Server/Migrations/20180420213912_mailingTemplates.Designer.cs diff --git a/Yavsc/Migrations/20180420213912_mailingTemplates.cs b/Yavsc.Server/Migrations/20180420213912_mailingTemplates.cs similarity index 100% rename from Yavsc/Migrations/20180420213912_mailingTemplates.cs rename to Yavsc.Server/Migrations/20180420213912_mailingTemplates.cs diff --git a/Yavsc.Server/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs b/Yavsc.Server/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs new file mode 100644 index 00000000..f4deb3df --- /dev/null +++ b/Yavsc.Server/Migrations/20180503100246_userAllowMonthlyEmail.Designer.cs @@ -0,0 +1,1812 @@ +using System; +using Microsoft.Data.Entity; +using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Metadata; +using Microsoft.Data.Entity.Migrations; +using Yavsc.Models; + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20180503100246_userAllowMonthlyEmail")] + partial class userAllowMonthlyEmail + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "7.0.0-rc1-16348"); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasAnnotation("Relational:Name", "RoleNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasAnnotation("Relational:TableName", "AspNetUserRoles"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.Ban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("OwnerId") + .IsRequired(); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b => + { + b.Property("CircleId"); + + b.Property("BlogPostId"); + + b.HasKey("CircleId", "BlogPostId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId"); + + b.Property("ContactCredits"); + + b.Property("Credits"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("AllowMonthlyEmail"); + + b.Property("Avatar") + .HasAnnotation("MaxLength", 512) + .HasAnnotation("Relational:DefaultValue", "/images/Users/icon_user.png") + .HasAnnotation("Relational:DefaultValueType", "System.String"); + + b.Property("BankInfoId"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("DedicatedGoogleCalendar") + .HasAnnotation("MaxLength", 512); + + b.Property("DiskQuota") + .HasAnnotation("Relational:DefaultValue", "524288000") + .HasAnnotation("Relational:DefaultValueType", "System.Int64"); + + b.Property("DiskUsage"); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("FullName") + .HasAnnotation("MaxLength", 512); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("MaxFileSize"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("PostalAddressId"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasAnnotation("Relational:Name", "EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasAnnotation("Relational:Name", "UserNameIndex"); + + b.HasAnnotation("Relational:TableName", "AspNetUsers"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.Client", b => + { + b.Property("Id"); + + b.Property("Active"); + + b.Property("DisplayName"); + + b.Property("LogoutRedirectUri") + .HasAnnotation("MaxLength", 100); + + b.Property("RedirectUri"); + + b.Property("RefreshTokenLifeTime"); + + b.Property("Secret"); + + b.Property("Type"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b => + { + b.Property("Id"); + + b.Property("ClientId") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.Property("ExpiresUtc"); + + b.Property("IssuedUtc"); + + b.Property("ProtectedTicket") + .IsRequired(); + + b.Property("Subject") + .IsRequired() + .HasAnnotation("MaxLength", 50); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BalanceId") + .IsRequired(); + + b.Property("ExecDate"); + + b.Property("Impact"); + + b.Property("Reason") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Bank.BankIdentity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccountNumber") + .HasAnnotation("MaxLength", 15); + + b.Property("BIC") + .HasAnnotation("MaxLength", 15); + + b.Property("BankCode") + .HasAnnotation("MaxLength", 5); + + b.Property("BankedKey"); + + b.Property("IBAN") + .HasAnnotation("MaxLength", 33); + + b.Property("WicketCode") + .HasAnnotation("MaxLength", 5); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("Currency"); + + b.Property("Description") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("EstimateId"); + + b.Property("EstimateTemplateId"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 256); + + b.Property("UnitaryCost"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AttachedFilesString"); + + b.Property("AttachedGraphicsString"); + + b.Property("ClientId") + .IsRequired(); + + b.Property("ClientValidationDate"); + + b.Property("CommandId"); + + b.Property("CommandType") + .IsRequired(); + + b.Property("Description"); + + b.Property("OwnerId"); + + b.Property("ProviderValidationDate"); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.EstimateTemplate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("OwnerId") + .IsRequired(); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b => + { + b.Property("SIREN"); + + b.HasKey("SIREN"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogPost", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("Content") + .HasAnnotation("MaxLength", 56224); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("Photo") + .HasAnnotation("MaxLength", 1024); + + b.Property("Rate"); + + b.Property("Title") + .HasAnnotation("MaxLength", 1024); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.Property("Visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogTag", b => + { + b.Property("PostId"); + + b.Property("TagId"); + + b.HasKey("PostId", "TagId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.Comment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId") + .IsRequired(); + + b.Property("Content"); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("ParentId"); + + b.Property("PostId"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.Property("Visible"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.Period", b => + { + b.Property("Start"); + + b.Property("End"); + + b.HasKey("Start", "End"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b => + { + b.Property("OwnerId"); + + b.HasKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.ScheduledEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("PeriodEnd"); + + b.Property("PeriodStart"); + + b.Property("Reccurence"); + + b.Property("ScheduleOwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatConnection", b => + { + b.Property("ConnectionId"); + + b.Property("ApplicationUserId") + .IsRequired(); + + b.Property("Connected"); + + b.Property("UserAgent"); + + b.HasKey("ConnectionId"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoom", b => + { + b.Property("Name") + .HasAnnotation("MaxLength", 255); + + b.Property("ApplicationUserId"); + + b.Property("Topic") + .HasAnnotation("MaxLength", 1023); + + b.HasKey("Name"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoomPresence", b => + { + b.Property("ChannelName"); + + b.Property("ChatUserConnectionId"); + + b.Property("Level"); + + b.HasKey("ChannelName", "ChatUserConnectionId"); + }); + + modelBuilder.Entity("Yavsc.Models.Cratie.Option", b => + { + b.Property("Code"); + + b.Property("CodeScrutin"); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("Description"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.HasKey("Code", "CodeScrutin"); + }); + + modelBuilder.Entity("Yavsc.Models.Drawing.Color", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Blue"); + + b.Property("Green"); + + b.Property("Name"); + + b.Property("Red"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Forms.Form", b => + { + b.Property("Id"); + + b.Property("Summary"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b => + { + b.Property("UserId"); + + b.Property("ActionDistance"); + + b.Property("CarePrice"); + + b.Property("FlatFeeDiscount"); + + b.Property("HalfBalayagePrice"); + + b.Property("HalfBrushingPrice"); + + b.Property("HalfColorPrice"); + + b.Property("HalfDefrisPrice"); + + b.Property("HalfFoldingPrice"); + + b.Property("HalfMechPrice"); + + b.Property("HalfMultiColorPrice"); + + b.Property("HalfPermanentPrice"); + + b.Property("KidCutPrice"); + + b.Property("LongBalayagePrice"); + + b.Property("LongBrushingPrice"); + + b.Property("LongColorPrice"); + + b.Property("LongDefrisPrice"); + + b.Property("LongFoldingPrice"); + + b.Property("LongMechPrice"); + + b.Property("LongMultiColorPrice"); + + b.Property("LongPermanentPrice"); + + b.Property("ManBrushPrice"); + + b.Property("ManCutPrice"); + + b.Property("ScheduleOwnerId"); + + b.Property("ShampooPrice"); + + b.Property("ShortBalayagePrice"); + + b.Property("ShortBrushingPrice"); + + b.Property("ShortColorPrice"); + + b.Property("ShortDefrisPrice"); + + b.Property("ShortFoldingPrice"); + + b.Property("ShortMechPrice"); + + b.Property("ShortMultiColorPrice"); + + b.Property("ShortPermanentPrice"); + + b.Property("WomenHalfCutPrice"); + + b.Property("WomenLongCutPrice"); + + b.Property("WomenShortCutPrice"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairCutQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("AdditionalInfo") + .HasAnnotation("MaxLength", 512); + + b.Property("ClientId") + .IsRequired(); + + b.Property("Consent"); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("EventDate"); + + b.Property("LocationId"); + + b.Property("PaymentId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("PrestationId"); + + b.Property("Previsional"); + + b.Property("Rejected"); + + b.Property("RejectedAt"); + + b.Property("SelectedProfileUserId"); + + b.Property("Status"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("Consent"); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("EventDate"); + + b.Property("LocationId"); + + b.Property("PaymentId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("Rejected"); + + b.Property("RejectedAt"); + + b.Property("Status"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Cares"); + + b.Property("Cut"); + + b.Property("Dressing"); + + b.Property("Gender"); + + b.Property("Length"); + + b.Property("Shampoo"); + + b.Property("Tech"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestationCollectionItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("PrestationId"); + + b.Property("QueryId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Brand"); + + b.Property("ColorId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaintInstance", b => + { + b.Property("TaintId"); + + b.Property("PrestationId"); + + b.HasKey("TaintId", "PrestationId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.Property("DeviceId"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId"); + + b.Property("GCMRegistrationId") + .IsRequired(); + + b.Property("LatestActivityUpdate"); + + b.Property("Model"); + + b.Property("Platform"); + + b.Property("Version"); + + b.HasKey("DeviceId"); + }); + + modelBuilder.Entity("Yavsc.Models.IT.Fixing.Bug", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("FeatureId"); + + b.Property("Status"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.IT.Maintaining.Feature", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Description"); + + b.Property("ShortName"); + + b.Property("Status"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Product", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Depth"); + + b.Property("Description"); + + b.Property("Height"); + + b.Property("Name"); + + b.Property("Price"); + + b.Property("Public"); + + b.Property("Weight"); + + b.Property("Width"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ContextId"); + + b.Property("Description"); + + b.Property("Name"); + + b.Property("Public"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.Announce", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("For"); + + b.Property("Message"); + + b.Property("OwnerId"); + + b.Property("Sender"); + + b.Property("Topic"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.ClientProviderInfo", b => + { + b.Property("UserId"); + + b.Property("Avatar"); + + b.Property("BillingAddressId"); + + b.Property("EMail"); + + b.Property("Phone"); + + b.Property("UserName"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.DimissClicked", b => + { + b.Property("UserId"); + + b.Property("NotificationId"); + + b.HasKey("UserId", "NotificationId"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.Notification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Target"); + + b.Property("body") + .IsRequired(); + + b.Property("click_action") + .IsRequired(); + + b.Property("color"); + + b.Property("icon") + .HasAnnotation("Relational:DefaultValue", "exclam") + .HasAnnotation("Relational:DefaultValueType", "System.String"); + + b.Property("sound"); + + b.Property("tag"); + + b.Property("title") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Instrument", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 255); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.MusicalPreference", b => + { + b.Property("OwnerProfileId"); + + b.Property("DjSettingsUserId"); + + b.Property("GeneralSettingsUserId"); + + b.Property("Rate"); + + b.Property("TendencyId"); + + b.HasKey("OwnerProfileId"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.MusicalTendency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 255); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.DjSettings", b => + { + b.Property("UserId"); + + b.Property("SoundCloudId"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.GeneralSettings", b => + { + b.Property("UserId"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.Instrumentation", b => + { + b.Property("InstrumentId"); + + b.Property("UserId"); + + b.HasKey("InstrumentId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b => + { + b.Property("UserId"); + + b.Property("AccessToken"); + + b.Property("Expiration"); + + b.Property("ExpiresIn"); + + b.Property("RefreshToken"); + + b.Property("TokenType"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Payment.PayPalPayment", b => + { + b.Property("CreationToken"); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("ExecutorId") + .IsRequired(); + + b.Property("OrderReference"); + + b.Property("PaypalPayerId"); + + b.Property("State"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.HasKey("CreationToken"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ApplicationUserId"); + + b.Property("Name"); + + b.Property("OwnerId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.CircleMember", b => + { + b.Property("MemberId"); + + b.Property("CircleId"); + + b.HasKey("MemberId", "CircleId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Contact", b => + { + b.Property("OwnerId"); + + b.Property("UserId"); + + b.Property("ApplicationUserId"); + + b.HasKey("OwnerId", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.HyperLink", b => + { + b.Property("HRef"); + + b.Property("Method"); + + b.Property("BrusherProfileUserId"); + + b.Property("ContentType"); + + b.Property("PayPalPaymentCreationToken"); + + b.Property("Rel"); + + b.HasKey("HRef", "Method"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Address") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("Latitude"); + + b.Property("Longitude"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.LocationType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired(); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name"); + + b.Property("Rate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b => + { + b.Property("Code") + .HasAnnotation("MaxLength", 512); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("Description"); + + b.Property("Hidden"); + + b.Property("ModeratorGroupName"); + + b.Property("Name") + .IsRequired() + .HasAnnotation("MaxLength", 512); + + b.Property("ParentCode") + .HasAnnotation("MaxLength", 512); + + b.Property("Photo"); + + b.Property("Rate"); + + b.Property("SettingsClassName"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.HasKey("Code"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CommandForm", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ActionName"); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("Title"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CoWorking", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("FormationSettingsUserId"); + + b.Property("PerformerId"); + + b.Property("WorkingForId"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerformerId"); + + b.Property("AcceptNotifications"); + + b.Property("AcceptPublicContact"); + + b.Property("Active"); + + b.Property("MaxDailyCost"); + + b.Property("MinDailyCost"); + + b.Property("OrganizationAddressId"); + + b.Property("Rate"); + + b.Property("SIREN") + .IsRequired() + .HasAnnotation("MaxLength", 14); + + b.Property("UseGeoLocalizationToReduceDistanceWithClients"); + + b.Property("WebSite"); + + b.HasKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Profiles.FormationSettings", b => + { + b.Property("UserId"); + + b.HasKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.RdvQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ActivityCode") + .IsRequired(); + + b.Property("ClientId") + .IsRequired(); + + b.Property("Consent"); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("EventDate"); + + b.Property("LocationId"); + + b.Property("LocationTypeId"); + + b.Property("PaymentId"); + + b.Property("PerformerId") + .IsRequired(); + + b.Property("Previsional"); + + b.Property("Reason"); + + b.Property("Rejected"); + + b.Property("RejectedAt"); + + b.Property("Status"); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.Property("ValidationDate"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.UserActivity", b => + { + b.Property("DoesCode"); + + b.Property("UserId"); + + b.Property("Weight"); + + b.HasKey("DoesCode", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.EMailing.MailingTemplate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Body") + .HasAnnotation("MaxLength", 65536); + + b.Property("DateCreated"); + + b.Property("DateModified"); + + b.Property("ManagerId"); + + b.Property("ReplyToAddress"); + + b.Property("ToSend"); + + b.Property("Topic") + .HasAnnotation("MaxLength", 128); + + b.Property("UserCreated"); + + b.Property("UserModified"); + + b.HasKey("Id"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b => + { + b.HasOne("Yavsc.Models.Blog.BlogPost") + .WithMany() + .HasForeignKey("BlogPostId"); + + b.HasOne("Yavsc.Models.Relationship.Circle") + .WithMany() + .HasForeignKey("CircleId"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithOne() + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Models.Bank.BankIdentity") + .WithMany() + .HasForeignKey("BankInfoId"); + + b.HasOne("Yavsc.Models.Relationship.Location") + .WithMany() + .HasForeignKey("PostalAddressId"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance") + .WithMany() + .HasForeignKey("BalanceId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Billing.Estimate") + .WithMany() + .HasForeignKey("EstimateId"); + + b.HasOne("Yavsc.Models.Billing.EstimateTemplate") + .WithMany() + .HasForeignKey("EstimateTemplateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Models.Workflow.RdvQuery") + .WithMany() + .HasForeignKey("CommandId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogPost", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogTag", b => + { + b.HasOne("Yavsc.Models.Blog.BlogPost") + .WithMany() + .HasForeignKey("PostId"); + + b.HasOne("Yavsc.Models.Relationship.Tag") + .WithMany() + .HasForeignKey("TagId"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.Comment", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("AuthorId"); + + b.HasOne("Yavsc.Models.Blog.Comment") + .WithMany() + .HasForeignKey("ParentId"); + + b.HasOne("Yavsc.Models.Blog.BlogPost") + .WithMany() + .HasForeignKey("PostId"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.ScheduledEvent", b => + { + b.HasOne("Yavsc.Models.Calendar.Schedule") + .WithMany() + .HasForeignKey("ScheduleOwnerId"); + + b.HasOne("Yavsc.Models.Calendar.Period") + .WithMany() + .HasForeignKey("PeriodStart", "PeriodEnd"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatConnection", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ApplicationUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoom", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ApplicationUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoomPresence", b => + { + b.HasOne("Yavsc.Models.Chat.ChatRoom") + .WithMany() + .HasForeignKey("ChannelName"); + + b.HasOne("Yavsc.Models.Chat.ChatConnection") + .WithMany() + .HasForeignKey("ChatUserConnectionId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b => + { + b.HasOne("Yavsc.Models.Calendar.Schedule") + .WithMany() + .HasForeignKey("ScheduleOwnerId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairCutQuery", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Models.Relationship.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + + b.HasOne("Yavsc.Models.Haircut.HairPrestation") + .WithMany() + .HasForeignKey("PrestationId"); + + b.HasOne("Yavsc.Models.Haircut.BrusherProfile") + .WithMany() + .HasForeignKey("SelectedProfileUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Models.Relationship.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestationCollectionItem", b => + { + b.HasOne("Yavsc.Models.Haircut.HairPrestation") + .WithMany() + .HasForeignKey("PrestationId"); + + b.HasOne("Yavsc.Models.Haircut.HairMultiCutQuery") + .WithMany() + .HasForeignKey("QueryId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaint", b => + { + b.HasOne("Yavsc.Models.Drawing.Color") + .WithMany() + .HasForeignKey("ColorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaintInstance", b => + { + b.HasOne("Yavsc.Models.Haircut.HairPrestation") + .WithMany() + .HasForeignKey("PrestationId"); + + b.HasOne("Yavsc.Models.Haircut.HairTaint") + .WithMany() + .HasForeignKey("TaintId"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("DeviceOwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.IT.Fixing.Bug", b => + { + b.HasOne("Yavsc.Models.IT.Maintaining.Feature") + .WithMany() + .HasForeignKey("FeatureId"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("ContextId"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.Announce", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("OwnerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.DimissClicked", b => + { + b.HasOne("Yavsc.Models.Messaging.Notification") + .WithMany() + .HasForeignKey("NotificationId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.MusicalPreference", b => + { + b.HasOne("Yavsc.Models.Musical.Profiles.DjSettings") + .WithMany() + .HasForeignKey("DjSettingsUserId"); + + b.HasOne("Yavsc.Models.Musical.Profiles.GeneralSettings") + .WithMany() + .HasForeignKey("GeneralSettingsUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.Instrumentation", b => + { + b.HasOne("Yavsc.Models.Musical.Instrument") + .WithMany() + .HasForeignKey("InstrumentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Payment.PayPalPayment", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ExecutorId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ApplicationUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.CircleMember", b => + { + b.HasOne("Yavsc.Models.Relationship.Circle") + .WithMany() + .HasForeignKey("CircleId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("MemberId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Contact", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ApplicationUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.HyperLink", b => + { + b.HasOne("Yavsc.Models.Haircut.BrusherProfile") + .WithMany() + .HasForeignKey("BrusherProfileUserId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment") + .WithMany() + .HasForeignKey("PayPalPaymentCreationToken"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("ParentCode"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CommandForm", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CoWorking", b => + { + b.HasOne("Yavsc.Models.Workflow.Profiles.FormationSettings") + .WithMany() + .HasForeignKey("FormationSettingsUserId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("WorkingForId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Relationship.Location") + .WithMany() + .HasForeignKey("OrganizationAddressId"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.RdvQuery", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("ActivityCode"); + + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ClientId"); + + b.HasOne("Yavsc.Models.Relationship.Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Relationship.LocationType") + .WithMany() + .HasForeignKey("LocationTypeId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.UserActivity", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity") + .WithMany() + .HasForeignKey("DoesCode"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile") + .WithMany() + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.EMailing.MailingTemplate", b => + { + b.HasOne("Yavsc.Models.ApplicationUser") + .WithMany() + .HasForeignKey("ManagerId"); + }); + } + } +} diff --git a/Yavsc.Server/Migrations/20180503100246_userAllowMonthlyEmail.cs b/Yavsc.Server/Migrations/20180503100246_userAllowMonthlyEmail.cs new file mode 100644 index 00000000..28308a1b --- /dev/null +++ b/Yavsc.Server/Migrations/20180503100246_userAllowMonthlyEmail.cs @@ -0,0 +1,759 @@ +using System; +using System.Collections.Generic; +using Microsoft.Data.Entity.Migrations; + +namespace Yavsc.Migrations +{ + public partial class userAllowMonthlyEmail : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed"); + migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId", table: "CircleAuthorizationToBlogPost"); + migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine"); + migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate"); + migrationBuilder.DropForeignKey(name: "FK_BlogTag_BlogPost_PostId", table: "BlogTag"); + migrationBuilder.DropForeignKey(name: "FK_BlogTag_Tag_TagId", table: "BlogTag"); + migrationBuilder.DropForeignKey(name: "FK_Comment_ApplicationUser_AuthorId", table: "Comment"); + migrationBuilder.DropForeignKey(name: "FK_Comment_BlogPost_PostId", table: "Comment"); + migrationBuilder.DropForeignKey(name: "FK_Schedule_ApplicationUser_OwnerId", table: "Schedule"); + migrationBuilder.DropForeignKey(name: "FK_ChatConnection_ApplicationUser_ApplicationUserId", table: "ChatConnection"); + migrationBuilder.DropForeignKey(name: "FK_BrusherProfile_PerformerProfile_UserId", table: "BrusherProfile"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", table: "HairPrestationCollectionItem"); + migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", table: "HairPrestationCollectionItem"); + migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint"); + migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairPrestation_PrestationId", table: "HairTaintInstance"); + migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairTaint_TaintId", table: "HairTaintInstance"); + migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked"); + migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked"); + migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation"); + migrationBuilder.DropForeignKey(name: "FK_PayPalPayment_ApplicationUser_ExecutorId", table: "PayPalPayment"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery"); + migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery"); + migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery"); + migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity"); + migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity"); + migrationBuilder.DropColumn(name: "ShortName", table: "MailingTemplate"); + migrationBuilder.AddColumn( + name: "Topic", + table: "MailingTemplate", + nullable: true); + migrationBuilder.AddColumn( + name: "LatestActivityUpdate", + table: "GoogleCloudMobileDeclaration", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + migrationBuilder.AddColumn( + name: "AllowMonthlyEmail", + table: "AspNetUsers", + nullable: false, + defaultValue: false); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BlackListed_ApplicationUser_OwnerId", + table: "BlackListed", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId", + table: "CircleAuthorizationToBlogPost", + column: "BlogPostId", + principalTable: "BlogPost", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", + table: "CircleAuthorizationToBlogPost", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CommandLine_Estimate_EstimateId", + table: "CommandLine", + column: "EstimateId", + principalTable: "Estimate", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Estimate_ApplicationUser_ClientId", + table: "Estimate", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BlogTag_BlogPost_PostId", + table: "BlogTag", + column: "PostId", + principalTable: "BlogPost", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BlogTag_Tag_TagId", + table: "BlogTag", + column: "TagId", + principalTable: "Tag", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Comment_ApplicationUser_AuthorId", + table: "Comment", + column: "AuthorId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Comment_BlogPost_PostId", + table: "Comment", + column: "PostId", + principalTable: "BlogPost", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Schedule_ApplicationUser_OwnerId", + table: "Schedule", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_ChatConnection_ApplicationUser_ApplicationUserId", + table: "ChatConnection", + column: "ApplicationUserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_BrusherProfile_PerformerProfile_UserId", + table: "BrusherProfile", + column: "UserId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_Activity_ActivityCode", + table: "HairCutQuery", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_ApplicationUser_ClientId", + table: "HairCutQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_PerformerProfile_PerformerId", + table: "HairCutQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_HairPrestation_PrestationId", + table: "HairCutQuery", + column: "PrestationId", + principalTable: "HairPrestation", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairMultiCutQuery_Activity_ActivityCode", + table: "HairMultiCutQuery", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", + table: "HairMultiCutQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", + table: "HairMultiCutQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", + table: "HairPrestationCollectionItem", + column: "PrestationId", + principalTable: "HairPrestation", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", + table: "HairPrestationCollectionItem", + column: "QueryId", + principalTable: "HairMultiCutQuery", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairTaint_Color_ColorId", + table: "HairTaint", + column: "ColorId", + principalTable: "Color", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairTaintInstance_HairPrestation_PrestationId", + table: "HairTaintInstance", + column: "PrestationId", + principalTable: "HairPrestation", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_HairTaintInstance_HairTaint_TaintId", + table: "HairTaintInstance", + column: "TaintId", + principalTable: "HairTaint", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_DimissClicked_Notification_NotificationId", + table: "DimissClicked", + column: "NotificationId", + principalTable: "Notification", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_DimissClicked_ApplicationUser_UserId", + table: "DimissClicked", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_Instrumentation_Instrument_InstrumentId", + table: "Instrumentation", + column: "InstrumentId", + principalTable: "Instrument", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PayPalPayment_ApplicationUser_ExecutorId", + table: "PayPalPayment", + column: "ExecutorId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_CommandForm_Activity_ActivityCode", + table: "CommandForm", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganizationAddressId", + table: "PerformerProfile", + column: "OrganizationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_RdvQuery_Activity_ActivityCode", + table: "RdvQuery", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_RdvQuery_ApplicationUser_ClientId", + table: "RdvQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_RdvQuery_PerformerProfile_PerformerId", + table: "RdvQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_UserActivity_Activity_DoesCode", + table: "UserActivity", + column: "DoesCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Cascade); + migrationBuilder.AddForeignKey( + name: "FK_UserActivity_PerformerProfile_UserId", + table: "UserActivity", + column: "UserId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim_IdentityRole_RoleId", table: "AspNetRoleClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim_ApplicationUser_UserId", table: "AspNetUserClaims"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin_ApplicationUser_UserId", table: "AspNetUserLogins"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_IdentityRole_RoleId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole_ApplicationUser_UserId", table: "AspNetUserRoles"); + migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed"); + migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId", table: "CircleAuthorizationToBlogPost"); + migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost"); + migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance"); + migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact"); + migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine"); + migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate"); + migrationBuilder.DropForeignKey(name: "FK_BlogTag_BlogPost_PostId", table: "BlogTag"); + migrationBuilder.DropForeignKey(name: "FK_BlogTag_Tag_TagId", table: "BlogTag"); + migrationBuilder.DropForeignKey(name: "FK_Comment_ApplicationUser_AuthorId", table: "Comment"); + migrationBuilder.DropForeignKey(name: "FK_Comment_BlogPost_PostId", table: "Comment"); + migrationBuilder.DropForeignKey(name: "FK_Schedule_ApplicationUser_OwnerId", table: "Schedule"); + migrationBuilder.DropForeignKey(name: "FK_ChatConnection_ApplicationUser_ApplicationUserId", table: "ChatConnection"); + migrationBuilder.DropForeignKey(name: "FK_BrusherProfile_PerformerProfile_UserId", table: "BrusherProfile"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery"); + migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", table: "HairPrestationCollectionItem"); + migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", table: "HairPrestationCollectionItem"); + migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint"); + migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairPrestation_PrestationId", table: "HairTaintInstance"); + migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairTaint_TaintId", table: "HairTaintInstance"); + migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked"); + migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked"); + migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation"); + migrationBuilder.DropForeignKey(name: "FK_PayPalPayment_ApplicationUser_ExecutorId", table: "PayPalPayment"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember"); + migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile"); + migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery"); + migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery"); + migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery"); + migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity"); + migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity"); + migrationBuilder.DropColumn(name: "Topic", table: "MailingTemplate"); + migrationBuilder.DropColumn(name: "LatestActivityUpdate", table: "GoogleCloudMobileDeclaration"); + migrationBuilder.DropColumn(name: "AllowMonthlyEmail", table: "AspNetUsers"); + migrationBuilder.AddColumn( + name: "ShortName", + table: "MailingTemplate", + nullable: true); + migrationBuilder.AddForeignKey( + name: "FK_IdentityRoleClaim_IdentityRole_RoleId", + table: "AspNetRoleClaims", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserClaim_ApplicationUser_UserId", + table: "AspNetUserClaims", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserLogin_ApplicationUser_UserId", + table: "AspNetUserLogins", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_IdentityRole_RoleId", + table: "AspNetUserRoles", + column: "RoleId", + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_IdentityUserRole_ApplicationUser_UserId", + table: "AspNetUserRoles", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BlackListed_ApplicationUser_OwnerId", + table: "BlackListed", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId", + table: "CircleAuthorizationToBlogPost", + column: "BlogPostId", + principalTable: "BlogPost", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", + table: "CircleAuthorizationToBlogPost", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_AccountBalance_ApplicationUser_UserId", + table: "AccountBalance", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BalanceImpact_AccountBalance_BalanceId", + table: "BalanceImpact", + column: "BalanceId", + principalTable: "AccountBalance", + principalColumn: "UserId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CommandLine_Estimate_EstimateId", + table: "CommandLine", + column: "EstimateId", + principalTable: "Estimate", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Estimate_ApplicationUser_ClientId", + table: "Estimate", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BlogTag_BlogPost_PostId", + table: "BlogTag", + column: "PostId", + principalTable: "BlogPost", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BlogTag_Tag_TagId", + table: "BlogTag", + column: "TagId", + principalTable: "Tag", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Comment_ApplicationUser_AuthorId", + table: "Comment", + column: "AuthorId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Comment_BlogPost_PostId", + table: "Comment", + column: "PostId", + principalTable: "BlogPost", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Schedule_ApplicationUser_OwnerId", + table: "Schedule", + column: "OwnerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_ChatConnection_ApplicationUser_ApplicationUserId", + table: "ChatConnection", + column: "ApplicationUserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_BrusherProfile_PerformerProfile_UserId", + table: "BrusherProfile", + column: "UserId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_Activity_ActivityCode", + table: "HairCutQuery", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_ApplicationUser_ClientId", + table: "HairCutQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_PerformerProfile_PerformerId", + table: "HairCutQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairCutQuery_HairPrestation_PrestationId", + table: "HairCutQuery", + column: "PrestationId", + principalTable: "HairPrestation", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairMultiCutQuery_Activity_ActivityCode", + table: "HairMultiCutQuery", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", + table: "HairMultiCutQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", + table: "HairMultiCutQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", + table: "HairPrestationCollectionItem", + column: "PrestationId", + principalTable: "HairPrestation", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", + table: "HairPrestationCollectionItem", + column: "QueryId", + principalTable: "HairMultiCutQuery", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairTaint_Color_ColorId", + table: "HairTaint", + column: "ColorId", + principalTable: "Color", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairTaintInstance_HairPrestation_PrestationId", + table: "HairTaintInstance", + column: "PrestationId", + principalTable: "HairPrestation", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_HairTaintInstance_HairTaint_TaintId", + table: "HairTaintInstance", + column: "TaintId", + principalTable: "HairTaint", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_DimissClicked_Notification_NotificationId", + table: "DimissClicked", + column: "NotificationId", + principalTable: "Notification", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_DimissClicked_ApplicationUser_UserId", + table: "DimissClicked", + column: "UserId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_Instrumentation_Instrument_InstrumentId", + table: "Instrumentation", + column: "InstrumentId", + principalTable: "Instrument", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PayPalPayment_ApplicationUser_ExecutorId", + table: "PayPalPayment", + column: "ExecutorId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_Circle_CircleId", + table: "CircleMember", + column: "CircleId", + principalTable: "Circle", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CircleMember_ApplicationUser_MemberId", + table: "CircleMember", + column: "MemberId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_CommandForm_Activity_ActivityCode", + table: "CommandForm", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_Location_OrganizationAddressId", + table: "PerformerProfile", + column: "OrganizationAddressId", + principalTable: "Location", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_PerformerProfile_ApplicationUser_PerformerId", + table: "PerformerProfile", + column: "PerformerId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_RdvQuery_Activity_ActivityCode", + table: "RdvQuery", + column: "ActivityCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_RdvQuery_ApplicationUser_ClientId", + table: "RdvQuery", + column: "ClientId", + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_RdvQuery_PerformerProfile_PerformerId", + table: "RdvQuery", + column: "PerformerId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_UserActivity_Activity_DoesCode", + table: "UserActivity", + column: "DoesCode", + principalTable: "Activity", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + migrationBuilder.AddForeignKey( + name: "FK_UserActivity_PerformerProfile_UserId", + table: "UserActivity", + column: "UserId", + principalTable: "PerformerProfile", + principalColumn: "PerformerId", + onDelete: ReferentialAction.Restrict); + } + } +} diff --git a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs b/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 99% rename from Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs rename to Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs index 96bb5299..a7198bb2 100644 --- a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs @@ -153,6 +153,8 @@ namespace Yavsc.Migrations b.Property("AccessFailedCount"); + b.Property("AllowMonthlyEmail"); + b.Property("Avatar") .HasAnnotation("MaxLength", 512) .HasAnnotation("Relational:DefaultValue", "/images/Users/icon_user.png") @@ -802,6 +804,8 @@ namespace Yavsc.Migrations b.Property("GCMRegistrationId") .IsRequired(); + b.Property("LatestActivityUpdate"); + b.Property("Model"); b.Property("Platform"); @@ -1331,11 +1335,11 @@ namespace Yavsc.Migrations b.Property("ReplyToAddress"); - b.Property("ShortName") - .HasAnnotation("MaxLength", 128); - b.Property("ToSend"); + b.Property("Topic") + .HasAnnotation("MaxLength", 128); + b.Property("UserCreated"); b.Property("UserModified"); diff --git a/Yavsc.Server/Models/Identity/ApplicationUser.cs b/Yavsc.Server/Models/Identity/ApplicationUser.cs index 93b8f342..81d17d61 100644 --- a/Yavsc.Server/Models/Identity/ApplicationUser.cs +++ b/Yavsc.Server/Models/Identity/ApplicationUser.cs @@ -99,5 +99,7 @@ namespace Yavsc.Models [JsonIgnore][InverseProperty("Owner")] public virtual List BlackList { get; set; } + + public bool AllowMonthlyEmail { get; set; } = false; } } diff --git a/Yavsc.Server/rc-num.txt b/Yavsc.Server/rc-num.txt new file mode 100644 index 00000000..60d3b2f4 --- /dev/null +++ b/Yavsc.Server/rc-num.txt @@ -0,0 +1 @@ +15 diff --git a/Yavsc/Controllers/ManageController.cs b/Yavsc/Controllers/ManageController.cs index 3413ff9d..a54f311a 100644 --- a/Yavsc/Controllers/ManageController.cs +++ b/Yavsc/Controllers/ManageController.cs @@ -93,6 +93,7 @@ namespace Yavsc.Controllers : message == ManageMessageId.IdentityUpdateSuccess ? _SR["Your identity was updated."] : message == ManageMessageId.SetBankInfoSuccess ? _SR["Vos informations bancaires ont bien été enregistrées."] : message == ManageMessageId.SetAddressSuccess ? _SR["Votre adresse a bien été enregistrée."] + : message == ManageMessageId.SetMonthlyEmailSuccess ? _SR["Vos préférences concernant la lettre mensuelle ont été sauvegardées."] : ""; var user = await GetCurrentUserAsync(); @@ -668,8 +669,8 @@ namespace Yavsc.Controllers AvatarUpdateSuccess, IdentityUpdateSuccess, SetBankInfoSuccess, - SetAddressSuccess, + SetMonthlyEmailSuccess, Error } diff --git a/Yavsc/Makefile b/Yavsc/Makefile index 45f5174c..c77a41ab 100644 --- a/Yavsc/Makefile +++ b/Yavsc/Makefile @@ -1,28 +1,9 @@ -PRJNAME=Yavsc DESTDIR=/srv/www/yavscpre PRODDESTDIR=/srv/www/yavsc -ASPNET_ENV=Development -CONFIGURATION=Release -ASPNET_LOG_LEVEL=info #warn HOSTING=localhost HOSTADMIN=root -FRAMEWORKALIAS=dnx451 -BINTARGET=$(PRJNAME).dll -BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET) -PKGFILENAME=$(PRJNAME).$(VERSION).nupkg -DESTPATH=. -PACKAGE=$(DESTPATH)/$(PKGFILENAME) -NUGETSOURCE=$(HOME)/Nupkgs/ - -all: $(BINTARGETPATH) - -$(BINTARGETPATH): - dnu build - -deploy: clean pushInPre pushInProd - -git_status := $(shell git status -s --porcelain |wc -l) +include ../common.mk status: ifeq ($(git_status),0) @@ -34,34 +15,7 @@ endif default: pushInPre -restore: - touch project.json - dnu restore - -project.lock.json: project.json - dnu restore - -watch: project.lock.json - ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION) - -run: project.lock.json - ASPNET_ENV=$(ASPNET_ENV) dnx web --configuration=$(CONFIGURATION) - -clean: - rm -rf bin obj - -cleanoutput: - rm -rf bin/$(CONFIGURATION) - rm -rf bin/output - -bin/$(CONFIGURATION): project.lock.json - dnu build --configuration=$(CONFIGURATION) - -bin/output: bin/$(CONFIGURATION) - @dnu publish - -bin/output/wwwroot/version: bin/output - @git log -1 --pretty=format:%h > bin/output/wwwroot/version +deploy: pushInPre pushInProd pushInPre: cleanoutput bin/output/wwwroot/version ssh $(HOSTADMIN)@$(HOSTING) sudo service kestrel-pre stop @@ -82,21 +36,3 @@ else git status endif - -$(PACKAGE): $(BINTARGETPATH) - nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) - -clean: - rm $(PACKAGE) - -$(BINARY): project.lock.json - dnu build --configuration $(CONFIGURATION) - -project.lock.json: project.json - dnu restore - -deploy-pkg: $(PACKAGE) - cp $(PACKAGE) $(NUGETSOURCE) - -.PHONY: $(PACKAGE) $(BINTARGETPATH) - diff --git a/Yavsc/rc-num.txt b/Yavsc/rc-num.txt new file mode 100644 index 00000000..60d3b2f4 --- /dev/null +++ b/Yavsc/rc-num.txt @@ -0,0 +1 @@ +15 diff --git a/cli/Makefile b/cli/Makefile index dc944be2..a3ade719 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -1,5 +1,8 @@ include ../common.mk +MSBUILD=msbuild + + all: build build: project.lock.json @@ -8,7 +11,10 @@ build: project.lock.json restore: touch project.json dnu restore - + +msbuild-restore: + $(MSBUILD) cli.csproj /t:Restore + project.lock.json: project.json dnu restore diff --git a/cli/cli.csproj b/cli/cli.csproj index 00ac19b8..dd3481e9 100644 --- a/cli/cli.csproj +++ b/cli/cli.csproj @@ -1,18 +1,12 @@ + Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" > 10.0 Debug AnyCPU {E7C9D6BF-54DC-4E18-8F25-C4BD4BE71ACC} Exe - Properties - cli - cli - netcoreapp2.0 - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -63,31 +57,14 @@ - ..\packages\EntityFramework7.Npgsql.3.1.0-rc1-3\lib\net451\EntityFramework7.Npgsql.dll - ..\packages\EntityFramework.Core.7.0.0-rc1-final\lib\net451\EntityFramework.Core.dll - ..\packages\Yavsc.Server.1.0.5-rc9\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Yavsc.Server.dll - + - ..\packages\Yavsc.Abstract.1.0.5-rc9\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Yavsc.Abstract.dll - - - ..\packages\Ix-Async.1.2.5\lib\net45\System.Interactive.Async.dll - ..\packages\Machine.Specifications.Runner.Console.0.9.0\tools\CommandLine.dll - - - ..\packages\Machine.Specifications.Runner.Console.0.9.0\tools\Machine.Specifications.Reporting.dll - - - ..\packages\Machine.Specifications.Runner.Console.0.9.0\tools\Machine.Specifications.Reporting.Templates.dll - - - ..\packages\Machine.Specifications.Runner.Console.0.9.0\tools\Machine.Specifications.Runner.Utility.dll @@ -95,6 +72,7 @@ + @@ -129,9 +107,9 @@ - + diff --git a/cli/project.json b/cli/project.json index bb9ff70f..baa4d4f6 100644 --- a/cli/project.json +++ b/cli/project.json @@ -56,4 +56,4 @@ "frameworks": { "dnx451": {} } -} \ No newline at end of file +} diff --git a/cli/project.lock.json b/cli/project.lock.json index fdd76e48..69373f78 100644 --- a/cli/project.lock.json +++ b/cli/project.lock.json @@ -7165,51 +7165,59 @@ }, "Microsoft.Extensions.CodeGeneration/1.0.0-rc1-final": { "type": "package", + "serviceable": true, "sha512": "Mkld1xqSkU1CuMtMlbKMPwzoXMXBzC/SdOiRLutd632mGrQCDwhBgrxiBDfFDD63OxWt24TjMZkqlxmRRTm7zQ==", "files": [ "lib/dnx451/Microsoft.Extensions.CodeGeneration.dll", "lib/dnx451/Microsoft.Extensions.CodeGeneration.xml", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.dll", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.xml", - "microsoft.extensions.codegeneration.1.0.0-rc1-final.nupkg.sha512", - "microsoft.extensions.codegeneration.nuspec" + "Microsoft.Extensions.CodeGeneration.1.0.0-rc1-final.nupkg", + "Microsoft.Extensions.CodeGeneration.1.0.0-rc1-final.nupkg.sha512", + "Microsoft.Extensions.CodeGeneration.nuspec" ] }, "Microsoft.Extensions.CodeGeneration.Core/1.0.0-rc1-final": { "type": "package", + "serviceable": true, "sha512": "uQe19xMM4ymoC9uU/rLZTkbSH8n/CVKEjw4jbLfoFq179+LH4IxDRqPqidEMQUF6ON4jYVwhexuAMPJdQ5ewjQ==", "files": [ "lib/dnx451/Microsoft.Extensions.CodeGeneration.Core.dll", "lib/dnx451/Microsoft.Extensions.CodeGeneration.Core.xml", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.Core.dll", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.Core.xml", - "microsoft.extensions.codegeneration.core.1.0.0-rc1-final.nupkg.sha512", - "microsoft.extensions.codegeneration.core.nuspec" + "Microsoft.Extensions.CodeGeneration.Core.1.0.0-rc1-final.nupkg", + "Microsoft.Extensions.CodeGeneration.Core.1.0.0-rc1-final.nupkg.sha512", + "Microsoft.Extensions.CodeGeneration.Core.nuspec" ] }, "Microsoft.Extensions.CodeGeneration.EntityFramework/1.0.0-rc1-final": { "type": "package", + "serviceable": true, "sha512": "Bs5bPxbPlTYAB5d1+bPjnAZqQyQMueg0orED8boIlwb66he5pFO7LuQ3Q+BNTUB4x3M1q1U7L1L469tllVtGZg==", "files": [ "lib/dnx451/Microsoft.Extensions.CodeGeneration.EntityFramework.dll", "lib/dnx451/Microsoft.Extensions.CodeGeneration.EntityFramework.xml", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.EntityFramework.dll", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.EntityFramework.xml", - "microsoft.extensions.codegeneration.entityframework.1.0.0-rc1-final.nupkg.sha512", - "microsoft.extensions.codegeneration.entityframework.nuspec", + "Microsoft.Extensions.CodeGeneration.EntityFramework.1.0.0-rc1-final.nupkg", + "Microsoft.Extensions.CodeGeneration.EntityFramework.1.0.0-rc1-final.nupkg.sha512", + "Microsoft.Extensions.CodeGeneration.EntityFramework.nuspec", "Templates/DbContext/NewLocalDbContext.cshtml" ] }, "Microsoft.Extensions.CodeGeneration.Templating/1.0.0-rc1-final": { "type": "package", + "serviceable": true, "sha512": "d20Suo15M+sNS5QBYMfJpBgSUFclVSeIU06Y/snnmKdNjAiQfbKkW0bG8ryBw8zn29KXHcK39DwUpkrFvphQIg==", "files": [ "lib/dnx451/Microsoft.Extensions.CodeGeneration.Templating.dll", "lib/dnx451/Microsoft.Extensions.CodeGeneration.Templating.xml", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.Templating.dll", "lib/dnxcore50/Microsoft.Extensions.CodeGeneration.Templating.xml", - "microsoft.extensions.codegeneration.templating.1.0.0-rc1-final.nupkg.sha512", - "microsoft.extensions.codegeneration.templating.nuspec" + "Microsoft.Extensions.CodeGeneration.Templating.1.0.0-rc1-final.nupkg", + "Microsoft.Extensions.CodeGeneration.Templating.1.0.0-rc1-final.nupkg.sha512", + "Microsoft.Extensions.CodeGeneration.Templating.nuspec" ] }, "Microsoft.Extensions.Configuration/1.0.0-rc1-final": { diff --git a/common.mk b/common.mk index 7bb5b248..7067ec1a 100644 --- a/common.mk +++ b/common.mk @@ -7,13 +7,16 @@ VERSION=1.0.5-rc$(rc_num) CONFIGURATION=Release PRJNAME := $(shell basename `pwd -P` .dll) PKGFILENAME=$(PRJNAME).$(VERSION).nupkg -PACKAGE=$(DESTPATH)/$(PKGFILENAME) -BINARY=bin/$(CONFIG)/$(FRAMEWORK)/$(PRJNAME).dll +BINARY=bin/$(CONFIGURATION)/$(FRAMEWORK)/$(PRJNAME).dll NUGETSOURCE=$(HOME)/Nupkgs/ ASPNET_ENV=Development ASPNET_LOG_LEVEL=Debug -# nuget package destination, at generationi time -DESTPATH=. +# nuget package destination, at generation time +HOSTING=localhost +HOSTADMIN=root +FRAMEWORKALIAS=dnx451 +BINTARGET=$(PRJNAME).dll +BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET) # OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli # @@ -27,22 +30,58 @@ all: build rc-num.txt: ifndef rc-num + @echo Generating rc-num.txt with: $(shell cat ../rc-num.txt || echo 1) > $@ @echo $(shell cat ../rc-num.txt || echo 1) > $@ +rc_num := $(shell cat rc-num.txt) else @echo 'Got rc num : $(rc_num)' endif rc-num.txt-check: rc-num.txt ifndef rc_num - @echo no rc num ... please, run 'make reinit-rc-num.txt' before. + @echo no rc num ... please, run 'make rc-num.txt' before. else @echo 'Got rc num : $(rc_num)' endif -clean-rc-num.txt: - rm rc-num.txt +restore: + touch project.json + dnu restore -reinit-rc-num.txt: clean-rc-num.txt rc-num.txt +project.lock.json: project.json + dnu restore -.PHONY: rc-num.txt-check +watch: project.lock.json + ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION) + +run: project.lock.json + ASPNET_ENV=$(ASPNET_ENV) dnx web --configuration=$(CONFIGURATION) + +clean: + rm -rf bin obj + +cleanoutput: + rm -rf bin/$(CONFIGURATION) + rm -rf bin/output + +$(BINTARGETPATH): project.lock.json + dnu build --configuration=$(CONFIGURATION) + +build: $(BINTARGETPATH) +bin/output: + @dnu publish + +bin/output/wwwroot/version: bin/output + @git log -1 --pretty=format:%h > bin/output/wwwroot/version + +$(PKGFILENAME): $(BINARY) rc-num.txt + nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) + +$(NUGETSOURCE)/$(PRJNAME): + mkdir -P $^ + +deploy-pkg: $(PKGFILENAME) + cp $(PKGFILENAME) $(NUGETSOURCE) + +.PHONY: rc-num.txt-check diff --git a/dnx.mk b/dnx.mk new file mode 100644 index 00000000..5acd31b9 --- /dev/null +++ b/dnx.mk @@ -0,0 +1,9 @@ +include common.mk + +$(BINTARGETPATH): + dnu build + +build: project. + $(DNU) build + + diff --git a/rc-num.txt b/rc-num.txt index 8351c193..60d3b2f4 100644 --- a/rc-num.txt +++ b/rc-num.txt @@ -1 +1 @@ -14 +15