From 6142b3164790093ce9c4f6e018ca26acee3c5f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 27 Nov 2019 15:21:48 +0300 Subject: [PATCH 1/7] Upgrade npm packages --- .../yarn.lock | 222 +++++++++--------- .../yarn.lock | 222 +++++++++--------- .../yarn.lock | 222 +++++++++--------- 3 files changed, 333 insertions(+), 333 deletions(-) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock index 8721816bcc..c6bcef6b4f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.2.tgz#4adf25fe08eb3e46e9195e5edf55890dd3b306c6" - integrity sha512-0CQiSuuauiEGRnX4GwyzY8Dk//0CUGsiw/m/YMx+4ekRGsg0RfheqY5yzx53KxGGGXIwEPwqtePp4OgGLE21uQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.3.tgz#490ba918cad5052bf580f264b1616ed03e935494" + integrity sha512-+ojuIFfNRMh8B45AoQW01cmqwQvsiSU5cSIbyAZdFhQlJZ/T8mPm9sGz7wvn0RUk/S31/RKFDWTnL70l95Qk1g== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.3" -"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.2.tgz#1d64a4b2455335449cdd320c7b7f2d17dcdb6af8" - integrity sha512-0hvTUuXazF4+w8XhctVEwm5itQdgaVbEYIyHibBhW4ItP/NlgSiTxJ4LoSt6NXJZphVuc2K3sY3ZETQgNVH+cQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "^1.0.2" - "@abp/bootstrap" "^1.0.2" - "@abp/bootstrap-datepicker" "^1.0.2" - "@abp/datatables.net-bs4" "^1.0.2" - "@abp/font-awesome" "^1.0.2" - "@abp/jquery-form" "^1.0.2" - "@abp/jquery-validation-unobtrusive" "^1.0.2" - "@abp/lodash" "^1.0.2" - "@abp/luxon" "^1.0.2" - "@abp/malihu-custom-scrollbar-plugin" "^1.0.2" - "@abp/select2" "^1.0.2" - "@abp/sweetalert" "^1.0.2" - "@abp/timeago" "^1.0.2" - "@abp/toastr" "^1.0.2" - -"@abp/aspnetcore.mvc.ui@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.2.tgz#0c227eb46851adf416f189933984670b8d585b38" - integrity sha512-B4g7pqwIAZ0y9NcLpfTmnU/YjGHB80E1tSPLRmOeIQNaOPrIab8BN0HnNekuGIGSgesc9J6VWVuA/+D1vzlyMg== +"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.3.tgz#dd6e451f4694e191ade48abb2a6431a8ee387fa2" + integrity sha512-5fyEDhuDbjvpnetms/ay3nD1Z/Upsrd6ELShwEgP5X9smbtnJdFsjlFAnFJ1Aiu1h0+/w2uxDCQPXsv/G2hvpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "^1.0.3" + "@abp/bootstrap" "^1.0.3" + "@abp/bootstrap-datepicker" "^1.0.3" + "@abp/datatables.net-bs4" "^1.0.3" + "@abp/font-awesome" "^1.0.3" + "@abp/jquery-form" "^1.0.3" + "@abp/jquery-validation-unobtrusive" "^1.0.3" + "@abp/lodash" "^1.0.3" + "@abp/luxon" "^1.0.3" + "@abp/malihu-custom-scrollbar-plugin" "^1.0.3" + "@abp/select2" "^1.0.3" + "@abp/sweetalert" "^1.0.3" + "@abp/timeago" "^1.0.3" + "@abp/toastr" "^1.0.3" + +"@abp/aspnetcore.mvc.ui@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.3.tgz#fd0ce62fe783ed1d217415599d602eadb04eff70" + integrity sha512-qPTve11VcyXGqSDhsUSeQZ89KeMaiX8QmcyhGJdW5Ebn84Q3S04v7LHRePG11OudB0LjlSqhWX1pBxoZO8woXw== dependencies: ansi-colors "^3.2.4" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^2.6.3" -"@abp/bootstrap-datepicker@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.2.tgz#36e8ee3d006740d161387c0a0f6a58bae44001ed" - integrity sha512-focQu8S3AIF2roG5zCB4Jvu6bTyReAB2cBAygIf+hVhQzKLQ1gbW8YVvdsyx1oPRN9ZtMoQ/bP91nu+4kXq5SA== +"@abp/bootstrap-datepicker@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.3.tgz#d33057b3a27416f07ef9b868450e15bed32f3d32" + integrity sha512-ZOwg5I3VGr12xU9XlmJGMrOlwb51Uo+P8FT2c073Vtod2hn0g3n7BAtqgNE8ML2ikEZvazZtspmdk9GlqMzzzQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.2.tgz#be04792c11ca285de03bf8cc60d6c6791dddc886" - integrity sha512-4VP2ZOQSIT9nHRSW4r9odruR8hbq5gsyb6p8W4BEHMU07uwZYhIM9rlyqhz1ZtztIar+IP7NGm+xoNP+eT55Fw== +"@abp/bootstrap@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.3.tgz#444d5eb5bb3b293f94da9af6c239e408e2147c71" + integrity sha512-7YOUYYwdfsph5i7qeTX1RS92lcunfEAWKnkhbQjQfcjn7YVgUH/Gopi8/Kbm+A9YBgocidK6cOPoAnyYHYYjbg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" bootstrap "^4.3.1" -"@abp/core@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.2.tgz#87799b82ab11bbe625a710d2f9a7022e7aa6f58e" - integrity sha512-jix0I2ocFpi+io74jeOfhfcn6QYgSLLWg8CZzTb7jbs5VbB2ptFERgprKdO2/LtgQRpW6oaSYj1a3l4/e2dPEQ== +"@abp/core@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.3.tgz#b7fc32a06b7e912c9723e00d957f43d51d87e9e4" + integrity sha512-lCfF9N1WdI5pQyx6XML4GfTYIrlkrxiYQhJFWnjSLPCIbFz+CTPKMKb1GUt3mJDKATKjuq6w4C6Auhg2QVPPGQ== -"@abp/datatables.net-bs4@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.2.tgz#12a71c08c5f371349fcafe9e2cce8abb90f2671f" - integrity sha512-B12dpg8jqoSTNUqr/iXQHov5eeFCeEifKtHesT4KUATWTQYcXawPsJ7cuihBA/+8hEkfixKLu15pMwMXMKVe7Q== +"@abp/datatables.net-bs4@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.3.tgz#0b0ad9e691dcc2b53934d678c591ea46321d2dea" + integrity sha512-z+quV91z1C1wcBM6m2io3+B2l1tqqRzNU1ILSyNvwYIajqZqmiLmvFjXuST3S1xWY6Hj+jiLDV0Ts085uG1GAw== dependencies: - "@abp/datatables.net" "^1.0.2" + "@abp/datatables.net" "^1.0.3" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.2.tgz#09d4cd06fab61f1cf540d23266d691110632f836" - integrity sha512-opueN1uVt+4crfl0OfhrsNP5hudp3yOO2IDzymyPnjKcvQOnzK6uxgTp0Rr7UiQ2RSHndIzsEy7hw/S15BKpWQ== +"@abp/datatables.net@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.3.tgz#b887e21d1b5fd84c9a74d18fd473ddc78750cb6d" + integrity sha512-iKl6UJh1qG1XTNpnkzEcS68dvGr3G2y1lMdLN4W+VA8gZeVKNUhY15/bSfg7RAE7GrL8PysIKQmBU+c3F4UTqA== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" datatables.net "^1.10.20" -"@abp/font-awesome@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.2.tgz#75e4b10a1a9e20daf180a27e481ad783b464c986" - integrity sha512-rB5vlAB9wN5O+oEqZGjZTXaTTwxD/c5x1HjLF+87/Y8cqpEdrjhj0u4qTdVZuAy48DO68Wod10hV1DbriaTQeQ== +"@abp/font-awesome@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.3.tgz#aee86b2533939f1ebab76f8fa0c0353273f7895a" + integrity sha512-bJllzQe+3kt5pwy+DqDF8leq/VTq6OMdndqZe3KMjP6q6CzZecB6Uk1YJqE+LKslp4VpjCbT983uRAR94VgMqw== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.2.tgz#0b289789c84ebae51e4ddf1886fa53637991e4c4" - integrity sha512-GB1+kAkDZT2vNgcyi9fTMtm7RxQolGaOPLRf2DZv8690MGYxxQuH0ugw3m3rDvwcufOhNVEukvDCZu0F0cvbEg== +"@abp/jquery-form@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.3.tgz#77b665c5b955bd90783529de030ce1b2dcb638c2" + integrity sha512-VHkt5Q4g4/b2zte9FeZJPNTqIFo9MO1/TAbSRNZcRC7w9QfcwpiNH+O2clcDWdieDxPsiAvIEOtpW7NKGnb7uA== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.2.tgz#f6c309ea9f693025ddd8510e68b89198ee8b2a7d" - integrity sha512-aUssKSMLgaUpNtFCtrZh/9Vlfsy6LMXmin/DJ9rwvbgwpn7C4r4fe3OFoV8qZrGHjy3y2nX/LXH9Jq1WVlGvKg== +"@abp/jquery-validation-unobtrusive@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.3.tgz#fcae4879130204ee5615b5a88b006e2e71b0aa9e" + integrity sha512-bB/os/tyPnGHklCpt57s5dQ+qkx/Nzc8AsgC6TxiSySNM3XKA94Qb22HJp5MUKAZyx7nalAHWkVlv+LrF3Eheg== dependencies: - "@abp/jquery-validation" "^1.0.2" + "@abp/jquery-validation" "^1.0.3" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.2.tgz#68926d3068a540cab012bc47afef724176cd55cb" - integrity sha512-ckjm1GcAeFQKZbf41Pfbr/WnjiWIGDbRos31qVrV718XuBhVlKygrS1yFhlsHj9oTjrBH/gAbpyMAdcQBoZsTQ== +"@abp/jquery-validation@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.3.tgz#aebf78f97dbd48a077f7f9ab6084d74de10c6884" + integrity sha512-b3xyK2q1Enf02Y3BvHSNWLXhiVGrPZPA2dcNZIMpNM7ukCvPYPzzdxj0v58EwgZ7Z7bFJdA1s+2nL83nbYVKqA== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" jquery-validation "^1.19.1" -"@abp/jquery@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.2.tgz#5d546ed760798e972eb876aac62b354501a30080" - integrity sha512-/0jztB6evW0HIhXwqZ0ny+UIcL25gG1RHw5a6W3FLMeqH9/3KSGMJtUqE9iNf0DWzvicm3E/pQm9m7dw7D0L0g== +"@abp/jquery@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.3.tgz#fff53c82e3242fcc35ff9c8a0bbb4946405bca2d" + integrity sha512-Lg7q5V4kiTExf9wuMDQk0L4hF0/rDjGk2XYDt59ncorZn+yxhwPSsPQ6ewQFiiyicNTWInk7hNlapPFwx0Rw1A== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" jquery "^3.4.1" -"@abp/lodash@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.2.tgz#bc4392c87e7b0ce61ee14e13f69e469f10fc3ef1" - integrity sha512-mFho9XqJ3vnIqWDiYzV6Nz4Iyr0/WiXdXK/YiuSl0AH6eZgF7+u+TrLcOLgxEjSUQYIwHvjkDkr7knuOzgJ/Xg== +"@abp/lodash@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.3.tgz#7547d54013000e491ca655ea56b3094cc9bb6f19" + integrity sha512-SxrAjFlon22iVu1hvvfhumtaAX4l4rIXv6DDerCqQDUVhqM76ejp4VTWJMeZcOp7kZY/g4arZ9sFIVJ3EvX5UA== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" lodash "^4.17.15" -"@abp/luxon@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.2.tgz#3b06e8a85b1420b7b59631f01b4bdaf7f40c9b7a" - integrity sha512-5TQaTs+feVfdiO5y94z7/alZoXLNjuJutQPVh8AYpyZC43H7fgJ7WH52BxtMMJGm8d3hbzAPNIxTX940TP3qTg== +"@abp/luxon@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.3.tgz#7dde8b227852b5de8b57ea76d878c1ec9de892ea" + integrity sha512-cWPpCvc/xrbyEQLcmPOE3IxD6r48ZPfqp9kfRvKdHWWaWVRje78au+yUW2Izn3wkbnHQxQF0RoSIVnsinfNrzQ== dependencies: luxon "^1.17.3" -"@abp/malihu-custom-scrollbar-plugin@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.2.tgz#83269122edc21335044fc8cbca99e9e608f224b5" - integrity sha512-pI12g+ZVlw8PA5u80mut5XOpQEXuUcRnbACwCnKO2TAhpTSecPpXh89lpnLeMPjyxAVGEOVUUBQ9fzHz0dHDTg== +"@abp/malihu-custom-scrollbar-plugin@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.3.tgz#3488eb8bb543f1d8a678967d428913e30959c731" + integrity sha512-ogXZcXostXW8NubHVZ3fd0DPhiQUIqCpfdeoZ6pTf2rREcYEmUGmXtTakxd86xFe/EE/8izauSUHusn5RhwiRg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.2.tgz#4c467e9dcab3527bf930de22d7ee035acc73bab4" - integrity sha512-D9HnPATPZU0HsFur2NL9J0KQB0N0/6/PatdjQ53IphCW3TCAeaeYA1allsVPrCbWFU9e/c5+N26h5XMAHQHSrw== +"@abp/select2@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.3.tgz#5b1aff33c463d22176fbe2ff390446f510c53256" + integrity sha512-Q1mIEQHi54P4rqLOM+qTKFd7CWNudrv4Yh7gZkqVc033lCeJUA06v/AaCV6hNmUaCIYAOnsEDIMmPCGytVfkWg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" select2 "^4.0.11" -"@abp/sweetalert@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.2.tgz#56815807817e9dba238c319dcac70276a034ecf7" - integrity sha512-2b6kAwT7vf8ztcni684rpcQbFmeTcKecd+PXnUUwXgbKwrhTO8bQCfHe47/XLLdiBVX9n1V6Ks0Jy60pOs9+5Q== +"@abp/sweetalert@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.3.tgz#1421f9e57ea4f26b9484b91c61c8bb2380a11bb8" + integrity sha512-7NHD71g4kcUpdylERaoeaY6xhcgfy1kS8njEKiHtPucG8e9FpEGzbuM/A+uifqVuM5drdsrqjWutdfJerlKqDg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" sweetalert "^2.1.2" -"@abp/timeago@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.2.tgz#00ab715ab9042fcf8e5835f67041f388b45cc925" - integrity sha512-h4FmxlI/kv/wr8vrPgB9+d1RAE4WTQUFEfB5ytUwdSQQg6JmhKdDH4hOKg1KStprUrBm2BczvJ20VjxjLOuSrQ== +"@abp/timeago@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.3.tgz#f91f0fadf167dbc4cad1311b091ce6664ae02469" + integrity sha512-SAJ66l5OacoD79J0GpfK3KdX+5g+CzoasV2tA8RguQGA9R/CZtki0OZFRRgiKReL8XxNcD7XagwPCuYN8pXT9w== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" timeago "^1.6.7" -"@abp/toastr@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.2.tgz#85c2f9bc9948e489ef2a171a0460ae0a9cc8adf9" - integrity sha512-CCdDOPVtU5qJo7TAaadMtFg1dVq1wXZvgRRCap1ayjZvFAKOJvNjN+IEgpP27lnb/GF5UYMqsiAX8dAA0tmyvw== +"@abp/toastr@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.3.tgz#6a44de32d82fbb18fabd6dd3fe6605f65e3802ae" + integrity sha512-4kza18C05h5v9azP6JvSlCdg0HqMLtdPJUPYqqzsOLWlMrcTQOeTelr+rHB3L7iYGzo8NCx81PBA1tuCDs3M7g== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock index 8721816bcc..c6bcef6b4f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.2.tgz#4adf25fe08eb3e46e9195e5edf55890dd3b306c6" - integrity sha512-0CQiSuuauiEGRnX4GwyzY8Dk//0CUGsiw/m/YMx+4ekRGsg0RfheqY5yzx53KxGGGXIwEPwqtePp4OgGLE21uQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.3.tgz#490ba918cad5052bf580f264b1616ed03e935494" + integrity sha512-+ojuIFfNRMh8B45AoQW01cmqwQvsiSU5cSIbyAZdFhQlJZ/T8mPm9sGz7wvn0RUk/S31/RKFDWTnL70l95Qk1g== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.3" -"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.2.tgz#1d64a4b2455335449cdd320c7b7f2d17dcdb6af8" - integrity sha512-0hvTUuXazF4+w8XhctVEwm5itQdgaVbEYIyHibBhW4ItP/NlgSiTxJ4LoSt6NXJZphVuc2K3sY3ZETQgNVH+cQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "^1.0.2" - "@abp/bootstrap" "^1.0.2" - "@abp/bootstrap-datepicker" "^1.0.2" - "@abp/datatables.net-bs4" "^1.0.2" - "@abp/font-awesome" "^1.0.2" - "@abp/jquery-form" "^1.0.2" - "@abp/jquery-validation-unobtrusive" "^1.0.2" - "@abp/lodash" "^1.0.2" - "@abp/luxon" "^1.0.2" - "@abp/malihu-custom-scrollbar-plugin" "^1.0.2" - "@abp/select2" "^1.0.2" - "@abp/sweetalert" "^1.0.2" - "@abp/timeago" "^1.0.2" - "@abp/toastr" "^1.0.2" - -"@abp/aspnetcore.mvc.ui@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.2.tgz#0c227eb46851adf416f189933984670b8d585b38" - integrity sha512-B4g7pqwIAZ0y9NcLpfTmnU/YjGHB80E1tSPLRmOeIQNaOPrIab8BN0HnNekuGIGSgesc9J6VWVuA/+D1vzlyMg== +"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.3.tgz#dd6e451f4694e191ade48abb2a6431a8ee387fa2" + integrity sha512-5fyEDhuDbjvpnetms/ay3nD1Z/Upsrd6ELShwEgP5X9smbtnJdFsjlFAnFJ1Aiu1h0+/w2uxDCQPXsv/G2hvpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "^1.0.3" + "@abp/bootstrap" "^1.0.3" + "@abp/bootstrap-datepicker" "^1.0.3" + "@abp/datatables.net-bs4" "^1.0.3" + "@abp/font-awesome" "^1.0.3" + "@abp/jquery-form" "^1.0.3" + "@abp/jquery-validation-unobtrusive" "^1.0.3" + "@abp/lodash" "^1.0.3" + "@abp/luxon" "^1.0.3" + "@abp/malihu-custom-scrollbar-plugin" "^1.0.3" + "@abp/select2" "^1.0.3" + "@abp/sweetalert" "^1.0.3" + "@abp/timeago" "^1.0.3" + "@abp/toastr" "^1.0.3" + +"@abp/aspnetcore.mvc.ui@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.3.tgz#fd0ce62fe783ed1d217415599d602eadb04eff70" + integrity sha512-qPTve11VcyXGqSDhsUSeQZ89KeMaiX8QmcyhGJdW5Ebn84Q3S04v7LHRePG11OudB0LjlSqhWX1pBxoZO8woXw== dependencies: ansi-colors "^3.2.4" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^2.6.3" -"@abp/bootstrap-datepicker@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.2.tgz#36e8ee3d006740d161387c0a0f6a58bae44001ed" - integrity sha512-focQu8S3AIF2roG5zCB4Jvu6bTyReAB2cBAygIf+hVhQzKLQ1gbW8YVvdsyx1oPRN9ZtMoQ/bP91nu+4kXq5SA== +"@abp/bootstrap-datepicker@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.3.tgz#d33057b3a27416f07ef9b868450e15bed32f3d32" + integrity sha512-ZOwg5I3VGr12xU9XlmJGMrOlwb51Uo+P8FT2c073Vtod2hn0g3n7BAtqgNE8ML2ikEZvazZtspmdk9GlqMzzzQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.2.tgz#be04792c11ca285de03bf8cc60d6c6791dddc886" - integrity sha512-4VP2ZOQSIT9nHRSW4r9odruR8hbq5gsyb6p8W4BEHMU07uwZYhIM9rlyqhz1ZtztIar+IP7NGm+xoNP+eT55Fw== +"@abp/bootstrap@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.3.tgz#444d5eb5bb3b293f94da9af6c239e408e2147c71" + integrity sha512-7YOUYYwdfsph5i7qeTX1RS92lcunfEAWKnkhbQjQfcjn7YVgUH/Gopi8/Kbm+A9YBgocidK6cOPoAnyYHYYjbg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" bootstrap "^4.3.1" -"@abp/core@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.2.tgz#87799b82ab11bbe625a710d2f9a7022e7aa6f58e" - integrity sha512-jix0I2ocFpi+io74jeOfhfcn6QYgSLLWg8CZzTb7jbs5VbB2ptFERgprKdO2/LtgQRpW6oaSYj1a3l4/e2dPEQ== +"@abp/core@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.3.tgz#b7fc32a06b7e912c9723e00d957f43d51d87e9e4" + integrity sha512-lCfF9N1WdI5pQyx6XML4GfTYIrlkrxiYQhJFWnjSLPCIbFz+CTPKMKb1GUt3mJDKATKjuq6w4C6Auhg2QVPPGQ== -"@abp/datatables.net-bs4@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.2.tgz#12a71c08c5f371349fcafe9e2cce8abb90f2671f" - integrity sha512-B12dpg8jqoSTNUqr/iXQHov5eeFCeEifKtHesT4KUATWTQYcXawPsJ7cuihBA/+8hEkfixKLu15pMwMXMKVe7Q== +"@abp/datatables.net-bs4@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.3.tgz#0b0ad9e691dcc2b53934d678c591ea46321d2dea" + integrity sha512-z+quV91z1C1wcBM6m2io3+B2l1tqqRzNU1ILSyNvwYIajqZqmiLmvFjXuST3S1xWY6Hj+jiLDV0Ts085uG1GAw== dependencies: - "@abp/datatables.net" "^1.0.2" + "@abp/datatables.net" "^1.0.3" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.2.tgz#09d4cd06fab61f1cf540d23266d691110632f836" - integrity sha512-opueN1uVt+4crfl0OfhrsNP5hudp3yOO2IDzymyPnjKcvQOnzK6uxgTp0Rr7UiQ2RSHndIzsEy7hw/S15BKpWQ== +"@abp/datatables.net@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.3.tgz#b887e21d1b5fd84c9a74d18fd473ddc78750cb6d" + integrity sha512-iKl6UJh1qG1XTNpnkzEcS68dvGr3G2y1lMdLN4W+VA8gZeVKNUhY15/bSfg7RAE7GrL8PysIKQmBU+c3F4UTqA== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" datatables.net "^1.10.20" -"@abp/font-awesome@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.2.tgz#75e4b10a1a9e20daf180a27e481ad783b464c986" - integrity sha512-rB5vlAB9wN5O+oEqZGjZTXaTTwxD/c5x1HjLF+87/Y8cqpEdrjhj0u4qTdVZuAy48DO68Wod10hV1DbriaTQeQ== +"@abp/font-awesome@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.3.tgz#aee86b2533939f1ebab76f8fa0c0353273f7895a" + integrity sha512-bJllzQe+3kt5pwy+DqDF8leq/VTq6OMdndqZe3KMjP6q6CzZecB6Uk1YJqE+LKslp4VpjCbT983uRAR94VgMqw== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.2.tgz#0b289789c84ebae51e4ddf1886fa53637991e4c4" - integrity sha512-GB1+kAkDZT2vNgcyi9fTMtm7RxQolGaOPLRf2DZv8690MGYxxQuH0ugw3m3rDvwcufOhNVEukvDCZu0F0cvbEg== +"@abp/jquery-form@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.3.tgz#77b665c5b955bd90783529de030ce1b2dcb638c2" + integrity sha512-VHkt5Q4g4/b2zte9FeZJPNTqIFo9MO1/TAbSRNZcRC7w9QfcwpiNH+O2clcDWdieDxPsiAvIEOtpW7NKGnb7uA== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.2.tgz#f6c309ea9f693025ddd8510e68b89198ee8b2a7d" - integrity sha512-aUssKSMLgaUpNtFCtrZh/9Vlfsy6LMXmin/DJ9rwvbgwpn7C4r4fe3OFoV8qZrGHjy3y2nX/LXH9Jq1WVlGvKg== +"@abp/jquery-validation-unobtrusive@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.3.tgz#fcae4879130204ee5615b5a88b006e2e71b0aa9e" + integrity sha512-bB/os/tyPnGHklCpt57s5dQ+qkx/Nzc8AsgC6TxiSySNM3XKA94Qb22HJp5MUKAZyx7nalAHWkVlv+LrF3Eheg== dependencies: - "@abp/jquery-validation" "^1.0.2" + "@abp/jquery-validation" "^1.0.3" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.2.tgz#68926d3068a540cab012bc47afef724176cd55cb" - integrity sha512-ckjm1GcAeFQKZbf41Pfbr/WnjiWIGDbRos31qVrV718XuBhVlKygrS1yFhlsHj9oTjrBH/gAbpyMAdcQBoZsTQ== +"@abp/jquery-validation@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.3.tgz#aebf78f97dbd48a077f7f9ab6084d74de10c6884" + integrity sha512-b3xyK2q1Enf02Y3BvHSNWLXhiVGrPZPA2dcNZIMpNM7ukCvPYPzzdxj0v58EwgZ7Z7bFJdA1s+2nL83nbYVKqA== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" jquery-validation "^1.19.1" -"@abp/jquery@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.2.tgz#5d546ed760798e972eb876aac62b354501a30080" - integrity sha512-/0jztB6evW0HIhXwqZ0ny+UIcL25gG1RHw5a6W3FLMeqH9/3KSGMJtUqE9iNf0DWzvicm3E/pQm9m7dw7D0L0g== +"@abp/jquery@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.3.tgz#fff53c82e3242fcc35ff9c8a0bbb4946405bca2d" + integrity sha512-Lg7q5V4kiTExf9wuMDQk0L4hF0/rDjGk2XYDt59ncorZn+yxhwPSsPQ6ewQFiiyicNTWInk7hNlapPFwx0Rw1A== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" jquery "^3.4.1" -"@abp/lodash@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.2.tgz#bc4392c87e7b0ce61ee14e13f69e469f10fc3ef1" - integrity sha512-mFho9XqJ3vnIqWDiYzV6Nz4Iyr0/WiXdXK/YiuSl0AH6eZgF7+u+TrLcOLgxEjSUQYIwHvjkDkr7knuOzgJ/Xg== +"@abp/lodash@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.3.tgz#7547d54013000e491ca655ea56b3094cc9bb6f19" + integrity sha512-SxrAjFlon22iVu1hvvfhumtaAX4l4rIXv6DDerCqQDUVhqM76ejp4VTWJMeZcOp7kZY/g4arZ9sFIVJ3EvX5UA== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" lodash "^4.17.15" -"@abp/luxon@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.2.tgz#3b06e8a85b1420b7b59631f01b4bdaf7f40c9b7a" - integrity sha512-5TQaTs+feVfdiO5y94z7/alZoXLNjuJutQPVh8AYpyZC43H7fgJ7WH52BxtMMJGm8d3hbzAPNIxTX940TP3qTg== +"@abp/luxon@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.3.tgz#7dde8b227852b5de8b57ea76d878c1ec9de892ea" + integrity sha512-cWPpCvc/xrbyEQLcmPOE3IxD6r48ZPfqp9kfRvKdHWWaWVRje78au+yUW2Izn3wkbnHQxQF0RoSIVnsinfNrzQ== dependencies: luxon "^1.17.3" -"@abp/malihu-custom-scrollbar-plugin@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.2.tgz#83269122edc21335044fc8cbca99e9e608f224b5" - integrity sha512-pI12g+ZVlw8PA5u80mut5XOpQEXuUcRnbACwCnKO2TAhpTSecPpXh89lpnLeMPjyxAVGEOVUUBQ9fzHz0dHDTg== +"@abp/malihu-custom-scrollbar-plugin@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.3.tgz#3488eb8bb543f1d8a678967d428913e30959c731" + integrity sha512-ogXZcXostXW8NubHVZ3fd0DPhiQUIqCpfdeoZ6pTf2rREcYEmUGmXtTakxd86xFe/EE/8izauSUHusn5RhwiRg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.2.tgz#4c467e9dcab3527bf930de22d7ee035acc73bab4" - integrity sha512-D9HnPATPZU0HsFur2NL9J0KQB0N0/6/PatdjQ53IphCW3TCAeaeYA1allsVPrCbWFU9e/c5+N26h5XMAHQHSrw== +"@abp/select2@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.3.tgz#5b1aff33c463d22176fbe2ff390446f510c53256" + integrity sha512-Q1mIEQHi54P4rqLOM+qTKFd7CWNudrv4Yh7gZkqVc033lCeJUA06v/AaCV6hNmUaCIYAOnsEDIMmPCGytVfkWg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" select2 "^4.0.11" -"@abp/sweetalert@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.2.tgz#56815807817e9dba238c319dcac70276a034ecf7" - integrity sha512-2b6kAwT7vf8ztcni684rpcQbFmeTcKecd+PXnUUwXgbKwrhTO8bQCfHe47/XLLdiBVX9n1V6Ks0Jy60pOs9+5Q== +"@abp/sweetalert@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.3.tgz#1421f9e57ea4f26b9484b91c61c8bb2380a11bb8" + integrity sha512-7NHD71g4kcUpdylERaoeaY6xhcgfy1kS8njEKiHtPucG8e9FpEGzbuM/A+uifqVuM5drdsrqjWutdfJerlKqDg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" sweetalert "^2.1.2" -"@abp/timeago@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.2.tgz#00ab715ab9042fcf8e5835f67041f388b45cc925" - integrity sha512-h4FmxlI/kv/wr8vrPgB9+d1RAE4WTQUFEfB5ytUwdSQQg6JmhKdDH4hOKg1KStprUrBm2BczvJ20VjxjLOuSrQ== +"@abp/timeago@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.3.tgz#f91f0fadf167dbc4cad1311b091ce6664ae02469" + integrity sha512-SAJ66l5OacoD79J0GpfK3KdX+5g+CzoasV2tA8RguQGA9R/CZtki0OZFRRgiKReL8XxNcD7XagwPCuYN8pXT9w== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" timeago "^1.6.7" -"@abp/toastr@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.2.tgz#85c2f9bc9948e489ef2a171a0460ae0a9cc8adf9" - integrity sha512-CCdDOPVtU5qJo7TAaadMtFg1dVq1wXZvgRRCap1ayjZvFAKOJvNjN+IEgpP27lnb/GF5UYMqsiAX8dAA0tmyvw== +"@abp/toastr@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.3.tgz#6a44de32d82fbb18fabd6dd3fe6605f65e3802ae" + integrity sha512-4kza18C05h5v9azP6JvSlCdg0HqMLtdPJUPYqqzsOLWlMrcTQOeTelr+rHB3L7iYGzo8NCx81PBA1tuCDs3M7g== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock index e2ff6d06ff..50b6dc5d87 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.2.tgz#4adf25fe08eb3e46e9195e5edf55890dd3b306c6" - integrity sha512-0CQiSuuauiEGRnX4GwyzY8Dk//0CUGsiw/m/YMx+4ekRGsg0RfheqY5yzx53KxGGGXIwEPwqtePp4OgGLE21uQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-1.0.3.tgz#490ba918cad5052bf580f264b1616ed03e935494" + integrity sha512-+ojuIFfNRMh8B45AoQW01cmqwQvsiSU5cSIbyAZdFhQlJZ/T8mPm9sGz7wvn0RUk/S31/RKFDWTnL70l95Qk1g== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "^1.0.3" -"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.2.tgz#1d64a4b2455335449cdd320c7b7f2d17dcdb6af8" - integrity sha512-0hvTUuXazF4+w8XhctVEwm5itQdgaVbEYIyHibBhW4ItP/NlgSiTxJ4LoSt6NXJZphVuc2K3sY3ZETQgNVH+cQ== - dependencies: - "@abp/aspnetcore.mvc.ui" "^1.0.2" - "@abp/bootstrap" "^1.0.2" - "@abp/bootstrap-datepicker" "^1.0.2" - "@abp/datatables.net-bs4" "^1.0.2" - "@abp/font-awesome" "^1.0.2" - "@abp/jquery-form" "^1.0.2" - "@abp/jquery-validation-unobtrusive" "^1.0.2" - "@abp/lodash" "^1.0.2" - "@abp/luxon" "^1.0.2" - "@abp/malihu-custom-scrollbar-plugin" "^1.0.2" - "@abp/select2" "^1.0.2" - "@abp/sweetalert" "^1.0.2" - "@abp/timeago" "^1.0.2" - "@abp/toastr" "^1.0.2" - -"@abp/aspnetcore.mvc.ui@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.2.tgz#0c227eb46851adf416f189933984670b8d585b38" - integrity sha512-B4g7pqwIAZ0y9NcLpfTmnU/YjGHB80E1tSPLRmOeIQNaOPrIab8BN0HnNekuGIGSgesc9J6VWVuA/+D1vzlyMg== +"@abp/aspnetcore.mvc.ui.theme.shared@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-1.0.3.tgz#dd6e451f4694e191ade48abb2a6431a8ee387fa2" + integrity sha512-5fyEDhuDbjvpnetms/ay3nD1Z/Upsrd6ELShwEgP5X9smbtnJdFsjlFAnFJ1Aiu1h0+/w2uxDCQPXsv/G2hvpA== + dependencies: + "@abp/aspnetcore.mvc.ui" "^1.0.3" + "@abp/bootstrap" "^1.0.3" + "@abp/bootstrap-datepicker" "^1.0.3" + "@abp/datatables.net-bs4" "^1.0.3" + "@abp/font-awesome" "^1.0.3" + "@abp/jquery-form" "^1.0.3" + "@abp/jquery-validation-unobtrusive" "^1.0.3" + "@abp/lodash" "^1.0.3" + "@abp/luxon" "^1.0.3" + "@abp/malihu-custom-scrollbar-plugin" "^1.0.3" + "@abp/select2" "^1.0.3" + "@abp/sweetalert" "^1.0.3" + "@abp/timeago" "^1.0.3" + "@abp/toastr" "^1.0.3" + +"@abp/aspnetcore.mvc.ui@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-1.0.3.tgz#fd0ce62fe783ed1d217415599d602eadb04eff70" + integrity sha512-qPTve11VcyXGqSDhsUSeQZ89KeMaiX8QmcyhGJdW5Ebn84Q3S04v7LHRePG11OudB0LjlSqhWX1pBxoZO8woXw== dependencies: ansi-colors "^3.2.4" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^2.6.3" -"@abp/bootstrap-datepicker@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.2.tgz#36e8ee3d006740d161387c0a0f6a58bae44001ed" - integrity sha512-focQu8S3AIF2roG5zCB4Jvu6bTyReAB2cBAygIf+hVhQzKLQ1gbW8YVvdsyx1oPRN9ZtMoQ/bP91nu+4kXq5SA== +"@abp/bootstrap-datepicker@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-1.0.3.tgz#d33057b3a27416f07ef9b868450e15bed32f3d32" + integrity sha512-ZOwg5I3VGr12xU9XlmJGMrOlwb51Uo+P8FT2c073Vtod2hn0g3n7BAtqgNE8ML2ikEZvazZtspmdk9GlqMzzzQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.2.tgz#be04792c11ca285de03bf8cc60d6c6791dddc886" - integrity sha512-4VP2ZOQSIT9nHRSW4r9odruR8hbq5gsyb6p8W4BEHMU07uwZYhIM9rlyqhz1ZtztIar+IP7NGm+xoNP+eT55Fw== +"@abp/bootstrap@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-1.0.3.tgz#444d5eb5bb3b293f94da9af6c239e408e2147c71" + integrity sha512-7YOUYYwdfsph5i7qeTX1RS92lcunfEAWKnkhbQjQfcjn7YVgUH/Gopi8/Kbm+A9YBgocidK6cOPoAnyYHYYjbg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" bootstrap "^4.3.1" -"@abp/core@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.2.tgz#87799b82ab11bbe625a710d2f9a7022e7aa6f58e" - integrity sha512-jix0I2ocFpi+io74jeOfhfcn6QYgSLLWg8CZzTb7jbs5VbB2ptFERgprKdO2/LtgQRpW6oaSYj1a3l4/e2dPEQ== +"@abp/core@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-1.0.3.tgz#b7fc32a06b7e912c9723e00d957f43d51d87e9e4" + integrity sha512-lCfF9N1WdI5pQyx6XML4GfTYIrlkrxiYQhJFWnjSLPCIbFz+CTPKMKb1GUt3mJDKATKjuq6w4C6Auhg2QVPPGQ== -"@abp/datatables.net-bs4@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.2.tgz#12a71c08c5f371349fcafe9e2cce8abb90f2671f" - integrity sha512-B12dpg8jqoSTNUqr/iXQHov5eeFCeEifKtHesT4KUATWTQYcXawPsJ7cuihBA/+8hEkfixKLu15pMwMXMKVe7Q== +"@abp/datatables.net-bs4@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-1.0.3.tgz#0b0ad9e691dcc2b53934d678c591ea46321d2dea" + integrity sha512-z+quV91z1C1wcBM6m2io3+B2l1tqqRzNU1ILSyNvwYIajqZqmiLmvFjXuST3S1xWY6Hj+jiLDV0Ts085uG1GAw== dependencies: - "@abp/datatables.net" "^1.0.2" + "@abp/datatables.net" "^1.0.3" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.2.tgz#09d4cd06fab61f1cf540d23266d691110632f836" - integrity sha512-opueN1uVt+4crfl0OfhrsNP5hudp3yOO2IDzymyPnjKcvQOnzK6uxgTp0Rr7UiQ2RSHndIzsEy7hw/S15BKpWQ== +"@abp/datatables.net@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-1.0.3.tgz#b887e21d1b5fd84c9a74d18fd473ddc78750cb6d" + integrity sha512-iKl6UJh1qG1XTNpnkzEcS68dvGr3G2y1lMdLN4W+VA8gZeVKNUhY15/bSfg7RAE7GrL8PysIKQmBU+c3F4UTqA== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" datatables.net "^1.10.20" -"@abp/font-awesome@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.2.tgz#75e4b10a1a9e20daf180a27e481ad783b464c986" - integrity sha512-rB5vlAB9wN5O+oEqZGjZTXaTTwxD/c5x1HjLF+87/Y8cqpEdrjhj0u4qTdVZuAy48DO68Wod10hV1DbriaTQeQ== +"@abp/font-awesome@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-1.0.3.tgz#aee86b2533939f1ebab76f8fa0c0353273f7895a" + integrity sha512-bJllzQe+3kt5pwy+DqDF8leq/VTq6OMdndqZe3KMjP6q6CzZecB6Uk1YJqE+LKslp4VpjCbT983uRAR94VgMqw== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.2.tgz#0b289789c84ebae51e4ddf1886fa53637991e4c4" - integrity sha512-GB1+kAkDZT2vNgcyi9fTMtm7RxQolGaOPLRf2DZv8690MGYxxQuH0ugw3m3rDvwcufOhNVEukvDCZu0F0cvbEg== +"@abp/jquery-form@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-1.0.3.tgz#77b665c5b955bd90783529de030ce1b2dcb638c2" + integrity sha512-VHkt5Q4g4/b2zte9FeZJPNTqIFo9MO1/TAbSRNZcRC7w9QfcwpiNH+O2clcDWdieDxPsiAvIEOtpW7NKGnb7uA== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.2.tgz#f6c309ea9f693025ddd8510e68b89198ee8b2a7d" - integrity sha512-aUssKSMLgaUpNtFCtrZh/9Vlfsy6LMXmin/DJ9rwvbgwpn7C4r4fe3OFoV8qZrGHjy3y2nX/LXH9Jq1WVlGvKg== +"@abp/jquery-validation-unobtrusive@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-1.0.3.tgz#fcae4879130204ee5615b5a88b006e2e71b0aa9e" + integrity sha512-bB/os/tyPnGHklCpt57s5dQ+qkx/Nzc8AsgC6TxiSySNM3XKA94Qb22HJp5MUKAZyx7nalAHWkVlv+LrF3Eheg== dependencies: - "@abp/jquery-validation" "^1.0.2" + "@abp/jquery-validation" "^1.0.3" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.2.tgz#68926d3068a540cab012bc47afef724176cd55cb" - integrity sha512-ckjm1GcAeFQKZbf41Pfbr/WnjiWIGDbRos31qVrV718XuBhVlKygrS1yFhlsHj9oTjrBH/gAbpyMAdcQBoZsTQ== +"@abp/jquery-validation@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-1.0.3.tgz#aebf78f97dbd48a077f7f9ab6084d74de10c6884" + integrity sha512-b3xyK2q1Enf02Y3BvHSNWLXhiVGrPZPA2dcNZIMpNM7ukCvPYPzzdxj0v58EwgZ7Z7bFJdA1s+2nL83nbYVKqA== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" jquery-validation "^1.19.1" -"@abp/jquery@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.2.tgz#5d546ed760798e972eb876aac62b354501a30080" - integrity sha512-/0jztB6evW0HIhXwqZ0ny+UIcL25gG1RHw5a6W3FLMeqH9/3KSGMJtUqE9iNf0DWzvicm3E/pQm9m7dw7D0L0g== +"@abp/jquery@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-1.0.3.tgz#fff53c82e3242fcc35ff9c8a0bbb4946405bca2d" + integrity sha512-Lg7q5V4kiTExf9wuMDQk0L4hF0/rDjGk2XYDt59ncorZn+yxhwPSsPQ6ewQFiiyicNTWInk7hNlapPFwx0Rw1A== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" jquery "^3.4.1" -"@abp/lodash@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.2.tgz#bc4392c87e7b0ce61ee14e13f69e469f10fc3ef1" - integrity sha512-mFho9XqJ3vnIqWDiYzV6Nz4Iyr0/WiXdXK/YiuSl0AH6eZgF7+u+TrLcOLgxEjSUQYIwHvjkDkr7knuOzgJ/Xg== +"@abp/lodash@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-1.0.3.tgz#7547d54013000e491ca655ea56b3094cc9bb6f19" + integrity sha512-SxrAjFlon22iVu1hvvfhumtaAX4l4rIXv6DDerCqQDUVhqM76ejp4VTWJMeZcOp7kZY/g4arZ9sFIVJ3EvX5UA== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" lodash "^4.17.15" -"@abp/luxon@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.2.tgz#3b06e8a85b1420b7b59631f01b4bdaf7f40c9b7a" - integrity sha512-5TQaTs+feVfdiO5y94z7/alZoXLNjuJutQPVh8AYpyZC43H7fgJ7WH52BxtMMJGm8d3hbzAPNIxTX940TP3qTg== +"@abp/luxon@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-1.0.3.tgz#7dde8b227852b5de8b57ea76d878c1ec9de892ea" + integrity sha512-cWPpCvc/xrbyEQLcmPOE3IxD6r48ZPfqp9kfRvKdHWWaWVRje78au+yUW2Izn3wkbnHQxQF0RoSIVnsinfNrzQ== dependencies: luxon "^1.17.3" -"@abp/malihu-custom-scrollbar-plugin@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.2.tgz#83269122edc21335044fc8cbca99e9e608f224b5" - integrity sha512-pI12g+ZVlw8PA5u80mut5XOpQEXuUcRnbACwCnKO2TAhpTSecPpXh89lpnLeMPjyxAVGEOVUUBQ9fzHz0dHDTg== +"@abp/malihu-custom-scrollbar-plugin@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-1.0.3.tgz#3488eb8bb543f1d8a678967d428913e30959c731" + integrity sha512-ogXZcXostXW8NubHVZ3fd0DPhiQUIqCpfdeoZ6pTf2rREcYEmUGmXtTakxd86xFe/EE/8izauSUHusn5RhwiRg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.2.tgz#4c467e9dcab3527bf930de22d7ee035acc73bab4" - integrity sha512-D9HnPATPZU0HsFur2NL9J0KQB0N0/6/PatdjQ53IphCW3TCAeaeYA1allsVPrCbWFU9e/c5+N26h5XMAHQHSrw== +"@abp/select2@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-1.0.3.tgz#5b1aff33c463d22176fbe2ff390446f510c53256" + integrity sha512-Q1mIEQHi54P4rqLOM+qTKFd7CWNudrv4Yh7gZkqVc033lCeJUA06v/AaCV6hNmUaCIYAOnsEDIMmPCGytVfkWg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" select2 "^4.0.11" -"@abp/sweetalert@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.2.tgz#56815807817e9dba238c319dcac70276a034ecf7" - integrity sha512-2b6kAwT7vf8ztcni684rpcQbFmeTcKecd+PXnUUwXgbKwrhTO8bQCfHe47/XLLdiBVX9n1V6Ks0Jy60pOs9+5Q== +"@abp/sweetalert@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-1.0.3.tgz#1421f9e57ea4f26b9484b91c61c8bb2380a11bb8" + integrity sha512-7NHD71g4kcUpdylERaoeaY6xhcgfy1kS8njEKiHtPucG8e9FpEGzbuM/A+uifqVuM5drdsrqjWutdfJerlKqDg== dependencies: - "@abp/core" "^1.0.2" + "@abp/core" "^1.0.3" sweetalert "^2.1.2" -"@abp/timeago@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.2.tgz#00ab715ab9042fcf8e5835f67041f388b45cc925" - integrity sha512-h4FmxlI/kv/wr8vrPgB9+d1RAE4WTQUFEfB5ytUwdSQQg6JmhKdDH4hOKg1KStprUrBm2BczvJ20VjxjLOuSrQ== +"@abp/timeago@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-1.0.3.tgz#f91f0fadf167dbc4cad1311b091ce6664ae02469" + integrity sha512-SAJ66l5OacoD79J0GpfK3KdX+5g+CzoasV2tA8RguQGA9R/CZtki0OZFRRgiKReL8XxNcD7XagwPCuYN8pXT9w== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" timeago "^1.6.7" -"@abp/toastr@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.2.tgz#85c2f9bc9948e489ef2a171a0460ae0a9cc8adf9" - integrity sha512-CCdDOPVtU5qJo7TAaadMtFg1dVq1wXZvgRRCap1ayjZvFAKOJvNjN+IEgpP27lnb/GF5UYMqsiAX8dAA0tmyvw== +"@abp/toastr@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-1.0.3.tgz#6a44de32d82fbb18fabd6dd3fe6605f65e3802ae" + integrity sha512-4kza18C05h5v9azP6JvSlCdg0HqMLtdPJUPYqqzsOLWlMrcTQOeTelr+rHB3L7iYGzo8NCx81PBA1tuCDs3M7g== dependencies: - "@abp/jquery" "^1.0.2" + "@abp/jquery" "^1.0.3" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": From 15e51aea7e6668739a71e968cd228a71f77677ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 27 Nov 2019 15:41:50 +0300 Subject: [PATCH 2/7] Recreate the initial migration --- ....cs => 20191127123650_Initial.Designer.cs} | 346 +++++++++++++----- ...5_Initial.cs => 20191127123650_Initial.cs} | 3 +- .../UnifiedDbContextModelSnapshot.cs | 344 ++++++++++++----- 3 files changed, 492 insertions(+), 201 deletions(-) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/{20190527144415_Initial.Designer.cs => 20191127123650_Initial.Designer.cs} (59%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/{20190527144415_Initial.cs => 20191127123650_Initial.cs} (99%) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.Designer.cs similarity index 59% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.Designer.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.Designer.cs index 124d07b6ea..4a9904eeec 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.Designer.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.Designer.cs @@ -10,91 +10,113 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(UnifiedDbContext))] - [Migration("20190527144415_Initial")] + [Migration("20191127123650_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") + .HasAnnotation("ProductVersion", "3.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ApplicationName") .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") .HasMaxLength(96); b.Property("BrowserInfo") .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("ClientId") .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ClientIpAddress") .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ClientName") .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("Comments") .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("ConcurrencyStamp"); + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CorrelationId") .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Exceptions") .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") .HasMaxLength(4000); b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); - b.Property("ExecutionTime"); + b.Property("ExecutionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("HttpMethod") .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") .HasMaxLength(16); b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantName"); + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); b.Property("Url") .HasColumnName("Url") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("UserId") - .HasColumnName("UserId"); + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); b.Property("UserName") .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.HasKey("Id"); @@ -109,33 +131,42 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AuditLogId") - .HasColumnName("AuditLogId"); + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("MethodName") .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("Parameters") .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") .HasMaxLength(2000); b.Property("ServiceName") .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -149,34 +180,43 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AuditLogId") - .HasColumnName("AuditLogId"); + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); b.Property("ChangeTime") - .HasColumnName("ChangeTime"); + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); b.Property("ChangeType") - .HasColumnName("ChangeType"); + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); b.Property("EntityId") .IsRequired() .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("EntityTenantId"); + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); b.Property("EntityTypeFullName") .IsRequired() .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -190,29 +230,36 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); - b.Property("EntityChangeId"); + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); b.Property("NewValue") .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("OriginalValue") .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("PropertyName") .IsRequired() .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("PropertyTypeFullName") .IsRequired() .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -224,35 +271,45 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Description") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); - b.Property("IsStatic"); + b.Property("IsStatic") + .HasColumnType("bit"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Regex") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("Required"); + b.Property("Required") + .HasColumnType("bit"); - b.Property("ValueType"); + b.Property("ValueType") + .HasColumnType("int"); b.HasKey("Id"); @@ -262,35 +319,44 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDefault") - .HasColumnName("IsDefault"); + .HasColumnName("IsDefault") + .HasColumnType("bit"); b.Property("IsPublic") - .HasColumnName("IsPublic"); + .HasColumnName("IsPublic") + .HasColumnType("bit"); b.Property("IsStatic") - .HasColumnName("IsStatic"); + .HasColumnName("IsStatic") + .HasColumnType("bit"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("NormalizedName") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -302,18 +368,22 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .HasColumnType("uniqueidentifier"); b.Property("ClaimType") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); - b.Property("RoleId"); + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -325,105 +395,131 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AccessFailedCount") .ValueGeneratedOnAdd() .HasColumnName("AccessFailedCount") + .HasColumnType("int") .HasDefaultValue(0); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("Email") .HasColumnName("Email") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("EmailConfirmed") .ValueGeneratedOnAdd() .HasColumnName("EmailConfirmed") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("LockoutEnabled") .ValueGeneratedOnAdd() .HasColumnName("LockoutEnabled") + .HasColumnType("bit") .HasDefaultValue(false); - b.Property("LockoutEnd"); + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); b.Property("Name") .HasColumnName("Name") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("NormalizedEmail") .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("NormalizedUserName") .IsRequired() .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("PasswordHash") .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("PhoneNumber") .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") .HasMaxLength(16); b.Property("PhoneNumberConfirmed") .ValueGeneratedOnAdd() .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("SecurityStamp") .IsRequired() .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Surname") .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); b.Property("TwoFactorEnabled") .ValueGeneratedOnAdd() .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("UserName") .IsRequired() .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.HasKey("Id"); @@ -442,18 +538,22 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .HasColumnType("uniqueidentifier"); b.Property("ClaimType") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -464,19 +564,24 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") .IsRequired() + .HasColumnType("nvarchar(196)") .HasMaxLength(196); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("UserId", "LoginProvider"); @@ -487,11 +592,14 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); - b.Property("RoleId"); + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("UserId", "RoleId"); @@ -502,17 +610,22 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Name") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("Value"); + b.Property("Value") + .HasColumnType("nvarchar(max)"); b.HasKey("UserId", "LoginProvider", "Name"); @@ -522,21 +635,26 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderName") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -548,20 +666,25 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderName") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Value") .IsRequired() + .HasColumnType("nvarchar(2048)") .HasMaxLength(2048); b.HasKey("Id"); @@ -574,59 +697,72 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.HasKey("Id"); - b.HasIndex("Name") - .IsUnique(); + b.HasIndex("Name"); b.ToTable("AbpTenants"); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => { - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.Property("Name") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Value") .IsRequired() + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); b.HasKey("TenantId", "Name"); @@ -636,79 +772,89 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) .WithMany("Actions") .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) .WithMany("EntityChanges") .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) .WithMany("PropertyChanges") .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => { - b.HasOne("Volo.Abp.Identity.IdentityRole") + b.HasOne("Volo.Abp.Identity.IdentityRole", null) .WithMany("Claims") .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Claims") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Logins") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => { - b.HasOne("Volo.Abp.Identity.IdentityRole") + b.HasOne("Volo.Abp.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Roles") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Tokens") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => { - b.HasOne("Volo.Abp.TenantManagement.Tenant") + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) .WithMany("ConnectionStrings") .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); #pragma warning restore 612, 618 } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.cs index a26ba15068..8e851efc0a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20190527144415_Initial.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20191127123650_Initial.cs @@ -424,8 +424,7 @@ namespace MyCompanyName.MyProjectName.Migrations migrationBuilder.CreateIndex( name: "IX_AbpTenants_Name", table: "AbpTenants", - column: "Name", - unique: true); + column: "Name"); migrationBuilder.CreateIndex( name: "IX_AbpUserClaims_UserId", diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs index a17183eb3b..dfdc590b6f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs @@ -15,84 +15,106 @@ namespace MyCompanyName.MyProjectName.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") + .HasAnnotation("ProductVersion", "3.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ApplicationName") .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") .HasMaxLength(96); b.Property("BrowserInfo") .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("ClientId") .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ClientIpAddress") .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ClientName") .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("Comments") .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("ConcurrencyStamp"); + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CorrelationId") .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Exceptions") .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") .HasMaxLength(4000); b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); - b.Property("ExecutionTime"); + b.Property("ExecutionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("HttpMethod") .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") .HasMaxLength(16); b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantName"); + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); b.Property("Url") .HasColumnName("Url") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("UserId") - .HasColumnName("UserId"); + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); b.Property("UserName") .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.HasKey("Id"); @@ -107,33 +129,42 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AuditLogId") - .HasColumnName("AuditLogId"); + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("MethodName") .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("Parameters") .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") .HasMaxLength(2000); b.Property("ServiceName") .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -147,34 +178,43 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AuditLogId") - .HasColumnName("AuditLogId"); + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); b.Property("ChangeTime") - .HasColumnName("ChangeTime"); + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); b.Property("ChangeType") - .HasColumnName("ChangeType"); + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); b.Property("EntityId") .IsRequired() .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("EntityTenantId"); + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); b.Property("EntityTypeFullName") .IsRequired() .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -188,29 +228,36 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); - b.Property("EntityChangeId"); + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); b.Property("NewValue") .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("OriginalValue") .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("PropertyName") .IsRequired() .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("PropertyTypeFullName") .IsRequired() .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -222,35 +269,45 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Description") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); - b.Property("IsStatic"); + b.Property("IsStatic") + .HasColumnType("bit"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Regex") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("Required"); + b.Property("Required") + .HasColumnType("bit"); - b.Property("ValueType"); + b.Property("ValueType") + .HasColumnType("int"); b.HasKey("Id"); @@ -260,35 +317,44 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDefault") - .HasColumnName("IsDefault"); + .HasColumnName("IsDefault") + .HasColumnType("bit"); b.Property("IsPublic") - .HasColumnName("IsPublic"); + .HasColumnName("IsPublic") + .HasColumnType("bit"); b.Property("IsStatic") - .HasColumnName("IsStatic"); + .HasColumnName("IsStatic") + .HasColumnType("bit"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("NormalizedName") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -300,18 +366,22 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .HasColumnType("uniqueidentifier"); b.Property("ClaimType") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); - b.Property("RoleId"); + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -323,105 +393,131 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AccessFailedCount") .ValueGeneratedOnAdd() .HasColumnName("AccessFailedCount") + .HasColumnType("int") .HasDefaultValue(0); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("Email") .HasColumnName("Email") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("EmailConfirmed") .ValueGeneratedOnAdd() .HasColumnName("EmailConfirmed") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("LockoutEnabled") .ValueGeneratedOnAdd() .HasColumnName("LockoutEnabled") + .HasColumnType("bit") .HasDefaultValue(false); - b.Property("LockoutEnd"); + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); b.Property("Name") .HasColumnName("Name") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("NormalizedEmail") .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("NormalizedUserName") .IsRequired() .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("PasswordHash") .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("PhoneNumber") .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") .HasMaxLength(16); b.Property("PhoneNumberConfirmed") .ValueGeneratedOnAdd() .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("SecurityStamp") .IsRequired() .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Surname") .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); b.Property("TwoFactorEnabled") .ValueGeneratedOnAdd() .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("UserName") .IsRequired() .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.HasKey("Id"); @@ -440,18 +536,22 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .HasColumnType("uniqueidentifier"); b.Property("ClaimType") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -462,19 +562,24 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") .IsRequired() + .HasColumnType("nvarchar(196)") .HasMaxLength(196); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("UserId", "LoginProvider"); @@ -485,11 +590,14 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); - b.Property("RoleId"); + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("UserId", "RoleId"); @@ -500,17 +608,22 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Name") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("Value"); + b.Property("Value") + .HasColumnType("nvarchar(max)"); b.HasKey("UserId", "LoginProvider", "Name"); @@ -520,21 +633,26 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderName") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -546,20 +664,25 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderName") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Value") .IsRequired() + .HasColumnType("nvarchar(2048)") .HasMaxLength(2048); b.HasKey("Id"); @@ -572,59 +695,72 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.HasKey("Id"); - b.HasIndex("Name") - .IsUnique(); + b.HasIndex("Name"); b.ToTable("AbpTenants"); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => { - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.Property("Name") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Value") .IsRequired() + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); b.HasKey("TenantId", "Name"); @@ -634,79 +770,89 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) .WithMany("Actions") .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) .WithMany("EntityChanges") .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) .WithMany("PropertyChanges") .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => { - b.HasOne("Volo.Abp.Identity.IdentityRole") + b.HasOne("Volo.Abp.Identity.IdentityRole", null) .WithMany("Claims") .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Claims") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Logins") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => { - b.HasOne("Volo.Abp.Identity.IdentityRole") + b.HasOne("Volo.Abp.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Roles") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Tokens") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => { - b.HasOne("Volo.Abp.TenantManagement.Tenant") + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) .WithMany("ConnectionStrings") .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); #pragma warning restore 612, 618 } From c90366ab05ef98f7b04308e951d3869fa1a59848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 27 Nov 2019 15:55:05 +0300 Subject: [PATCH 3/7] Should completely hide the tenant switch area if multi-tenancy is not enabled --- .../Themes/Basic/Layouts/Account.cshtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index 7b43c6d969..13d438441d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -53,11 +53,14 @@
+ @if (MultiTenancyOptions.Value.IsEnabled && + (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true)) + {
- @MultiTenancyStringLocalizer["Tenant"]
+ @MultiTenancyStringLocalizer["Tenant"]
@if (CurrentTenant.Id == null) { @@ -72,15 +75,12 @@
- @if (MultiTenancyOptions.Value.IsEnabled && - (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true)) - { - @MultiTenancyStringLocalizer["Switch"] - } + @MultiTenancyStringLocalizer["Switch"]
-
+
+ } @(await Component.InvokeAsync()) @RenderBody() From 21fe6656f54189e2420044dfc5e64151bf22b261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 27 Nov 2019 15:55:36 +0300 Subject: [PATCH 4/7] Recreate the migration. --- ....Designer.cs => 20191127124541_Initial.Designer.cs} | 5 ++--- ...1018080944_Initial.cs => 20191127124541_Initial.cs} | 3 +-- ...entityServerHostMigrationsDbContextModelSnapshot.cs | 3 +-- .../MyCompanyName.MyProjectName.IdentityServer.csproj | 2 +- .../MyProjectNameIdentityServerModule.cs | 10 ++++++++-- 5 files changed, 13 insertions(+), 10 deletions(-) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/{20191018080944_Initial.Designer.cs => 20191127124541_Initial.Designer.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/{20191018080944_Initial.cs => 20191127124541_Initial.cs} (99%) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.Designer.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.Designer.cs index 3869a52615..0733f562cd 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.Designer.cs @@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(IdentityServerHostMigrationsDbContext))] - [Migration("20191018080944_Initial")] + [Migration("20191127124541_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1367,8 +1367,7 @@ namespace MyCompanyName.MyProjectName.Migrations b.HasKey("Id"); - b.HasIndex("Name") - .IsUnique(); + b.HasIndex("Name"); b.ToTable("AbpTenants"); }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.cs index cba4297cc9..217c00a646 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191127124541_Initial.cs @@ -820,8 +820,7 @@ namespace MyCompanyName.MyProjectName.Migrations migrationBuilder.CreateIndex( name: "IX_AbpTenants_Name", table: "AbpTenants", - column: "Name", - unique: true); + column: "Name"); migrationBuilder.CreateIndex( name: "IX_AbpUserClaims_UserId", diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs index e4036868a3..7e25b0e36a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs @@ -1365,8 +1365,7 @@ namespace MyCompanyName.MyProjectName.Migrations b.HasKey("Id"); - b.HasIndex("Name") - .IsUnique(); + b.HasIndex("Name"); b.ToTable("AbpTenants"); }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index ff138edc82..31287c43cd 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -17,7 +17,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 7179db5d08..541c7b8c07 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -10,8 +10,8 @@ using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Authentication.JwtBearer; -using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.Auditing; using Volo.Abp.AuditLogging.EntityFrameworkCore; @@ -26,6 +26,7 @@ using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.IdentityServer.EntityFrameworkCore; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.HttpApi; @@ -40,7 +41,7 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(AbpAccountWebIdentityServerModule), - typeof(AbpAspNetCoreMultiTenancyModule), + typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(AbpAspNetCoreMvcModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), @@ -115,6 +116,11 @@ namespace MyCompanyName.MyProjectName options.KeyPrefix = "MyProjectName:"; }); + Configure(options => + { + options.IsEnabled = MultiTenancyConsts.IsEnabled; + }); + context.Services.AddStackExchangeRedisCache(options => { options.Configuration = configuration["Redis:Configuration"]; From 8a18186341277c90f8ed72993838cb47550ad6d1 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 27 Nov 2019 16:19:57 +0300 Subject: [PATCH 5/7] update command solution directory option --- .../Volo/Abp/Cli/Commands/UpdateCommand.cs | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 0f31af2eb0..a1775bb987 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -44,31 +44,37 @@ namespace Volo.Abp.Cli.Commands var updateNpm = commandLineArgs.Options.ContainsKey(Options.Packages.Npm); var updateNuget = commandLineArgs.Options.ContainsKey(Options.Packages.NuGet); + var directory = commandLineArgs.Options.GetOrNull(Options.SolutionPath.Short, Options.SolutionPath.Long); + if (directory == null) + { + directory = Directory.GetCurrentDirectory(); + } + var both = (updateNuget && updateNpm) || (!updateNuget && !updateNpm); if (updateNuget || both) { - await UpdateNugetPackages(commandLineArgs); + await UpdateNugetPackages(commandLineArgs, directory); } if (updateNpm || both) { - UpdateNpmPackages(); + UpdateNpmPackages(directory); } } - private void UpdateNpmPackages() + private void UpdateNpmPackages(string directory) { - _npmPackagesUpdater.Update(Directory.GetCurrentDirectory()); + _npmPackagesUpdater.Update(directory); } - private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs) + private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string directory) { var includePreviews = commandLineArgs.Options.GetOrNull(Options.IncludePreviews.Short, Options.IncludePreviews.Long) != null; - var solution = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln").FirstOrDefault(); + var solution = Directory.GetFiles(directory, "*.sln").FirstOrDefault(); if (solution != null) { @@ -131,6 +137,12 @@ namespace Volo.Abp.Cli.Commands public static class Options { + public static class SolutionPath + { + public const string Short = "sp"; + public const string Long = "solution-path"; + } + public static class IncludePreviews { public const string Short = "p"; From 4c1e4a323d24493e4e90f9410662d2c01e7cabc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 27 Nov 2019 16:21:28 +0300 Subject: [PATCH 6/7] Enable cors --- .../angular/src/environments/environment.ts | 4 +-- ...panyName.MyProjectName.HttpApi.Host.csproj | 2 +- .../MyProjectNameHttpApiHostModule.cs | 30 +++++++++++++++++-- .../appsettings.json | 3 ++ .../MyProjectNameIdentityServerModule.cs | 29 ++++++++++++++++-- .../appsettings.json | 4 +++ .../MyProjectNameWebHostModule.cs | 2 +- .../appsettings.json | 4 ++- 8 files changed, 69 insertions(+), 9 deletions(-) diff --git a/templates/module/angular/src/environments/environment.ts b/templates/module/angular/src/environments/environment.ts index ca462ff043..70beceec1a 100644 --- a/templates/module/angular/src/environments/environment.ts +++ b/templates/module/angular/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { logoUrl: '', }, oAuthConfig: { - issuer: 'https://localhost:44305', + issuer: 'https://localhost:44301', clientId: 'MyProjectName_App', dummyClientSecret: '1q2w3e*', scope: 'MyProjectName', @@ -16,7 +16,7 @@ export const environment = { }, apis: { default: { - url: 'https://localhost:44305', + url: 'https://localhost:44300', }, }, localization: { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 26fa1648c0..919353fe37 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 74edbc03a3..b0fcc5f9b6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -1,5 +1,8 @@ -using System.IO; +using System; +using System.IO; +using System.Linq; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -10,6 +13,7 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; +using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.Autofac; using Volo.Abp.Caching; @@ -28,7 +32,7 @@ namespace MyCompanyName.MyProjectName typeof(MyProjectNameApplicationModule), typeof(MyProjectNameEntityFrameworkCoreModule), typeof(MyProjectNameHttpApiModule), - typeof(AbpAspNetCoreMultiTenancyModule), + typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(AbpAutofacModule), typeof(AbpEntityFrameworkCoreSqlServerModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), @@ -37,6 +41,8 @@ namespace MyCompanyName.MyProjectName )] public class MyProjectNameHttpApiHostModule : AbpModule { + private const string DefaultCorsPolicyName = "Default"; + public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); @@ -105,6 +111,25 @@ namespace MyCompanyName.MyProjectName .AddDataProtection() .PersistKeysToStackExchangeRedis(redis, "MyProjectName-Protection-Keys"); } + + context.Services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); } public override void OnApplicationInitialization(ApplicationInitializationContext context) @@ -119,6 +144,7 @@ namespace MyCompanyName.MyProjectName app.UseCorrelationId(); app.UseVirtualFiles(); app.UseRouting(); + app.UseCors(DefaultCorsPolicyName); app.UseAuthentication(); app.UseAuthorization(); if (MultiTenancyConsts.IsEnabled) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json index 6a2d586b0e..6dceb9c4b9 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json @@ -1,4 +1,7 @@ { + "App": { + "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200" + }, "ConnectionStrings": { "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true", "MyProjectName": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Module;Trusted_Connection=True;MultipleActiveResultSets=true" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 541c7b8c07..76d930d7ea 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -1,4 +1,7 @@ -using Microsoft.AspNetCore.Builder; +using System; +using System.Linq; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -65,6 +68,8 @@ namespace MyCompanyName.MyProjectName )] public class MyProjectNameIdentityServerModule : AbpModule { + private const string DefaultCorsPolicyName = "Default"; + public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); @@ -100,7 +105,7 @@ namespace MyCompanyName.MyProjectName Configure(options => { - options.Applications["MVC"].RootUrl = configuration["AppSelfUrl"]; + options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; }); context.Services.AddAuthentication() @@ -133,6 +138,25 @@ namespace MyCompanyName.MyProjectName .AddDataProtection() .PersistKeysToStackExchangeRedis(redis, "MyProjectName-Protection-Keys"); } + + context.Services.AddCors(options => + { + options.AddPolicy(DefaultCorsPolicyName, builder => + { + builder + .WithOrigins( + configuration["App:CorsOrigins"] + .Split(",", StringSplitOptions.RemoveEmptyEntries) + .Select(o => o.RemovePostFix("/")) + .ToArray() + ) + .WithAbpExposedHeaders() + .SetIsOriginAllowedToAllowWildcardSubdomains() + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); } public override void OnApplicationInitialization(ApplicationInitializationContext context) @@ -147,6 +171,7 @@ namespace MyCompanyName.MyProjectName app.UseCorrelationId(); app.UseVirtualFiles(); app.UseRouting(); + app.UseCors(DefaultCorsPolicyName); app.UseAuthentication(); app.UseJwtTokenMiddleware(); if (MultiTenancyConsts.IsEnabled) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json index ea636d00ad..0386db1e6a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -1,4 +1,8 @@ { + "App": { + "SelfUrl": "https://localhost:44301/", + "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200" + }, "AppSelfUrl": "https://localhost:44301/", "ConnectionStrings": { "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 6438758c3e..6eb3dc9ea3 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -98,7 +98,7 @@ namespace MyCompanyName.MyProjectName { Configure(options => { - options.Applications["MVC"].RootUrl = configuration["AppSelfUrl"]; + options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; }); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json index 96a98545b1..22405a15b6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/appsettings.json @@ -1,5 +1,7 @@ { - "AppSelfUrl": "https://localhost:44302/", + "App": { + "SelfUrl": "https://localhost:44302/" + }, "RemoteServices": { "Default": { "BaseUrl": "https://localhost:44301/" From 83a87460e2af2988aeda1d38e6cc1509d0486c19 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 27 Nov 2019 16:23:44 +0300 Subject: [PATCH 7/7] Update labeler.yml --- .github/workflows/labeler.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 9f4887a3e0..e70e966d4a 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,6 +1,10 @@ name: "Pull Request Labeler" on: pull_request: + paths: + - npm/ng-packs/**/* + - templates/app/angular/**/* + - templates/module/angular/**/* branches: - master - dev