diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4a993352ba..9553177c82 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@master with: - dotnet-version: 6.0.100 + dotnet-version: 7.0.100-rc.2.22477.23 - name: Build All run: .\build-all.ps1 -f diff --git a/Directory.Build.props b/Directory.Build.props index 03538ef037..ce8c79f366 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,13 +2,13 @@ - 6.0.5 + 7.0.0-rc.2.* - 6.0.5 + 7.0.0-rc.2.* - 6.0.0 + 7.0.0-rc.2.* 17.2.0 diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index 5db5ba6e27..134d592df9 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -220,6 +220,7 @@ "SuccessfullyReIndexAllPosts": "All posts have been successfully reindexed.", "Permission:FullSearch": "Full text search", "Menu:CliAnalytics": "Cli Analytics", + "Menu:Reports": "Reports", "TemplateName": "Template name", "TemplateVersion": "Template version", "DatabaseProvider": "Database provider", @@ -231,8 +232,10 @@ "UiFramework": "Ui framework", "Options": "Options", "CliAnalytics": "Cli Analytics", + "Reports": "Reports", "Permission:CliAnalyticses": "Cli Analyticses", "Permission:CliAnalytics": "Cli Analytics", + "Permission:Reports": "Reports", "Search": "Search", "ClearFilter": "Clear filter", "LicensePrivateKey": "License private key", @@ -400,6 +403,7 @@ "Deleted{0}": "[Deleted {0}]", "Tags": "Tags", "SetTagsInfo": "Tags should be comma-separated. Eg: CSharp, Entity Framework", - "RejectTrialLicenseWarningMessage": "Are you sure you want to reject this trial license request?" + "RejectTrialLicenseWarningMessage": "Are you sure you want to reject this trial license request?", + "ExportToExcel": "Export to Excel" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json index c7b91a99a0..8d0bc57286 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json @@ -179,7 +179,7 @@ "ChangingLicenseTypeExplanation": "يمكنك الترقية إلى ترخيص أعلى عن طريق دفع الفرق خلال فترة الترخيص النشطة الخاصة بك. عند الترقية إلى خطة ترخيص أعلى ، تحصل على مزايا الخطة الجديدة ، لكن ترقية الترخيص لا تغير تاريخ انتهاء الترخيص. بالإضافة إلى ذلك ، يمكنك أيضًا إضافة مقاعد مطور جديدة إلى ترخيصك الحالي ، راجع \"كم عدد المطورين الذين يمكنهم العمل على ABP Commercial؟\"", "LicenseExtendUpgradeDiff": "ما الفرق بين تمديد الترخيص والترقية؟", "LicenseRenewalCost": "ما هي تكلفة تجديد الترخيص بعد عام واحد؟", - "LicenseRenewalCostExplanation": "معدل التجديد (التمديد) لجميع تراخيص ABP Commercial الدائمة هو {0} من قائمة أسعار التراخيص. سعر تجديد ترخيص الفريق القياسي هو $ {1} ورخصة العمل القياسية هي $ {2} وترخيص المؤسسة القياسي هو $ {3}. إذا كنت عميلاً بالفعل ، سجّل الدخول إلى حسابك لمراجعة أسعار التجديد المتاحة.", + "LicenseRenewalCostExplanation": "سعر تجديد (تمديد) رخصة الفريق الاساسية هو ${0}, رخصة العمل الاساسية هو ${1} ورخصة المؤسسة الاساسية هو${2}. ان كنت عميلا بالفعل, سجل الدخول الى حسابك لمراجعة سعر التجديد الحالي.", "HowDoIRenewMyLicense": "كيف أجدد الترخيص الخاص بي؟", "HowDoIRenewMyLicenseExplanation": "يمكنك تجديد ترخيصك بالانتقال إلى صفحة إدارة المؤسسة . للاستفادة من أسعار التجديد المبكر المخفضة الخاصة بنا ، تأكد من التجديد قبل انتهاء صلاحية ترخيصك. ومع ذلك ، لا تقلق بشأن عدم معرفة متى تنتهي فرصة التجديد المبكر الخاصة بك. ستتلقى 3 رسائل بريد إلكتروني للتذكير قبل انتهاء صلاحية اشتراكك. سنرسلها في غضون 30 يومًا و 7 أيام ويوم واحد قبل انتهاء الصلاحية.", "IsSourceCodeIncluded": "هل يتضمن ترخيصي الكود المصدري للوحدات والموضوعات التجارية؟", @@ -360,7 +360,7 @@ "Next": "التالي", "StartTrial": "ابدأ الإصدار التجريبي المجاني", "ContactUsIssues": "اتصل بنا إذا كان لديك أي مشاكل", - "TrialActivatedWarning": "عزيزي {0} ، يحق للمستخدم الحصول على فترة تجريبية مجانية واحدة فقط. لقد استخدمت بالفعل الفترة التجريبية الخاصة بك.", + "TrialActivatedWarning": ".يحق للمستخدم الحصول على فترة تجريبية مجانية واحدة فقط. لقد استخدمت بالفعل الفترة التجريبية الخاصة بك", "SaveAndDownload": "حفظ وتنزيل", "CompanyNameValidationMessage": "اسم الشركة طويل جدا!", "AddressValidationMessage": "العنوان طويل جدا!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "أحد الحقول التالية غير صالح: اسم البلد أو حجم الشركة أو الصناعة أو الغرض من الاستخدام.", "Trial": "محاكمة", "Purchased": "تم شراؤها", - "PurchaseLicense": "رخصة شراء", + "PurchaseLicense": "شراء {0} رخصة", "PurchaseTrialLicenseMessage": "تاريخ انتهاء الترخيص الخاص بك هو {0}.
إذا كنت ترغب في الاستمرار في استخدام المشاريع التي أنشأتها أثناء الفترة التجريبية المجانية ، فأنت بحاجة إلى تغيير مفاتيح الترخيص في ملفات appsettings.secrets.json الخاصة بك. هنا هو مفتاح الترخيص الخاص بك:", "TrialLicenseExpireMessage": "أنت تستخدم الترخيص التجريبي وستنتهي صلاحية الترخيص التجريبي في {0}.", "TryForFree": "حاول مجانا", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/cs.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/cs.json index e6bd74a250..e570d8e924 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/cs.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/cs.json @@ -360,7 +360,7 @@ "Next": "další", "StartTrial": "Spusťte bezplatnou zkušební verzi", "ContactUsIssues": "Pokud máte nějaké problémy, kontaktujte nás", - "TrialActivatedWarning": "Vážený uživateli {0}, uživatel má nárok pouze na 1 bezplatné zkušební období. Zkušební období jste již využili.", + "TrialActivatedWarning": "Uživatel má nárok pouze na 1 bezplatné zkušební období. Zkušební období jste již využili.", "SaveAndDownload": "Uložit a stáhnout", "CompanyNameValidationMessage": "Název společnosti je příliš dlouhý!", "AddressValidationMessage": "Adresa je příliš dlouhá!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Jedno z následujících polí je neplatné: Název země, Velikost společnosti, Odvětví nebo Účel použití.", "Trial": "zkušební", "Purchased": "Zakoupeno", - "PurchaseLicense": "Koupit licenci", + "PurchaseLicense": "Zakoupit licenci {0}", "PurchaseTrialLicenseMessage": "Datum vypršení platnosti vaší licence je {0}.
Chcete-li nadále používat projekty, které jste vytvořili během bezplatného zkušebního období, musíte změnit licenční klíče ve svých souborech appsettings.secrets.json. Zde je váš licenční klíč:", "TrialLicenseExpireMessage": "Používáte zkušební licenci a platnost vaší zkušební licence vyprší dne {0}.", "TryForFree": "Zkus zadarmo", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de-DE.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de-DE.json index 80383fdde6..005a998c69 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de-DE.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de-DE.json @@ -360,7 +360,7 @@ "Next": "Nächste", "StartTrial": "Starten Sie meine kostenlose Testversion", "ContactUsIssues": "Kontaktieren Sie uns, wenn Sie irgendwelche Probleme haben", - "TrialActivatedWarning": "Sehr geehrte(r) {0}, ein Nutzer hat nur 1 kostenlosen Testzeitraum. Sie haben Ihren Testzeitraum bereits genutzt.", + "TrialActivatedWarning": "Ein Benutzer hat nur Anspruch auf 1 kostenlose Testphase. Sie haben Ihre Testphase bereits genutzt.", "SaveAndDownload": "Speichern und herunterladen", "CompanyNameValidationMessage": "Firmenname ist zu lang!", "AddressValidationMessage": "Adresse ist zu lang!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Eines der folgenden Felder ist ungültig: Ländername, Unternehmensgröße, Branche oder Verwendungszweck.", "Trial": "Versuch", "Purchased": "Gekauft", - "PurchaseLicense": "Lizenz kaufen", + "PurchaseLicense": "Kaufe {0} Lizenz", "PurchaseTrialLicenseMessage": "Das Ablaufdatum Ihrer Lizenz ist {0}.
Wenn Sie die Projekte, die Sie während Ihres kostenlosen Testzeitraums erstellt haben, weiterhin verwenden möchten, müssen Sie die Lizenzschlüssel in Ihren appsettings.secrets.json-Dateien ändern. Hier ist Ihr Lizenzschlüssel:", "TrialLicenseExpireMessage": "Sie verwenden die Testlizenz und Ihre Testlizenz läuft am {0} ab.", "TryForFree": "Kostenlos testen", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index a507108c1d..1c10aebd66 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -749,6 +749,11 @@ "BlazoriseLicenseExplanation": "We have an agreement between Volosoft and Megabit, with this agreement Blazorise license is bundled with ABP Commercial products therefore our customers do not need to purchase an extra Blazorise license.", "ExtendPaymentInfoSection_DeveloperPrice": "{0} x Developer(s) Price", "ExtendPaymentInfoSection_DiscountRate": "Discount {0}%", - "TotalNetPrice": "Total Net Price" + "TotalNetPrice": "Total Net Price", + "EFCore": "Entity Framework Core", + "All": "All", + "Mvc": "MVC", + "DataBaseProvider": "Data Provider", + "UIFramework": "UI Framework" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/es.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/es.json index 1b0e6b6355..25cde69859 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/es.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/es.json @@ -360,7 +360,7 @@ "Next": "próximo", "StartTrial": "Iniciar mi prueba gratuita", "ContactUsIssues": "Contáctanos si tienes algún problema", - "TrialActivatedWarning": "Estimado {0}, un usuario tiene derecho a tener solo 1 período de prueba gratuito. Ya usaste tu período de prueba.", + "TrialActivatedWarning": "Un usuario tiene derecho a tener solo 1 período de prueba gratuito. Ya utilizó su período de prueba.", "SaveAndDownload": "Guardar y descargar", "CompanyNameValidationMessage": "¡El nombre de la empresa es demasiado largo!", "AddressValidationMessage": "¡La dirección es demasiado larga!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Uno de los siguientes campos no es válido: nombre del país, tamaño de la empresa, sector o finalidad de uso.", "Trial": "Prueba", "Purchased": "Comprado", - "PurchaseLicense": "Licencia de compra", + "PurchaseLicense": "Comprar {0} licencia", "PurchaseTrialLicenseMessage": "La fecha de vencimiento de su licencia es {0}.
Si desea continuar usando los proyectos que creó durante su período de prueba gratuito, debe cambiar las claves de licencia en sus archivos appsettings.secrets.json . Aquí está su clave de licencia:", "TrialLicenseExpireMessage": "Está utilizando la licencia de prueba y su licencia de prueba caducará el {0}.", "TryForFree": "Prueba gratis", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fi.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fi.json index a0444a4891..fcb68affdf 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fi.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fi.json @@ -360,7 +360,7 @@ "Next": "Seuraava", "StartTrial": "Aloita ilmainen kokeilujaksoni", "ContactUsIssues": "Ota yhteyttä, jos sinulla on ongelmia", - "TrialActivatedWarning": "Hyvä {0}, käyttäjällä on oikeus vain yhteen ilmaiseen kokeilujaksoon. Olet jo käyttänyt kokeilujaksosi.", + "TrialActivatedWarning": "Käyttäjällä on oikeus vain yhteen ilmaiseen kokeilujaksoon. Olet jo käyttänyt kokeilujaksosi.", "SaveAndDownload": "Tallenna ja lataa", "CompanyNameValidationMessage": "Yrityksen nimi on liian pitkä!", "AddressValidationMessage": "Osoite on liian pitkä!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Yksi seuraavista kentistä on virheellinen: maan nimi, yrityksen koko, toimiala tai käyttötarkoitus.", "Trial": "Oikeudenkäynti", "Purchased": "Osti", - "PurchaseLicense": "Osta Lisenssi", + "PurchaseLicense": "Osta {0} lisenssi", "PurchaseTrialLicenseMessage": "Lisenssisi viimeinen voimassaolopäivä on {0}.
Jos haluat jatkaa ilmaisen kokeilujakson aikana luomiesi projektien käyttöä, sinun on vaihdettava lisenssiavaimet appsettings.secrets.json-tiedostoissasi. Tässä on lisenssiavaimesi:", "TrialLicenseExpireMessage": "Käytät kokeiluversiota, ja kokeilukäyttölupasi vanhenee {0}.", "TryForFree": "Kokeile ilmaiseksi", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fr.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fr.json index 96a00979fa..861ae9dfa7 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fr.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/fr.json @@ -360,7 +360,7 @@ "Next": "Prochain", "StartTrial": "Commencer mon essai gratuit", "ContactUsIssues": "Contactez-nous si vous avez des problèmes", - "TrialActivatedWarning": "Cher {0}, un utilisateur n'a droit qu'à une seule période d'essai gratuite. Vous avez déjà utilisé votre période d'essai.", + "TrialActivatedWarning": "Un utilisateur n'a droit qu'à 1 période d'essai gratuite. Vous avez déjà utilisé votre période d'essai.", "SaveAndDownload": "Enregistrer et télécharger", "CompanyNameValidationMessage": "Le nom de l'entreprise est trop long !", "AddressValidationMessage": "L'adresse est trop longue !", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "L'un des champs suivants n'est pas valide : Nom du pays, Taille de l'entreprise, Secteur d'activité ou Objet de l'utilisation.", "Trial": "Essai", "Purchased": "Acheté", - "PurchaseLicense": "Licence d'achat", + "PurchaseLicense": "Acheter la licence {0}", "PurchaseTrialLicenseMessage": "La date d'expiration de votre licence est {0}.
Si vous souhaitez continuer à utiliser les projets que vous avez créés pendant votre période d'essai gratuite, vous devez modifier les clés de licence dans vos fichiers appsettings.secrets.json. Voici votre clé de licence :", "TrialLicenseExpireMessage": "Vous utilisez la licence d'essai et votre licence d'essai expirera le {0}.", "TryForFree": "Essayer gratuitement", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hi.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hi.json index 6b9170eeae..813dfccdc1 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hi.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hi.json @@ -360,7 +360,7 @@ "Next": "अगला", "StartTrial": "मेरा नि:शुल्क परीक्षण प्रारंभ करें", "ContactUsIssues": "अगर आपको कोई समस्या है तो हमसे संपर्क करें", - "TrialActivatedWarning": "प्रिय {0}, एक उपयोगकर्ता केवल 1 नि:शुल्क परीक्षण अवधि का हकदार है। आप पहले ही अपनी परीक्षण अवधि का उपयोग कर चुके हैं।", + "TrialActivatedWarning": "एक उपयोगकर्ता केवल 1 निःशुल्क परीक्षण अवधि का हकदार है। आपने पहले ही अपनी परीक्षण अवधि का उपयोग कर लिया है।", "SaveAndDownload": "सहेजें और डाउनलोड करें", "CompanyNameValidationMessage": "कंपनी का नाम बहुत लंबा है!", "AddressValidationMessage": "पता बहुत लंबा है!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "निम्न में से एक फ़ील्ड अमान्य है: देश का नाम, कंपनी का आकार, उद्योग या उपयोग का उद्देश्य।", "Trial": "परीक्षण", "Purchased": "खरीदी", - "PurchaseLicense": "खरीद लाइसेंस", + "PurchaseLicense": "खरीदें {0} लाइसेंस", "PurchaseTrialLicenseMessage": "आपके लाइसेंस की समाप्ति तिथि {0} है।
यदि आप अपनी नि:शुल्क परीक्षण अवधि के दौरान बनाए गए प्रोजेक्ट का उपयोग जारी रखना चाहते हैं, तो आपको अपनी appsettings.secrets.json फ़ाइलों में लाइसेंस कुंजियों को बदलना होगा। यहां आपकी लाइसेंस कुंजी है:", "TrialLicenseExpireMessage": "आप परीक्षण लाइसेंस का उपयोग कर रहे हैं और आपका परीक्षण लाइसेंस {0} को समाप्त हो जाएगा।", "TryForFree": "मुफ्त में आजमाइये", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hu.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hu.json index 0de24176ed..cc095f5fbd 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hu.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/hu.json @@ -375,7 +375,7 @@ "Next": "Következő", "StartTrial": "Indítsa el az ingyenes próbaverziómat", "ContactUsQuestions": "Ha bármilyen kérdése van, forduljon hozzánk", - "TrialActivatedWarning": "Kedves {0}! Egy felhasználó csak 1 ingyenes próbaidőszakra jogosult. Már felhasználta a próbaidőszakot.", + "TrialActivatedWarning": "Egy felhasználó csak 1 ingyenes próbaidőszakra jogosult. Ön már használta a próbaidőszakot.", "ActivationRequirement": "Még egy lépés választja el a próbaidőszak megkezdésétől.
Az adatok ellenőrzése után aktiváljuk a licenszét. A licensz aktiválása után e-mailt küldünk a következő címre: {0} . Ne aggódjon, ez a folyamat nem tart sokáig!", "SaveAndDownload": "Mentés és letöltés", "CompanyNameValidationMessage": "A cég neve túl hosszú!", @@ -566,7 +566,7 @@ "MyOrganizations_Detail_ConclusionInfo": "Számlakérését {0} munkanapon belül lezárjuk.", "ExtendYourLicense": "Hosszabbítsa meg {0} licenszét", "Continue": "Folytatni", - "PurchaseLicense": "Vásárlási engedély", + "PurchaseLicense": "Vásároljon {0} licencet", "DownloadInvoiceModal_DownloadInvoice": "Számla letöltése", "DownloadInvoiceModal_SaveInformationOnlyOnce": "Számlázási adatait csak egyszer mentheti el.", "InvoiceModal_EnterCompanyName": "Adja meg cégének hivatalos nevét...", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/is.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/is.json index e6146707fc..dfba710dae 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/is.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/is.json @@ -360,7 +360,7 @@ "Next": "Næsta", "StartTrial": "Byrjaðu ókeypis prufuáskriftina mína", "ContactUsIssues": "Hafðu samband við okkur ef þú hefur einhver vandamál", - "TrialActivatedWarning": "Kæri {0}, notandi á rétt á aðeins 1 ókeypis prufutíma. Þú hefur þegar notað prufutíma þinn.", + "TrialActivatedWarning": "Notandi á aðeins rétt á að fá 1 ókeypis prufutímabil. Þú hefur þegar notað prufutímabilið þitt.", "SaveAndDownload": "Vista og hala niður", "CompanyNameValidationMessage": "Nafn fyrirtækis er of langt!", "AddressValidationMessage": "Heimilisfang er of langt!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Einn af eftirfarandi reitum er ógildur: heiti lands, stærð fyrirtækis, iðnaður eða tilgangur notkunar.", "Trial": "Prufu aðgangur", "Purchased": "Keypt", - "PurchaseLicense": "Keypt leyfi", + "PurchaseLicense": "Kaupa {0} leyfi", "PurchaseTrialLicenseMessage": "Gildistími leyfis þíns er {0}.
Ef þú vilt halda áfram að nota verkefnin sem þú bjóst til á ókeypis prufutímabilinu þarftu að breyta leyfislyklunum í appsettings.secrets.json skránni þinn. Hér er leyfislykillinn þinn:", "TrialLicenseExpireMessage": "Þú ert að nota prufuleyfið og prufuleyfið rennur út {0}.", "TryForFree": "Prófaðu ókeypis", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/it.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/it.json index b10dafefa1..9d1192c4c8 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/it.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/it.json @@ -360,7 +360,7 @@ "Next": "Prossimo", "StartTrial": "Inizia la mia prova gratuita", "ContactUsIssues": "Contattaci per qualsiasi problema", - "TrialActivatedWarning": "Caro {0}, un utente ha diritto di avere 1 solo periodo di prova gratuito. Hai già utilizzato il tuo periodo di prova.", + "TrialActivatedWarning": "Un utente ha diritto a un solo periodo di prova gratuito. Hai già utilizzato il periodo di prova.", "SaveAndDownload": "Salva e Scarica", "CompanyNameValidationMessage": "Il nome dell'azienda è troppo lungo!", "AddressValidationMessage": "L'indirizzo è troppo lungo!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Uno dei seguenti campi non è valido: nome del paese, dimensione dell'azienda, settore o scopo di utilizzo.", "Trial": "Processo", "Purchased": "Acquistato", - "PurchaseLicense": "Acquista licenza", + "PurchaseLicense": "Acquista {0} licenza", "PurchaseTrialLicenseMessage": "La data di scadenza della tua licenza è {0}.
Se desideri continuare a utilizzare i progetti che hai creato durante il periodo di prova gratuito, devi modificare le chiavi di licenza nei file appsettings.secrets.json. Ecco la tua chiave di licenza:", "TrialLicenseExpireMessage": "Stai utilizzando la licenza di prova e la tua licenza di prova scadrà il {0}.", "TryForFree": "Prova gratis", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/nl.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/nl.json index dd64468f17..de8a896c69 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/nl.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/nl.json @@ -179,7 +179,7 @@ "ChangingLicenseTypeExplanation": "U kunt upgraden naar een hogere licentie door het verschil binnen uw actieve licentieperiode te betalen. Wanneer u upgradet naar een hoger licentieplan, krijgt u de voordelen van het nieuwe plan, maar de licentie-upgrade verandert de vervaldatum van de licentie niet. Daarnaast kun je ook nieuwe developers seats toevoegen aan je bestaande licentie, zie \"Hoeveel developers kunnen aan de ABP Commercial werken?\"", "LicenseExtendUpgradeDiff": "Wat is het verschil tussen licentieverlenging en upgrade?", "LicenseRenewalCost": "Wat zijn de kosten voor het verlengen van de licentie na 1 jaar?", - "LicenseRenewalCostExplanation": "Het tarief voor catalogusverlenging van alle eeuwigdurende licenties van ABP Commercial is {0} van de licentieprijs van de licentie. De verlengingsprijs van de standaard Teamlicentie is ${1}, de standaard Business-licentie is ${2} en de standaard Enterprise-licentie is ${3}. Als u al klant bent, log in op uw account om de beschikbare verlengingsprijzen te bekijken.", + "LicenseRenewalCostExplanation": "De prijs voor het verlengen (verlengen) van de standaard Teamlicentie is ${0}, de standaard Business-licentie is ${1} en de standaard Enterprise-licentie is ${2}. Als u al klant bent, log in op uw account om de huidige verlengingsprijzen te bekijken.", "HowDoIRenewMyLicense": "Hoe verleng ik mijn licentie?", "HowDoIRenewMyLicenseExplanation": "U kunt uw licentie verlengen door naar de organisatiebeheerpagina te gaan. Om te profiteren van onze gereduceerde tarieven voor vroege verlenging, moet u ervoor zorgen dat u verlengt voordat uw licentie verloopt. U hoeft zich echter geen zorgen te maken dat u niet weet wanneer uw mogelijkheid tot vervroegde verlenging afloopt. Je ontvangt 3 herinneringsmails voordat je abonnement afloopt. We sturen ze 30 dagen, 7 dagen en 1 dag voor de vervaldatum.", "IsSourceCodeIncluded": "Bevat mijn licentie de broncode van de commerciële modules en thema's?", @@ -360,7 +360,7 @@ "Next": "Volgende", "StartTrial": "Start mijn gratis proefperiode", "ContactUsIssues": "Neem contact met ons op als je problemen hebt!", - "TrialActivatedWarning": "Beste {0}, een gebruiker heeft recht op slechts één gratis proefperiode. Je hebt je proefperiode al gebruikt.", + "TrialActivatedWarning": "Een gebruiker heeft recht op slechts 1 gratis proefperiode. Je hebt je proefperiode al gebruikt.", "SaveAndDownload": "Opslaan en downloaden", "CompanyNameValidationMessage": "Bedrijfsnaam is te lang!", "AddressValidationMessage": "Adres is te lang!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Een van de volgende velden is ongeldig: Landnaam, Bedrijfsgrootte, Industrie of Gebruiksdoel.", "Trial": "Proces", "Purchased": "Gekocht", - "PurchaseLicense": "Licentie kopen", + "PurchaseLicense": "Koop {0} licentie", "PurchaseTrialLicenseMessage": "De vervaldatum van uw licentie is {0}.
Als je de projecten die je tijdens je gratis proefperiode hebt gemaakt wilt blijven gebruiken, moet je de licentiesleutels in je appsettings.secrets.json-bestanden wijzigen. Hier is uw licentiesleutel:", "TrialLicenseExpireMessage": "U gebruikt de proeflicentie en uw proeflicentie verloopt op {0}.", "TryForFree": "Probeer gratis", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pl-PL.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pl-PL.json index 1e9e3229ec..63a6197619 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pl-PL.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pl-PL.json @@ -360,7 +360,7 @@ "Next": "Następny", "StartTrial": "Rozpocznij mój bezpłatny okres próbny", "ContactUsIssues": "Skontaktuj się z nami, jeśli masz jakiekolwiek problemy", - "TrialActivatedWarning": "Drogi {0}, użytkownik może mieć tylko 1 bezpłatny okres próbny. Korzystałeś już z okresu próbnego.", + "TrialActivatedWarning": "Użytkownikowi przysługuje tylko 1 darmowy okres próbny. Już wykorzystałeś swój okres próbny.", "SaveAndDownload": "Zapisz i pobierz", "CompanyNameValidationMessage": "Nazwa firmy jest za długa!", "AddressValidationMessage": "Adres jest za długi!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Jedno z następujących pól jest nieprawidłowe: nazwa kraju, wielkość firmy, branża lub cel użytkowania.", "Trial": "Test", "Purchased": "Zakupione", - "PurchaseLicense": "Licencja kupna", + "PurchaseLicense": "Kup licencję {0}", "PurchaseTrialLicenseMessage": "Data wygaśnięcia Twojej licencji to {0}.
Jeśli chcesz nadal korzystać z projektów utworzonych podczas bezpłatnego okresu próbnego, musisz zmienić klucze licencyjne w plikach appsettings.secrets.json. Oto twój klucz licencyjny:", "TrialLicenseExpireMessage": "Korzystasz z licencji próbnej, a Twoja licencja próbna wygaśnie w dniu {0}.", "TryForFree": "Wypróbuj za darmo", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pt-BR.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pt-BR.json index 052c9c6fa0..18ba4d25ac 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pt-BR.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/pt-BR.json @@ -360,7 +360,7 @@ "Next": "Próximo", "StartTrial": "Comece meu teste grátis", "ContactUsIssues": "Contate-nos se tiver algum problema", - "TrialActivatedWarning": "Caro {0}, um usuário tem direito a apenas 1 período de teste gratuito. Você já usou seu período de teste.", + "TrialActivatedWarning": "Um usuário tem direito a apenas 1 período de teste gratuito. Você já usou seu período de teste.", "SaveAndDownload": "Salvar e baixar", "CompanyNameValidationMessage": "O nome da empresa é muito longo!", "AddressValidationMessage": "O endereço é muito longo!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Um dos campos a seguir é inválido: nome do país, tamanho da empresa, setor ou finalidade do uso.", "Trial": "Tentativas", "Purchased": "Comprado", - "PurchaseLicense": "Licença de Compra", + "PurchaseLicense": "Comprar {0} licença", "PurchaseTrialLicenseMessage": "A data de expiração da sua licença é {0}.
Se você deseja continuar usando os projetos que criou durante o período de teste gratuito, você precisa alterar as chaves de licença em seus arquivos appsettings.secrets.json . Aqui está sua chave de licença:", "TrialLicenseExpireMessage": "Você está usando a licença de teste e sua licença de teste irá expirar em {0}.", "TryForFree": "Experimentar gratuitamente", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json index be56afbb43..558f95f68e 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json @@ -360,7 +360,7 @@ "Next": "Următorul", "StartTrial": "Începeți încercarea mea gratuită", "ContactUsIssues": "Contactați-ne dacă aveți probleme", - "TrialActivatedWarning": "Stimate {0}, un utilizator are dreptul la o singură perioadă de probă gratuită. Ai folosit deja perioada de probă.", + "TrialActivatedWarning": "Un utilizator are dreptul la o singură perioadă de probă gratuită. Ai folosit deja perioada de probă.", "SaveAndDownload": "Salvați și descărcați", "CompanyNameValidationMessage": "Numele companiei este prea lung!", "AddressValidationMessage": "Adresa este prea lungă!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Unul dintre următoarele câmpuri este nevalid: Numele țării, Mărimea companiei, Industria sau Scopul utilizării.", "Trial": "Proces", "Purchased": "Cumparat", - "PurchaseLicense": "Licență de cumpărare", + "PurchaseLicense": "Achiziționați licența {0}", "PurchaseTrialLicenseMessage": "Data de expirare a licenței este {0}.
Dacă doriți să continuați să utilizați proiectele pe care le-ați creat în timpul perioadei de probă gratuită, trebuie să schimbați cheile de licență din fișierele appsettings.secrets.json. Iată cheia de licență:", "TrialLicenseExpireMessage": "Utilizați licența de probă și licența de probă va expira pe {0}.", "TryForFree": "Încearcă pe gratis", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ru.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ru.json index a5b9bdddad..b47a0cc938 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ru.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ru.json @@ -360,7 +360,7 @@ "Next": "Следующий", "StartTrial": "Начать бесплатную пробную версию", "ContactUsIssues": "Свяжитесь с нами, если у вас возникнут проблемы", - "TrialActivatedWarning": "Уважаемый {0}, пользователю предоставляется только 1 бесплатный пробный период. Вы уже использовали пробный период.", + "TrialActivatedWarning": "Пользователь имеет право на 1 бесплатный пробный период. Вы уже использовали пробный период.", "SaveAndDownload": "Сохранить и скачать", "CompanyNameValidationMessage": "Название компании слишком длинное!", "AddressValidationMessage": "Адрес слишком длинный!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Одно из следующих полей недействительно: название страны, размер компании, отрасль или цель использования.", "Trial": "Испытание", "Purchased": "Куплено", - "PurchaseLicense": "Купить лицензию", + "PurchaseLicense": "Купить {0} лицензию", "PurchaseTrialLicenseMessage": "Срок действия вашей лицензии: {0}.
Если вы хотите продолжить использование проектов, созданных в течение бесплатного пробного периода, вам необходимо изменить лицензионные ключи в файлах appsettings.secrets.json . Вот ваш лицензионный ключ:", "TrialLicenseExpireMessage": "Вы используете пробную лицензию, и срок ее действия истечет {0}.", "TryForFree": "Попробуй бесплатно", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sk.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sk.json index 8636f68af0..8ef2343648 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sk.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sk.json @@ -360,7 +360,7 @@ "Next": "Ďalšie", "StartTrial": "Spustite moju bezplatnú skúšobnú verziu", "ContactUsIssues": "Ak máte nejaké problémy, kontaktujte nás", - "TrialActivatedWarning": "Vážený {0}, používateľ má nárok len na 1 bezplatné skúšobné obdobie. Skúšobné obdobie ste už využili.", + "TrialActivatedWarning": "Používateľ má nárok len na 1 bezplatné skúšobné obdobie. Skúšobné obdobie ste už využili.", "SaveAndDownload": "Uložiť a stiahnuť", "CompanyNameValidationMessage": "Názov spoločnosti je príliš dlhý!", "AddressValidationMessage": "Adresa je príliš dlhá!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Jedno z nasledujúcich polí je neplatné: Názov krajiny, Veľkosť spoločnosti, Odvetvie alebo Účel použitia.", "Trial": "Skúška", "Purchased": "Kúpené", - "PurchaseLicense": "Zakúpiť licenciu", + "PurchaseLicense": "Kúpiť licenciu {0}", "PurchaseTrialLicenseMessage": "Dátum vypršania platnosti vašej licencie je {0}.
Ak chcete pokračovať v používaní projektov, ktoré ste vytvorili počas bezplatného skúšobného obdobia, musíte zmeniť licenčné kľúče vo svojich súboroch appsettings.secrets.json. Tu je váš licenčný kľúč:", "TrialLicenseExpireMessage": "Používate skúšobnú licenciu a platnosť vašej skúšobnej licencie vyprší {0}.", "TryForFree": "Skúste zadarmo", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sl.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sl.json index 606be171cb..13f9e2c764 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sl.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/sl.json @@ -360,7 +360,7 @@ "Next": "Naslednji", "StartTrial": "Začnite moj brezplačni preizkus", "ContactUsIssues": "Pišite nam, če imate kakršne koli težave", - "TrialActivatedWarning": "Spoštovani {0}, uporabnik ima pravico do 1 brezplačnega preskusnega obdobja. Poskusno obdobje ste že izkoristili.", + "TrialActivatedWarning": "Uporabnik ima pravico do samo 1 brezplačnega preizkusnega obdobja. Preizkusno obdobje ste že izkoristili.", "SaveAndDownload": "Shrani in prenesi", "CompanyNameValidationMessage": "Ime podjetja je predolgo!", "AddressValidationMessage": "Naslov je predolg!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Eno od naslednjih polj je neveljavno: ime države, velikost podjetja, panoga ali namen uporabe.", "Trial": "Sojenje", "Purchased": "Kupljeno", - "PurchaseLicense": "Nakup licence", + "PurchaseLicense": "Nakup licence {0}", "PurchaseTrialLicenseMessage": "Datum poteka vaše licence je {0}.
Če želite še naprej uporabljati projekte, ki ste jih ustvarili med brezplačnim preizkusnim obdobjem, morate spremeniti licenčne ključe v datotekah appsettings.secrets.json. Tukaj je vaš licenčni ključ:", "TrialLicenseExpireMessage": "Uporabljate preizkusno licenco in vaša preizkusna licenca bo potekla {0}.", "TryForFree": "Poskusite brezplačno", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json index d03220758a..46512f11bc 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json @@ -363,7 +363,7 @@ "Next": "Sonraki", "StartTrial": "Ücretsiz Denememi Başlat", "ContactUsIssues": "Herhangi bir sorununuz varsa bizimle iletişime geçin", - "TrialActivatedWarning": "Sayın {0}, bir kullanıcının yalnızca 1 ücretsiz deneme süresi hakkı vardır. Deneme sürenizi zaten kullandınız.", + "TrialActivatedWarning": "Bir kullanıcının yalnızca 1 ücretsiz deneme süresi hakkı vardır. Deneme sürenizi zaten kullandınız.", "SaveAndDownload": "Kaydet ve İndir", "CompanyNameValidationMessage": "Şirket adı çok uzun!", "AddressValidationMessage": "Adres çok uzun!", @@ -376,7 +376,7 @@ "TrialLicenseModelInvalidErrorMessage": "Aşağıdaki alanlardan biri geçersiz: Ülke Adı, Şirket Büyüklüğü, Sektör veya Kullanım Amacı.", "Trial": "Duruşma", "Purchased": "satın alındı", - "PurchaseLicense": "Satın alma lisansı", + "PurchaseLicense": "{0} lisansı satın al", "PurchaseTrialLicenseMessage": "Lisans sona erme tarihiniz {0}.
Ücretsiz deneme süreniz boyunca oluşturduğunuz projeleri kullanmaya devam etmek istiyorsanız, appsettings.secrets.json dosyalarınızdaki lisans anahtarlarını değiştirmeniz gerekir. İşte lisans anahtarınız:", "TrialLicenseExpireMessage": "Deneme lisansını kullanıyorsunuz ve deneme lisansınızın süresi {0} tarihinde sona erecek.", "TryForFree": "Ücretsiz deneyin", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/vi.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/vi.json index 8646e0b0cd..c698a4ae6d 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/vi.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/vi.json @@ -360,7 +360,7 @@ "Next": "Kế tiếp", "StartTrial": "Bắt đầu bản dùng thử miễn phí của tôi", "ContactUsIssues": "Liên hệ với chúng tôi nếu bạn có bất kỳ vấn đề nào", - "TrialActivatedWarning": "Kính gửi {0}, người dùng chỉ được phép có 1 thời gian dùng thử miễn phí. Bạn đã sử dụng thời gian dùng thử của mình.", + "TrialActivatedWarning": "Người dùng chỉ có quyền có 1 thời gian dùng thử miễn phí. Bạn đã sử dụng thời gian dùng thử của mình.", "SaveAndDownload": "Lưu và tải xuống", "CompanyNameValidationMessage": "Tên công ty quá dài!", "AddressValidationMessage": "Địa chỉ quá dài!", @@ -373,7 +373,7 @@ "TrialLicenseModelInvalidErrorMessage": "Một trong các trường sau không hợp lệ: Tên quốc gia, Quy mô công ty, Ngành hoặc Mục đích sử dụng.", "Trial": "Sự thử nghiệm", "Purchased": "Đã mua", - "PurchaseLicense": "Giấy phép mua bán", + "PurchaseLicense": "Mua {0} giấy phép", "PurchaseTrialLicenseMessage": "Ngày hết hạn giấy phép của bạn là {0}.
Nếu bạn muốn tiếp tục sử dụng các dự án bạn đã tạo trong thời gian dùng thử miễn phí, bạn cần thay đổi khóa cấp phép trong các tệp appsettings.secrets.json của mình. Đây là khóa cấp phép của bạn:", "TrialLicenseExpireMessage": "Bạn đang sử dụng giấy phép dùng thử và giấy phép dùng thử của bạn sẽ hết hạn vào {0}.", "TryForFree": "Thử miễn phí", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json index 8cf695102b..bab35343a5 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json @@ -375,7 +375,7 @@ "Next": "下一个", "StartTrial": "开始我的免费试用", "ContactUsQuestions": "如果你有任何问题，请联系我们", - "TrialActivatedWarning": "亲爱的{0}，用户只能享受 1 个免费试用期。您已经使用了试用期。", + "TrialActivatedWarning": "一个用户只能有 1 个免费试用期。您已经使用了试用期。", "ActivationRequirement": "你已经距离开始你的试用还有最后一步。
检查你的信息后，我们将激活你的许可证。一旦你的许可证激活，我们将向{0}发送电子邮件。请不要担心，这个过程不会太久！", "SaveAndDownload": "保存和下载", "CompanyNameValidationMessage": "公司名称太长！", @@ -561,12 +561,12 @@ "Products": "产品", "TotalPrice": "总价格", "ThereIsNoInvoice": "没有发票", - "MyOrganizations_Detail_PaymentProviderInfo": "如果您通过 {0} 网关购买了许可证，PDF 发票会被发送到您的电子邮件地址，请参阅 { 0} 发票。", + "MyOrganizations_Detail_PaymentProviderInfo": "如果您通过 {0} 网关购买了许可证，它会将 PDF 发票发送到您的电子邮件地址，请参阅 {0} 发票。", "MyOrganizations_Detail_PayUInfo": "如果您是通过PayU网关购买的，请点击\"索取发票\"按钮并填写账单信息。", "MyOrganizations_Detail_ConclusionInfo": "您的发票申请将在 {0} 个工作日内完成。", "ExtendYourLicense": "延长您的 {0} 许可", "Continue": "继续", - "PurchaseLicense": "购买许可证", + "PurchaseLicense": "购买 {0} 许可证", "DownloadInvoiceModal_DownloadInvoice": "下载发票", "DownloadInvoiceModal_SaveInformationOnlyOnce": "您只能保存一次账单信息。", "InvoiceModal_EnterCompanyName": "请输入您的法定公司名称...", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hant.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hant.json index a8b0398369..08a39b37e5 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hant.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hant.json @@ -362,7 +362,7 @@ "Next": "下一個", "StartTrial": "開始我的免費試用", "ContactUsIssues": "如果您有任何問題，請聯繫我們", - "TrialActivatedWarning": "親愛的{0}，用戶只能享受 1 個免費試用期。您已經使用了試用期。", + "TrialActivatedWarning": "一個用戶只能有 1 個免費試用期。您已經使用了試用期。", "SaveAndDownload": "保存和下載", "CompanyNameValidationMessage": "公司名稱太長！", "AddressValidationMessage": "地址太長！", @@ -375,7 +375,7 @@ "TrialLicenseModelInvalidErrorMessage": "以下字段之一無效：國家名稱、公司規模、行業或使用目的。", "Trial": "審判", "Purchased": "已購買", - "PurchaseLicense": "購買許可證", + "PurchaseLicense": "購買 {0} 許可證", "PurchaseTrialLicenseMessage": "您的許可證到期日期是 {0}。
如果您想繼續使用您在免費試用期內創建的項目，您需要更改 appsettings.secrets.json 文件中的許可證密鑰。這是您的許可證密鑰：", "TrialLicenseExpireMessage": "您正在使用試用許可證，您的試用許可證將於 {0}到期。", "TryForFree": "免費試用", diff --git a/build/build-all.ps1 b/build/build-all.ps1 index 16f8bf037c..f0b2f398db 100644 --- a/build/build-all.ps1 +++ b/build/build-all.ps1 @@ -6,6 +6,8 @@ $full = $args[0] Write-Host $solutionPaths +dotnet workload install wasm-tools + foreach ($solutionPath in $solutionPaths) { $solutionAbsPath = (Join-Path $rootFolder $solutionPath) Set-Location $solutionAbsPath diff --git a/docs/en/CLI.md b/docs/en/CLI.md index 7a5e59a62a..86eecb3799 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -505,6 +505,7 @@ abp login # Allows you to enter your abp login -p # Specify the password as a parameter (password is visible) abp login --organization # If you have multiple organizations, you need set your active organization abp login -p -o # You can enter both your password and organization in the same command +abp login --device # Use device login flow ``` > When using the -p parameter, be careful as your password will be visible. It's useful for CI/CD automation pipelines. diff --git a/docs/en/Deployment/Clustered-Environment.md b/docs/en/Deployment/Clustered-Environment.md index d76a199518..2dace9a7f7 100644 --- a/docs/en/Deployment/Clustered-Environment.md +++ b/docs/en/Deployment/Clustered-Environment.md @@ -84,6 +84,16 @@ ABP provides a distributed locking abstraction with an implementation made with However, the distributed lock system works in-process by default. That means it is not distributed actually, unless you configure a distributed lock provider. So, please follow the [distributed lock](../Distributed-Locking.md) document to configure a provider for your application, if it is not already configured. +## Configuring SignalR + +ABP provides [SignalR](../SignalR-Integration.md) integration packages to simplify integration and usage. SignalR can be used whenever you need to add real-time web functionality (real-time messaging, real-time notification etc.) into your application. + +SignalR requires that all HTTP requests for a specific connection be handled (needs to keep track of all its connections) by the same server process. So, when SignalR is running on a clustered environment (with multiple servers) **"sticky sessions"** must be used. + +If you are considering [scaling out](https://learn.microsoft.com/en-us/aspnet/core/signalr/scale?view=aspnetcore-6.0#scale-out) your servers and don't want to have inconsistency with the active socket connections, you can use [Azure SignalR Service](https://learn.microsoft.com/en-us/aspnet/core/signalr/scale?view=aspnetcore-6.0#azure-signalr-service) or [Redis backplane](https://learn.microsoft.com/en-us/aspnet/core/signalr/scale?view=aspnetcore-6.0#redis-backplane). + +> To learn more about how to host and scale SignalR in a clustered environment, please check the [ASP.NET Core SignalR hosting and scaling](https://learn.microsoft.com/en-us/aspnet/core/signalr/scale?view=aspnetcore-6.0). + ## Implementing Background Workers ASP.NET Core provides [hosted services](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/host/hosted-services) and ABP provides [background workers](../Background-Workers.md) to perform tasks in background threads in your application. @@ -96,4 +106,4 @@ We suggest you to use one of the following approaches to overcome the problem: * Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](../Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances except one of them, so only the single instance runs the workers. -* Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances and create a dedicated application (maybe a console application running in its own container or a Windows Service running in the background) to execute all the background tasks. This can be a good option if your background workers consume high system resources (CPU, RAM or Disk), so you can deploy that background application to a dedicated server and your background tasks don't affect your application's performance. \ No newline at end of file +* Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances and create a dedicated application (maybe a console application running in its own container or a Windows Service running in the background) to execute all the background tasks. This can be a good option if your background workers consume high system resources (CPU, RAM or Disk), so you can deploy that background application to a dedicated server and your background tasks don't affect your application's performance. diff --git a/docs/en/Getting-Started-React-Native.md b/docs/en/Getting-Started-React-Native.md index ac6325b5fd..7bd9495e38 100644 --- a/docs/en/Getting-Started-React-Native.md +++ b/docs/en/Getting-Started-React-Native.md @@ -15,7 +15,7 @@ ABP platform provide basic [React Native](https://reactnative.dev/) startup temp Please follow the steps below to prepare your development environment for React Native. -1. **Install Node.js:** Please visit [Node.js downloads page](https://nodejs.org/en/download/) and download proper Node.js v12 or v14 installer for your OS. An alternative is to install [NVM](https://github.com/nvm-sh/nvm) and use it to have multiple versions of Node.js in your operating system. +1. **Install Node.js:** Please visit [Node.js downloads page](https://nodejs.org/en/download/) and download proper Node.js v16 or v18 installer for your OS. An alternative is to install [NVM](https://github.com/nvm-sh/nvm) and use it to have multiple versions of Node.js in your operating system. 2. **[Optional] Install Yarn:** You may install Yarn v1 (not v2) following the instructions on [the installation page](https://classic.yarnpkg.com/en/docs/install). Yarn v1 delivers an arguably better developer experience compared to npm v6 and below. You may skip this step and work with npm, which is built-in in Node.js, instead. 3. **[Optional] Install VS Code:** [VS Code](https://code.visualstudio.com/) is a free, open-source IDE which works seamlessly with TypeScript. Although you can use any IDE including Visual Studio or Rider, VS Code will most likely deliver the best developer experience when it comes to React Native projects. 4. **Install an Emulator:** React Native applications need an Android emulator or an iOS simulator to run on your OS. See the [Android Studio Emulator](https://docs.expo.io/workflow/android-simulator/) or [iOS Simulator](https://docs.expo.io/workflow/ios-simulator/) on expo.io documentation to learn how to set up an emulator. diff --git a/docs/en/Getting-Started-Setup-Environment.md b/docs/en/Getting-Started-Setup-Environment.md index b4ebed633f..1a47c67d34 100644 --- a/docs/en/Getting-Started-Setup-Environment.md +++ b/docs/en/Getting-Started-Setup-Environment.md @@ -21,7 +21,7 @@ The following tools should be installed on your development machine: * An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 6.0+](https://dotnet.microsoft.com/download/dotnet) development. {{ if UI != "Blazor" }} -* [Node v12 or v14](https://nodejs.org/) +* [Node v16 or v18](https://nodejs.org/) * [Yarn v1.20+ (not v2)](https://classic.yarnpkg.com/en/docs/install) [1](#f-yarn) or npm v6+ (already installed with Node) {{ end }} {{ if Tiered == "Yes" }} diff --git a/docs/en/Migration-Guides/OpenIddict-Angular.md b/docs/en/Migration-Guides/OpenIddict-Angular.md index 77fb7f1447..c3ca6a7fbb 100644 --- a/docs/en/Migration-Guides/OpenIddict-Angular.md +++ b/docs/en/Migration-Guides/OpenIddict-Angular.md @@ -16,14 +16,14 @@ - In **MyApplication.HttpApi.Host.csproj** replace **project references**: ```csharp - - + + ``` with ```csharp - + ``` - In the **MyApplicationHttpApiHostModule.cs** replace usings and **module dependencies**: @@ -117,13 +117,13 @@ This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refacto - In **MyApplication.IdentityServer.csproj** replace **project references**: ```csharp - + ``` with ```csharp - + ``` - In the **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: diff --git a/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md b/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md index 8a8f25e9dc..65011f6124 100644 --- a/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md +++ b/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md @@ -5,14 +5,14 @@ - In the **MyApplication.Blazor.csproj** replace **project references**: ```csharp - - + + ``` with ```csharp - + ``` - In the **MyApplicationBlazorModule.cs** replace usings and **module dependencies**: @@ -108,13 +108,13 @@ This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refacto - In **MyApplication.IdentityServer.csproj** replace **project references**: ```csharp - + ``` with ```csharp - + ``` - In **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: diff --git a/docs/en/Migration-Guides/OpenIddict-Blazor.md b/docs/en/Migration-Guides/OpenIddict-Blazor.md index 7fefae2f74..4a3e166cb9 100644 --- a/docs/en/Migration-Guides/OpenIddict-Blazor.md +++ b/docs/en/Migration-Guides/OpenIddict-Blazor.md @@ -34,14 +34,14 @@ - In the **MyApplication.HttpApi.Host.csproj** replace **project references**: ```csharp - - + + ``` with ```csharp - + ``` - In the **MyApplicationHttpApiHostModule.cs** replace usings and **module dependencies**: @@ -136,13 +136,13 @@ This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refacto - In **MyApplication.IdentityServer.csproj** replace **project references**: ```csharp - + ``` with ```csharp - + ``` - In the **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: diff --git a/docs/en/Migration-Guides/OpenIddict-Mvc.md b/docs/en/Migration-Guides/OpenIddict-Mvc.md index fc69f7d417..7fd411155d 100644 --- a/docs/en/Migration-Guides/OpenIddict-Mvc.md +++ b/docs/en/Migration-Guides/OpenIddict-Mvc.md @@ -5,14 +5,14 @@ - In **MyApplication.Web.csproj** replace **project references**: ```csharp - - + + ``` with ```csharp - + ``` - In **MyApplicationWebModule.cs** replace usings and **module dependencies**: @@ -27,7 +27,7 @@ with ```csharp - typeof(AbpAccountWebModule), + typeof(AbpAccountWebOpenIddictModule), ``` - In **MyApplicationWebModule.cs** `ConfigureServices` method **update authentication configuration**: @@ -116,13 +116,13 @@ This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refacto - In **MyApplication.IdentityServer.csproj** replace **project references**: ```csharp - + ``` with ```csharp - + ``` - In **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: diff --git a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md index ff9d25b80b..ba6b264758 100644 --- a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md +++ b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md @@ -20,11 +20,11 @@ Use the `abp update` command to update your existing application. See [Upgrading - In **MyApplication.Domain.Shared.csproj** replace **project reference**: ```csharp - + ``` with ```csharp - + ``` - In **MyApplicationDomainSharedModule.cs** replace usings and **module dependencies:** @@ -45,15 +45,15 @@ Use the `abp update` command to update your existing application. See [Upgrading - In **MyApplication.Domain.csproj** replace **project references**: ```csharp - - + + ``` with ```csharp - - + + ``` - In **MyApplicationDomainModule.cs** replace usings and **module dependencies**: @@ -90,13 +90,13 @@ If you are using MongoDB, skip this step and check the *MongoDB* layer section. - In **MyApplication.EntityFrameworkCore.csproj** replace **project reference**: ```csharp - + ``` with ```csharp - + ``` - In **MyApplicationEntityFrameworkCoreModule.cs** replace usings and **module dependencies**: @@ -154,13 +154,13 @@ If you are using EntityFrameworkCore, skip this step and check the *EntityFramew - In **MyApplication.MongoDB.csproj** replace **project reference**: ```csharp - + ``` with ```csharp - + ``` - In **MyApplicationMongoDbModule.cs** replace usings and **module dependencies**: diff --git a/docs/en/Modules/OpenIddict.md b/docs/en/Modules/OpenIddict.md index 22cb22bf55..3a015011e6 100644 --- a/docs/en/Modules/OpenIddict.md +++ b/docs/en/Modules/OpenIddict.md @@ -293,6 +293,8 @@ PreConfigure(options => - `UpdateAbpClaimTypes(default: true)`: Updates `AbpClaimTypes` to be compatible with the Openiddict claims. - `AddDevelopmentEncryptionAndSigningCertificate(default: true)`: Registers (and generates if necessary) a user-specific development encryption/development signing certificate. +> `AddDevelopmentEncryptionAndSigningCertificate` cannot be used in applications deployed on IIS or Azure App Service: trying to use them on IIS or Azure App Service will result in an exception being thrown at runtime (unless the application pool is configured to load a user profile). To avoid that, consider creating self-signed certificates and storing them in the X.509 certificates store of the host machine(s). Please refer to: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html#registering-a-development-certificate + #### Automatically Removing Orphaned Tokens/Authorizations The background task that automatically removes orphaned tokens/authorizations. This can be configured by `TokenCleanupOptions` to manage it. diff --git a/docs/en/Previews.md b/docs/en/Previews.md index 61cf1c9226..70ddc4fe2b 100644 --- a/docs/en/Previews.md +++ b/docs/en/Previews.md @@ -11,6 +11,14 @@ More than one preview releases (like 3.1.0-rc.2 and 3.1.0-rc.3) might be publish ## Using the Preview Versions +### Update the CLI + +Before creating or updating an existing solution make sure to update the CLI to the latest preview version, for example: + +````bash +dotnet tool update --global Volo.Abp.Cli --version 6.0.0-rc.2 +```` + ### New Solutions To create a project for testing the preview version, you can select the "**preview**" option on the [download page](https://abp.io/get-started) or use the "**--preview**" parameter with the [ABP CLI](CLI.md) new command: diff --git a/docs/en/Themes/LeptonXLite/Angular.md b/docs/en/Themes/LeptonXLite/Angular.md index 506ffaf753..4079281f99 100644 --- a/docs/en/Themes/LeptonXLite/Angular.md +++ b/docs/en/Themes/LeptonXLite/Angular.md @@ -82,3 +82,170 @@ To change the logos and brand color of `LeptonX`, simply add the following CSS t ### Server Side In order to migrate to LeptonX on your server side projects (Host and/or AuthServer projects), please follow the [Server Side Migration](AspNetCore.md) document. + +## Customization + + +### Layouts + +The Angular version of LeptonX Lite provides **layout components** for your **user interface** on [ABP Framework Theming](https://docs.abp.io/en/abp/latest/UI/Angular/Theming). You can use layouts to **organize your user interface**. You can replace the **layout components** and some parts of the **layout components** with the [ABP replaceable component system](https://docs.abp.io/en/abp/latest/UI/Angular/Component-Replacement). + + +The main responsibility of a theme is to **provide** the layouts. There are **three pre-defined layouts that must be implemented by all the themes:** + +* **ApplicationLayoutComponent:** The **default** layout which is used by the **main** application pages. + +* **AccountLayoutComponent:** Mostly used by the **account module** for **login**, **register**, **forgot password**... pages. + +* **EmptyLayoutComponent:** The **Minimal** layout that **has no layout components** at all. + + The **Layout components** and all the replacable components are predefined in `eThemeLeptonXComponents` as enum. + +### How to replace a component + +```js +import { ReplaceableComponentsService } from '@abp/ng.core'; // imported ReplaceableComponentsService +import { eIdentityComponents } from '@abp/ng.identity'; // imported eIdentityComponents enum +import { eThemeLeptonXComponents } from '@abp/ng.theme.lepton-x'; // imported eThemeLeptonXComponents enum + +//... + +@Component(/* component metadata */) +export class AppComponent { + constructor( + private replaceableComponents: ReplaceableComponentsService, // injected the service + ) { + this.replaceableComponents.add({ + component: YourNewApplicationLayoutComponent, + key: eThemeLeptonXComponents.ApplicationLayout, + }); + } +} +``` +See the [Component Replacement](https://docs.abp.io/en/abp/latest/UI/Angular/Component-Replacement) documentation for more information on how to replace components. + + +### Brand Component + +The **brand component** is a simple component that can be used to display your brand. It contains a **logo** and a **company name**. You can change the logo via css but if you want to change logo component, the key is `eThemeLeptonXComponents.Logo` + +```js +///... + this.replaceableComponents.add({ + component: YourNewLogoComponent, + key: eThemeLeptonXComponents.Logo, + }); +///... +``` + +![Brand component](../../images/leptonxlite-brand-component.png) + + + +## Breadcrumb Component + +On websites that have a lot of pages, **breadcrumb navigation** can greatly **enhance the way users find their way** around. In terms of **usability**, breadcrumbs reduce the number of actions a website **visitor** needs to take in order to get to a **higher-level page**, and they **improve** the **findability** of **website sections** and **pages**. + +```js +///... + this.replaceableComponents.add({ + component: YourNewSidebarComponent, + key: eThemeLeptonXComponents.Breadcrumb, + }); +///... +``` + +![Breadcrumb component](../../images/leptonxlite-breadcrumb-component.png) + +## Sidebar Menu Component + +Sidebar menus have been used as a **directory for Related Pages** to a **Service** offering, **Navigation** items to a **specific service** or topic and even just as **Links** the user may be interested in. + +```js +///... + this.replaceableComponents.add({ + component: YourNewSidebarComponent, + key: eThemeLeptonXComponents.Sidebar, + }); +///... +``` +![Sidebar menu component](../../images/leptonxlite-sidebar-menu-component.png) + +## Page Alerts Component + +Provides contextual **feedback messages** for typical user actions with a handful of **available** and **flexible** **alert messages**. Alerts are available for any length of text, as well as an **optional dismiss button**. + +![Page alerts component](../../images/leptonxlite-page-alerts-component.png) +```js +///... + this.replaceableComponents.add({ + component: YourNewPageAlertContainerComponent, + key: eThemeLeptonXComponents.PageAlertContainer, + }); +///... +``` +## Toolbar Component +![Breadcrumb component](../../images/leptonxlite-toolbar-component.png) + +Toolbar items are used to add **extra functionality to the toolbar**. The toolbar is a **horizontal bar** that **contains** a group of **toolbar items**. +```js +///... + this.replaceableComponents.add({ + component: YourNewNavItemsComponent, + key: eThemeLeptonXComponents.NavItems, + }); +///... +``` + +## Toolbar Items +There are two parts to the toolbar. The first is Language-Switch. The second is the User-Profile element. You can swap out each of these parts individually. + +## Language Switch Component + +Think about a **multi-lingual** website and the first thing that could **hit your mind** is **the language switch component**. A **navigation bar** is a **great place** to **embed a language switch**. By embedding the language switch in the navigation bar of your website, you would **make it simpler** for users to **find it** and **easily** switch the **language** **without trying to locate it across the website.** + +![Language switch component](../../images/leptonxlite-language-switch-component.png) +```js +///... + this.replaceableComponents.add({ + component: YourNewLanguagesComponent, + key: eThemeLeptonXComponents.Languages, + }); +///... +``` + +## User Menu Component + +The **User Menu** is the **menu** that **drops down** when you **click your name** or **profile picture** in the **upper right corner** of your page (**in the toolbar**). It drops down options such as **Settings**, **Logout**, etc. + +![User menu component](../../images/leptonxlite-user-menu-component.png) +```js +///... + this.replaceableComponents.add({ + component: YourNewCurrentUserComponent, + key: eThemeLeptonXComponents.CurrentUser, + }); +///... +``` +Note: The language selection component in the Volo app is not replaceable. It is part of the settings menu. + +## Mobile Navbar Component +The **mobile navbar component** is used to display the **navbar menu on mobile devices**. The mobile navbar component is a **dropdown menu** that contains language selection and user menu. + +![Mobile user menu component](../../images/leptonxlite-mobile-user-menu-component.png) +```js +///... + this.replaceableComponents.add({ + component: YourNewMobileNavbarComponent, + key: eThemeLeptonXComponents.MobileNavbar, + }); +///... +``` +## Mobile Navbar Items. +There are two parts of the mobile navbar. The mobile navbar has Language-Switch and User-Profile. You can swap out each of these parts individually. + +The Mobile language-Selection component key is `eThemeLeptonXComponents.MobileLanguageSelection`. + +The Mobile User-Profile component key is `eThemeLeptonXComponents.MobileUserProfile`. + + diff --git a/docs/en/Tutorials/Part-3.md b/docs/en/Tutorials/Part-3.md index c0c7c3f7c7..18ae29ae96 100644 --- a/docs/en/Tutorials/Part-3.md +++ b/docs/en/Tutorials/Part-3.md @@ -241,13 +241,7 @@ $(function () { { title: l('PublishDate'), data: "publishDate", - render: function (data) { - return luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(); - } + dataFormat: "datetime" }, { title: l('Price'), @@ -255,13 +249,7 @@ $(function () { }, { title: l('CreationTime'), data: "creationTime", - render: function (data) { - return luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(luxon.DateTime.DATETIME_SHORT); - } + dataFormat: "datetime" } ] }) @@ -439,13 +427,7 @@ $(function () { { title: l('PublishDate'), data: "publishDate", - render: function (data) { - return luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(); - } + dataFormat: "datetime" }, { title: l('Price'), @@ -453,13 +435,7 @@ $(function () { }, { title: l('CreationTime'), data: "creationTime", - render: function (data) { - return luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(luxon.DateTime.DATETIME_SHORT); - } + dataFormat: "datetime" } ] }) @@ -587,13 +563,7 @@ $(function () { { title: l('PublishDate'), data: "publishDate", - render: function (data) { - return luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(); - } + dataFormat: "datetime" }, { title: l('Price'), @@ -601,13 +571,7 @@ $(function () { }, { title: l('CreationTime'), data: "creationTime", - render: function (data) { - return luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(luxon.DateTime.DATETIME_SHORT); - } + dataFormat: "datetime" } ] }) diff --git a/docs/en/Tutorials/Todo/Index.md b/docs/en/Tutorials/Todo/Index.md index e373871183..c036b2068b 100644 --- a/docs/en/Tutorials/Todo/Index.md +++ b/docs/en/Tutorials/Todo/Index.md @@ -17,7 +17,7 @@ You can find the source code of the completed application [here](https://github. ## Pre-Requirements * An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 6.0+](https://dotnet.microsoft.com/download/dotnet) development. -* [Node v14.x](https://nodejs.org/) +* [Node v16.x](https://nodejs.org/) {{if DB=="Mongo"}} diff --git a/docs/en/Tutorials/Todo/Single-Layer/Index.md b/docs/en/Tutorials/Todo/Single-Layer/Index.md index 883a756cc7..b257ebbe01 100644 --- a/docs/en/Tutorials/Todo/Single-Layer/Index.md +++ b/docs/en/Tutorials/Todo/Single-Layer/Index.md @@ -17,7 +17,7 @@ You can find the source code of the completed application [here](https://github. ## Pre-Requirements * An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 6.0+](https://dotnet.microsoft.com/download/dotnet) development. -* [Node v14.x](https://nodejs.org/) +* [Node v16.x](https://nodejs.org/) {{if DB=="Mongo"}} diff --git a/docs/en/UI/Angular/Quick-Start.md b/docs/en/UI/Angular/Quick-Start.md index b487a1472b..e3f25ceb01 100644 --- a/docs/en/UI/Angular/Quick-Start.md +++ b/docs/en/UI/Angular/Quick-Start.md @@ -4,7 +4,7 @@ Please follow the steps below to prepare your development environment for Angular. -1. **Install Node.js:** Please visit [Node.js downloads page](https://nodejs.org/en/download/) and download proper Node.js v12 or v14 installer for your OS. An alternative is to install [NVM](https://github.com/nvm-sh/nvm) and use it to have multiple versions of Node.js in your operating system. +1. **Install Node.js:** Please visit [Node.js downloads page](https://nodejs.org/en/download/) and download proper Node.js v16 or v18 installer for your OS. An alternative is to install [NVM](https://github.com/nvm-sh/nvm) and use it to have multiple versions of Node.js in your operating system. 2. **[Optional] Install Yarn:** You may install Yarn v1 (not v2) following the instructions on [the installation page](https://classic.yarnpkg.com/en/docs/install). Yarn v1 delivers an arguably better developer experience compared to npm v6 and below. You may skip this step and work with npm, which is built-in in Node.js, instead. 3. **[Optional] Install VS Code:** [VS Code](https://code.visualstudio.com/) is a free, open-source IDE which works seamlessly with TypeScript. Although you can use any IDE including Visual Studio or Rider, VS Code will most likely deliver the best developer experience when it comes to Angular projects. ABP project templates even contain plugin recommendations for VS Code users, which VS Code will ask you to install when you open the Angular project folder. Here is a list of recommended extensions: - [Angular Language Service](https://marketplace.visualstudio.com/items?itemName=angular.ng-template) diff --git a/docs/en/UI/AspNetCore/JavaScript-API/Auth.md b/docs/en/UI/AspNetCore/JavaScript-API/Auth.md index 45af8c4b3e..b50e077ba6 100644 --- a/docs/en/UI/AspNetCore/JavaScript-API/Auth.md +++ b/docs/en/UI/AspNetCore/JavaScript-API/Auth.md @@ -20,5 +20,4 @@ if (abp.auth.isGranted('DeleteUsers')) { * ` abp.auth.isAnyGranted(...)`: Gets one or more permission/policy names and returns `true` if at least one of them has granted. * `abp.auth.areAllGranted(...)`: Gets one or more permission/policy names and returns `true` if all of them of them have granted. -* `abp.auth.policies`: This is an object where its keys are the permission/policy names. You can find all permission/policy names here. * `abp.auth.grantedPolicies`: This is an object where its keys are the permission/policy names. You can find the granted permission/policy names here. \ No newline at end of file diff --git a/docs/en/images/leptonxlite-toolbar-component.png b/docs/en/images/leptonxlite-toolbar-component.png new file mode 100644 index 0000000000..6076c20ff0 Binary files /dev/null and b/docs/en/images/leptonxlite-toolbar-component.png differ diff --git a/docs/zh-Hans/CLI.md b/docs/zh-Hans/CLI.md index f108bbcfec..3444b211ec 100644 --- a/docs/zh-Hans/CLI.md +++ b/docs/zh-Hans/CLI.md @@ -409,6 +409,7 @@ abp login # Allows you to enter your abp login -p # Specify the password as a parameter (password is visible) abp login --organization # If you have multiple organizations, you need set your active organization abp login -p -o # You can enter both your password and organization in the same command +abp login --device # Use device login flow ``` > 当使用-p参数,请注意,因为你的密码是可见的. 它对于CI / CD自动化管道很有用. diff --git a/docs/zh-Hans/Getting-Started-Setup-Environment.md b/docs/zh-Hans/Getting-Started-Setup-Environment.md index c0c2d5d924..8b6312d2da 100644 --- a/docs/zh-Hans/Getting-Started-Setup-Environment.md +++ b/docs/zh-Hans/Getting-Started-Setup-Environment.md @@ -21,7 +21,7 @@ * 一个集成开发环境 (比如: [Visual Studio](https://visualstudio.microsoft.com/vs/)) 它需要支持 [.NET 6.0+](https://dotnet.microsoft.com/download/dotnet) 的开发. {{ if UI != "Blazor" }} -* [Node v12 或 v14](https://nodejs.org/) +* [Node v16 或 v18](https://nodejs.org/) * [Yarn v1.20+ (不是v2)](https://classic.yarnpkg.com/en/docs/install) [1](#f-yarn) 或 npm v6+ (已跟随Node一起安装) {{ end }} {{ if Tiered == "Yes" }} diff --git a/docs/zh-Hans/SMS-Sending.md b/docs/zh-Hans/SMS-Sending.md new file mode 100644 index 0000000000..5c3c111656 --- /dev/null +++ b/docs/zh-Hans/SMS-Sending.md @@ -0,0 +1,111 @@ +# 短信发送 + +ABP 框架提供一个用于发送短信的抽象, 有如下优点: + +- 在不改变应用程序代码的情况下, 你可以**非常容易地切换**短信发送提供者(提供商). +- 如果你想创建可重用的应用程序模块, 则不需要假设短信是如何发送的. + +## 安装 + +建议你使用[ABP CLI](CLI.md)来安装这个包. + +### 使用Abp CLI + +在项目所在目录(.csproj 文件所在目录)打开命令行工具, 输入如下命令: + +```bash +abp add-package Volo.Abp.Sms +``` + +### 手动安装 + +如果你想要手动安装； + +1. 添加 [Volo.Abp.Sms](https://www.nuget.org/packages/Volo.Abp.Sms) NuGet 包到你的项目中: + +``` +Install-Package Volo.Abp.Sms +``` + +2. 在你的模块的依赖列表中添加对模块`AbpSmsModule`的依赖: + +```csharp +[DependsOn( + //...其它依赖 + typeof(AbpSmsModule) //添加新模块的依赖 + )] +public class YourModule : AbpModule +{ +} +``` + +## 发送短信 + +[注入](Dependency-Injection.md) `ISmsSender`, 并使用`SendAsync`方法来发送短信. + +**例子:** + +```csharp +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Sms; + +namespace MyProject +{ + public class MyService : ITransientDependency + { + private readonly ISmsSender _smsSender; + + public MyService(ISmsSender smsSender) + { + _smsSender = smsSender; + } + + public async Task DoItAsync() + { + await _smsSender.SendAsync( + "+012345678901", // 目标手机号 + "This is test sms..." // 消息内容 + ); + } + } +} +``` + +示例中给定的`SendAsync`方法是一个扩展方法, 用于发送带有基本参数的短信.此外, 你也可以传入一个有如下属性的`SmsMessage`对象: + +- `PhoneNumber` (`string`):目标手机号 +- `Text` (`string`):短信消息内容 +- `Properties` (`Dictionary`):用于传入自定义参数的键值对 + +## NullSmsSender + +`NullSmsSender`是`ISmsSender`的一个默认实现.它写入内容到[日志](Logging.md)中, 而不是真正地发送短信. + +开发时, 你不想真正地发送短信时, 这个类是非常有用的.**然而, 若你想真实发送短信, 你需要在你的应用程序代码中实现`ISmsSender`接口.** + +## 实现ISmsSender接口 + +通过创建一个实现`ISmsSender`接口的类, 你可以很容易创建你自己的短信发送实现, 如下所示: + +```csharp +using System.IO; +using System.Threading.Tasks; +using Volo.Abp.Sms; +using Volo.Abp.DependencyInjection; + +namespace AbpDemo +{ + public class MyCustomSmsSender : ISmsSender, ITransientDependency + { + public async Task SendAsync(SmsMessage smsMessage) + { + // 发送短信 + } + } +} +``` + +## More + +[ABP Commercial](https://commercial.abp.io/)提供Twilio的集成包, 用于使用[Twilio service](https://docs.abp.io/en/commercial/latest/modules/twilio-sms)来发送短信. diff --git a/docs/zh-Hans/Tutorials/Todo/Index.md b/docs/zh-Hans/Tutorials/Todo/Index.md index 2200bf23e6..9e98eb0a0a 100644 --- a/docs/zh-Hans/Tutorials/Todo/Index.md +++ b/docs/zh-Hans/Tutorials/Todo/Index.md @@ -26,7 +26,7 @@ {{if UI=="NG"}} -* [Node v14.x](https://nodejs.org/) +* [Node v16.x](https://nodejs.org/) {{end}} diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj index 439bdc2c65..bfe8b1d37b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Authentication.JwtBearer Volo.Abp.AspNetCore.Authentication.JwtBearer $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj b/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj index 19420e4c11..562e559273 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Authentication.OAuth Volo.Abp.AspNetCore.Authentication.OAuth $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj index e7810f6e37..4ee09824cf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj index aad7755a37..c632120d73 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Library true diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj index 2cdbb63404..09c743bc2a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Library true diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj index 2ae2151e57..d0abc31cdc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj index f8f4d5702c..bc975f9f92 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj index e835daf343..e310f4a2e2 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj index 8825a88626..5ddfd202a5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Components.WebAssembly Volo.Abp.AspNetCore.Components.WebAssembly $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj b/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj index acd1ff5408..79d67f8b57 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Components Volo.Abp.AspNetCore.Components $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj index 41127ef197..ac7d3eb556 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.MultiTenancy Volo.Abp.AspNetCore.MultiTenancy $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj index 5805e19376..2e5a66d740 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Mvc.Client Volo.Abp.AspNetCore.Mvc.Client $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationAuthConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationAuthConfigurationDto.cs index be5a022b01..3b94ea0b72 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationAuthConfigurationDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationAuthConfigurationDto.cs @@ -6,13 +6,10 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; [Serializable] public class ApplicationAuthConfigurationDto { - public Dictionary Policies { get; set; } - public Dictionary GrantedPolicies { get; set; } public ApplicationAuthConfigurationDto() { - Policies = new Dictionary(); GrantedPolicies = new Dictionary(); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj index 78b46cad27..e1ede9fe69 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 enable enable diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj index d792a30b24..0c72d5acc5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 enable enable diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj index 0cb4998d07..75b09d631b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Bootstrap Volo.Abp.AspNetCore.Mvc.UI.Bootstrap diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.csproj index e7e3708a73..97d5b8b2a3 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj index 31842572e1..535a907335 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Bundling Volo.Abp.AspNetCore.Mvc.UI.Bundling diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj index 15ea7f6eae..ed68be0443 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en-GB.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en-GB.json index e93e7ef25e..0e526b3df6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en-GB.json +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en-GB.json @@ -1,7 +1,7 @@ { "culture": "en-GB", "texts": { - "GivenTenantIsNotExist": "Given tenant is not exist: {0}", + "GivenTenantIsNotExist": "Given tenant does not exist: {0}", "GivenTenantIsNotAvailable": "Given tenant is not available: {0}", "Tenant": "Tenant", "Switch": "switch", diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj index f797dc9cfe..26bcc85cf7 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Packages Volo.Abp.AspNetCore.Mvc.UI.Packages diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj index 0fea391a07..cad3da097a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo @@ -26,7 +26,7 @@ - + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj index 04d37045f2..40f95d10c9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js index f87b7c27b1..47e89dcaae 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js @@ -36,7 +36,7 @@ var abp = abp || {}; var $a = $(''); if (fieldItem.displayNameHtml) { - $a.html(fieldItem.text); + $a.html(abp.utils.isFunction(fieldItem.text) ? fieldItem.text(record, tableInstance) : fieldItem.text); } else { if (fieldItem.icon !== undefined && fieldItem.icon) { @@ -45,7 +45,7 @@ var abp = abp || {}; $a.append($("").addClass(fieldItem.iconClass + " me-1")); } - $a.append(htmlEncode(fieldItem.text)); + $a.append(htmlEncode(abp.utils.isFunction(fieldItem.text) ? fieldItem.text(record, tableInstance) : fieldItem.text)); } if (fieldItem.action) { @@ -81,14 +81,14 @@ var abp = abp || {}; var $button = $(''); if (firstItem.displayNameHtml) { - $button.html(firstItem.text); + $button.html(abp.utils.isFunction(firstItem.text) ? firstItem.text(record, tableInstance) : firstItem.text); } else { if (firstItem.icon !== undefined && firstItem.icon) { $button.append($("").addClass("fa fa-" + firstItem.icon + " me-1")); } else if (firstItem.iconClass) { $button.append($("").addClass(firstItem.iconClass + " me-1")); } - $button.append(htmlEncode(firstItem.text)); + $button.append(htmlEncode(abp.utils.isFunction(firstItem.text) ? firstItem.text(record, tableInstance) : firstItem.text)); } if (firstItem.enabled && !firstItem.enabled({ record: record, table: tableInstance })) { @@ -132,7 +132,7 @@ var abp = abp || {}; } if (field.text) { - $dropdownButton.append(htmlEncode(field.text)); + $dropdownButton.append(htmlEncode(abp.utils.isFunction(field.text) ? field.text(record, tableInstance) : field.text)); } else { $dropdownButton.append(htmlEncode(localize("DatatableActionDropdownDefaultText"))); } @@ -272,7 +272,7 @@ var abp = abp || {}; } }); - //Delay for processing indicator + //Delay for processing indicator var defaultDelayForProcessingIndicator = 500; var _existingDefaultFnPreDrawCallback = $.fn.dataTable.defaults.fnPreDrawCallback; $.extend(true, diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj index f03f8ab250..cbb3d106a1 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Widgets Volo.Abp.AspNetCore.Mvc.UI.Widgets diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj index 887843eb03..1975ba8a67 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI Volo.Abp.AspNetCore.Mvc.UI diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj index 9113c4529e..46baa07c19 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc Volo.Abp.AspNetCore.Mvc diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs index 0deae4b5b3..4254b5479f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs @@ -185,8 +185,6 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp foreach (var policyName in otherPolicyNames) { - authConfig.Policies[policyName] = true; - if (await _authorizationService.IsGrantedAsync(policyName)) { authConfig.GrantedPolicies[policyName] = true; @@ -196,7 +194,6 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp var result = await _permissionChecker.IsGrantedAsync(abpPolicyNames.ToArray()); foreach (var (key, value) in result.Result) { - authConfig.Policies[key] = true; if (value == PermissionGrantResult.Granted) { authConfig.GrantedPolicies[key] = true; @@ -228,10 +225,10 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp foreach (var resourceName in resourceNames) { var dictionary = new Dictionary(); - + var localizer = await StringLocalizerFactory .CreateByResourceNameOrNullAsync(resourceName); - + if (localizer != null) { foreach (var localizedString in await localizer.GetAllStringsAsync()) diff --git a/framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj b/framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj index 7e9e4f01a9..07ed436526 100644 --- a/framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Serilog Volo.Abp.AspNetCore.Serilog $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj index 3a39bdc5f8..8d427a5f21 100644 --- a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj +++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.SignalR Volo.Abp.AspNetCore.SignalR $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj index b3a7a89ad8..07e3a08920 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj +++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.TestBase Volo.Abp.AspNetCore.TestBase $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj index a87b69eb19..aa1090e204 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj +++ b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore Volo.Abp.AspNetCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs index 583b12efcb..0245cf11bc 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs @@ -1,6 +1,8 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; using Volo.Abp.DependencyInjection; @@ -8,6 +10,13 @@ namespace Volo.Abp.AspNetCore.Security; public class AbpSecurityHeadersMiddleware : IMiddleware, ITransientDependency { + public IOptions Options { get; set; } + + public AbpSecurityHeadersMiddleware(IOptions options) + { + Options = options; + } + public async Task InvokeAsync(HttpContext context, RequestDelegate next) { /*X-Content-Type-Options header tells the browser to not try and “guess” what a mimetype of a resource might be, and to just take what mimetype the server has returned as fact.*/ @@ -22,6 +31,14 @@ public class AbpSecurityHeadersMiddleware : IMiddleware, ITransientDependency /*The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised in the Content-Type headers should be followed and not be changed. The header allows you to avoid MIME type sniffing by saying that the MIME types are deliberately configured.*/ AddHeaderIfNotExists(context, "X-Content-Type-Options", "nosniff"); + if (Options.Value.UseContentSecurityPolicyHeader) + { + AddHeaderIfNotExists(context, "Content-Security-Policy", + Options.Value.ContentSecurityPolicyValue.IsNullOrEmpty() + ? "object-src 'none'; form-action 'self'; frame-ancestors 'none'" + : Options.Value.ContentSecurityPolicyValue); + } + await next.Invoke(context); } diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersOptions.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersOptions.cs new file mode 100644 index 0000000000..198a62723c --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersOptions.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.AspNetCore.Security; + +public class AbpSecurityHeadersOptions +{ + public bool UseContentSecurityPolicyHeader { get; set; } + + public string ContentSecurityPolicyValue { get; set; } +} diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj index 32f9da017c..f1408e38e2 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj +++ b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj @@ -21,7 +21,7 @@ - + diff --git a/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj index d1a8eb55ae..034c5c1903 100644 --- a/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj +++ b/framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj index fdbe00fbd8..95242dfd92 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj +++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj b/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj index 90d58c71f8..cd20d43162 100644 --- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj +++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.BlobStoring.Minio Volo.Abp.BlobStoring.Minio $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj index 2e36b1cef0..d1faed8f5c 100644 --- a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj +++ b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj b/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj index 62aebd1056..4022d38fee 100644 --- a/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj +++ b/framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index 7aba9ae849..fefa8552b3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -66,6 +66,9 @@ public class AbpCliCoreModule : AbpModule options.Commands[InstallLibsCommand.Name] = typeof(InstallLibsCommand); options.Commands[CleanCommand.Name] = typeof(CleanCommand); options.Commands[CliCommand.Name] = typeof(CliCommand); + + options.DisabledModulesToAddToSolution.Add("Volo.Abp.LeptonXTheme.Pro"); + options.DisabledModulesToAddToSolution.Add("Volo.Abp.LeptonXTheme.Lite"); }); Configure(options => diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs index 3068016f33..25d76c79d9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs @@ -7,6 +7,8 @@ public class AbpCliOptions { public Dictionary Commands { get; } + public List DisabledModulesToAddToSolution { get; set; } + /// /// Default value: true. /// @@ -22,5 +24,6 @@ public class AbpCliOptions public AbpCliOptions() { Commands = new Dictionary(StringComparer.OrdinalIgnoreCase); + DisabledModulesToAddToSolution = new(); } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index df81fe4cb7..5a5589e7c5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -4,6 +4,7 @@ using System.Text; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule; using Volo.Abp.Cli.ProjectModification; @@ -14,6 +15,7 @@ namespace Volo.Abp.Cli.Commands; public class AddModuleCommand : IConsoleCommand, ITransientDependency { + private readonly AbpCliOptions _options; public const string Name = "add-module"; private AddModuleInfoOutput _lastAddedModuleInfo; @@ -33,8 +35,12 @@ public class AddModuleCommand : IConsoleCommand, ITransientDependency } } - public AddModuleCommand(SolutionModuleAdder solutionModuleAdder, SolutionPackageVersionFinder solutionPackageVersionFinder) + public AddModuleCommand( + SolutionModuleAdder solutionModuleAdder, + SolutionPackageVersionFinder solutionPackageVersionFinder, + IOptions options) { + _options = options.Value; SolutionModuleAdder = solutionModuleAdder; SolutionPackageVersionFinder = solutionPackageVersionFinder; Logger = NullLogger.Instance; @@ -50,6 +56,13 @@ public class AddModuleCommand : IConsoleCommand, ITransientDependency GetUsageInfo() ); } + + if (_options.DisabledModulesToAddToSolution.Contains(commandLineArgs.Target)) + { + throw new CliUsageException( + $"{commandLineArgs.Target} Module is not available for this command! You can check the module's documentation for more info." + ); + } var newTemplate = commandLineArgs.Options.ContainsKey(Options.NewTemplate.Long); var template = commandLineArgs.Options.GetOrNull(Options.Template.Short, Options.Template.Long); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs index 060262eb93..73198c93bc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs @@ -14,6 +14,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Newtonsoft.Json.Linq; using NuGet.Versioning; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Auth; using Volo.Abp.Cli.Commands.Services; using Volo.Abp.Cli.Http; using Volo.Abp.Cli.NuGet; @@ -32,6 +33,7 @@ public class SuiteCommand : IConsoleCommand, ITransientDependency public ICmdHelper CmdHelper { get; } private readonly AbpNuGetIndexUrlService _nuGetIndexUrlService; private readonly NuGetService _nuGetService; + private readonly AuthService _authService; private readonly CliHttpClientFactory _cliHttpClientFactory; private const string SuitePackageName = "Volo.Abp.Suite"; public ILogger Logger { get; set; } @@ -42,17 +44,28 @@ public class SuiteCommand : IConsoleCommand, ITransientDependency AbpNuGetIndexUrlService nuGetIndexUrlService, NuGetService nuGetService, ICmdHelper cmdHelper, + AuthService authService, CliHttpClientFactory cliHttpClientFactory) { CmdHelper = cmdHelper; _nuGetIndexUrlService = nuGetIndexUrlService; _nuGetService = nuGetService; + _authService = authService; _cliHttpClientFactory = cliHttpClientFactory; Logger = NullLogger.Instance; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) { +#if !DEBUG + var loginInfo = await _authService.GetLoginInfoAsync(); + + if (string.IsNullOrEmpty(loginInfo?.Organization)) + { + throw new CliUsageException("Please login with your account."); + } +#endif + var operationType = NamespaceHelper.NormalizeNamespace(commandLineArgs.Target); var preview = commandLineArgs.Options.ContainsKey(Options.Preview.Short) || @@ -534,4 +547,4 @@ public class SuiteCommand : IConsoleCommand, ITransientDependency } } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs index 9db889d908..af3c37c14f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs @@ -117,12 +117,13 @@ public class ProjectReferenceReplaceStep : ProjectBuildPipelineStep var oldNodeIncludeValue = oldNode.Attributes["Include"].Value; // ReSharper disable once PossibleNullReferenceException : Can not be null because nodes are selected with include attribute filter in previous method - if (oldNodeIncludeValue.Contains(_projectName)) + if (oldNodeIncludeValue.Contains(_projectName) && _isMicroserviceServiceTemplate) { - if (_isMicroserviceServiceTemplate || _entries.Any(e => e.Name.EndsWith(GetProjectNameWithExtensionFromProjectReference(oldNodeIncludeValue)))) - { - continue; - } + continue; + } + if(_entries.Any(e => e.Name.EndsWith(GetProjectNameWithExtensionFromProjectReference(oldNodeIncludeValue)))) + { + continue; } XmlNode newNode = GetNewReferenceNode(doc, oldNodeIncludeValue); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index d199aeb663..2ffa12bca7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -163,6 +163,7 @@ public abstract class AppTemplateBase : TemplateInfo if (context.BuildArgs.MobileApp == MobileApp.Maui) { steps.Add(new MauiChangeApplicationIdGuidStep()); + steps.Add(new MauiChangePortStep()); } else { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Maui/MauiChangePortStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Maui/MauiChangePortStep.cs new file mode 100644 index 0000000000..2b45d64b19 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Maui/MauiChangePortStep.cs @@ -0,0 +1,80 @@ +using System; +using System.Linq; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding.Templates.Maui; + +public class MauiChangePortStep : ProjectBuildPipelineStep +{ + public override void Execute(ProjectBuildContext context) + { + var appsettingsFile = context.Files.FirstOrDefault(x => + !x.IsDirectory && + x.Name.EndsWith("aspnet-core/src/MyCompanyName.MyProjectName.Maui/appsettings.json", + StringComparison.InvariantCultureIgnoreCase) + ); + + if (appsettingsFile == null) + { + return; + } + + var ports = GetPorts(context); + + appsettingsFile.NormalizeLineEndings(); + var lines = appsettingsFile.GetLines(); + + for (var i = 1; i < lines.Length; i++) + { + var line = lines[i]; + var previousLine = lines[i-1]; + + if (line.Contains("Authority") && line.Contains("localhost")) + { + line = line.Replace("44305", ports.AuthServerPort); + } + else if (previousLine.Contains("Default") && line.Contains("BaseUrl") && line.Contains("localhost")) + { + line = line.Replace("44305", ports.ApiHostPort); + } + + lines[i] = line; + } + + appsettingsFile.SetLines(lines); + } + + private (string AuthServerPort, string ApiHostPort) GetPorts(ProjectBuildContext context) + { + var authServerPort = string.Empty; + var apiHostPort = string.Empty; + + switch (context.BuildArgs.UiFramework) + { + case UiFramework.Angular: + case UiFramework.Blazor: + authServerPort = "44305"; + apiHostPort = "44305"; + break; + case UiFramework.BlazorServer: + authServerPort = "44308"; + apiHostPort = "44308"; + break; + case UiFramework.Mvc: + case UiFramework.NotSpecified: + authServerPort = "44303"; + apiHostPort = "44303"; + break; + } + + if (context.BuildArgs.ExtraProperties.ContainsKey("separate-identity-server") || + context.BuildArgs.ExtraProperties.ContainsKey("separate-auth-server") || + context.BuildArgs.ExtraProperties.ContainsKey("tiered")) + { + authServerPort = "44301"; + apiHostPort = "44300"; + } + + return (authServerPort, apiHostPort); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index 2a55a3f422..897899f9ad 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -5,7 +5,7 @@ Exe - net6.0 + net7.0 true abp @@ -18,7 +18,7 @@ - + diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj index 4e79126174..e208ecf533 100644 --- a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj +++ b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj @@ -15,10 +15,10 @@ - + - - + + diff --git a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj index 63dfccb23e..e4236d697c 100644 --- a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj +++ b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Dapper Volo.Abp.Dapper $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj index d3a8651086..ab079747e9 100644 --- a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj +++ b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 enable enable diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs index 0f930d1f70..45729fcb86 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs @@ -1,4 +1,6 @@ -using System.Threading.Tasks; +using System; +using System.Linq; +using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; @@ -25,13 +27,31 @@ public class DataSeeder : IDataSeeder, ITransientDependency { using (var scope = ServiceScopeFactory.CreateScope()) { - foreach (var contributorType in Options.Contributors) + if (context.Properties.ContainsKey(DataSeederExtensions.SeedInSeparateUow)) { - var contributor = (IDataSeedContributor)scope - .ServiceProvider - .GetRequiredService(contributorType); + var manager = scope.ServiceProvider.GetRequiredService(); + foreach (var contributorType in Options.Contributors) + { + var options = context.Properties.TryGetValue(DataSeederExtensions.SeedInSeparateUowOptions, out var uowOptions) + ? (AbpUnitOfWorkOptions) uowOptions + : new AbpUnitOfWorkOptions(); + var requiresNew = context.Properties.TryGetValue(DataSeederExtensions.SeedInSeparateUowRequiresNew, out var obj) && (bool) obj; - await contributor.SeedAsync(context); + using (var uow = manager.Begin(options, requiresNew)) + { + var contributor = (IDataSeedContributor)scope.ServiceProvider.GetRequiredService(contributorType); + await contributor.SeedAsync(context); + await uow.CompleteAsync(); + } + } + } + else + { + foreach (var contributorType in Options.Contributors) + { + var contributor = (IDataSeedContributor)scope.ServiceProvider.GetRequiredService(contributorType); + await contributor.SeedAsync(context); + } } } } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs index 83fa974d85..bd17736b46 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs @@ -1,12 +1,26 @@ using System; using System.Threading.Tasks; +using Volo.Abp.Uow; namespace Volo.Abp.Data; public static class DataSeederExtensions { + public const string SeedInSeparateUow = "__SeedInSeparateUow"; + public const string SeedInSeparateUowOptions = "__SeedInSeparateUowOptions"; + public const string SeedInSeparateUowRequiresNew = "__SeedInSeparateUowRequiresNew"; + public static Task SeedAsync(this IDataSeeder seeder, Guid? tenantId = null) { return seeder.SeedAsync(new DataSeedContext(tenantId)); } + + public static Task SeedInSeparateUowAsync(this IDataSeeder seeder, Guid? tenantId = null, AbpUnitOfWorkOptions options = null, bool requiresNew = false) + { + var context = new DataSeedContext(tenantId); + context.WithProperty(SeedInSeparateUow, true); + context.WithProperty(SeedInSeparateUowOptions, options); + context.WithProperty(SeedInSeparateUowRequiresNew, requiresNew); + return seeder.SeedAsync(context); + } } diff --git a/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj b/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj index 80cad677a3..4adc11cef7 100644 --- a/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj +++ b/framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 enable enable diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj index f801add281..e15adae9b2 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore.MySQL Volo.Abp.EntityFrameworkCore.MySQL $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj index 16c619ffee..3df271284f 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore.Oracle.Devart Volo.Abp.EntityFrameworkCore.Oracle.Devart $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj index 5a0a11b6ad..1db66e7771 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore.Oracle Volo.Abp.EntityFrameworkCore.Oracle $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj index ec983f6891..275e01526b 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore.PostgreSql Volo.Abp.EntityFrameworkCore.PostgreSql $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj index cdd059825f..f655b66814 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore.SqlServer Volo.Abp.EntityFrameworkCore.SqlServer $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj index 70cce89a19..002b876343 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore.Sqlite Volo.Abp.EntityFrameworkCore.Sqlite $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj b/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj index d4b9814879..c547299bae 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.EntityFrameworkCore Volo.Abp.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index fd998510af..6e151d287f 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -618,8 +618,6 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, return; } - var dateTimeValueConverter = new AbpDateTimeValueConverter(Clock); - var dateTimePropertyInfos = typeof(TEntity).GetProperties() .Where(property => (property.PropertyType == typeof(DateTime) || @@ -633,7 +631,9 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, modelBuilder .Entity() .Property(property.Name) - .HasConversion(dateTimeValueConverter); + .HasConversion(property.PropertyType == typeof(DateTime) + ? new AbpDateTimeValueConverter(Clock) + : new AbpNullableDateTimeValueConverter(Clock)); }); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs index c5ebe79ff8..17513d46a2 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs @@ -5,9 +5,19 @@ using Volo.Abp.Timing; namespace Volo.Abp.EntityFrameworkCore.ValueConverters; -public class AbpDateTimeValueConverter : ValueConverter +public class AbpDateTimeValueConverter : ValueConverter { public AbpDateTimeValueConverter(IClock clock, [CanBeNull] ConverterMappingHints mappingHints = null) + : base( + x => clock.Normalize(x), + x => clock.Normalize(x), mappingHints) + { + } +} + +public class AbpNullableDateTimeValueConverter : ValueConverter +{ + public AbpNullableDateTimeValueConverter(IClock clock, [CanBeNull] ConverterMappingHints mappingHints = null) : base( x => x.HasValue ? clock.Normalize(x.Value) : x, x => x.HasValue ? clock.Normalize(x.Value) : x, mappingHints) diff --git a/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj b/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj index 2bef3f9dc9..95cd73dbfd 100644 --- a/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj +++ b/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 enable enable diff --git a/framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj b/framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj index cc55a077c4..b1d60e60c7 100644 --- a/framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj +++ b/framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj b/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj index 909fb156c8..610203dae5 100644 --- a/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj +++ b/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 enable enable diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj index 2e34b17747..4fc1525e59 100644 --- a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj +++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Http.Client.IdentityModel.Web Volo.Abp.Http.Client.IdentityModel.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj index 323d877f05..e98f5d92ff 100644 --- a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj +++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Http.Client.IdentityModel.WebAssembly Volo.Abp.Http.Client.IdentityModel.WebAssembly $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.csproj b/framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.csproj index d7651c7b6d..68bbbd1157 100644 --- a/framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.csproj +++ b/framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Http.Client.Web Volo.Abp.Http.Client.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs index e63ab4a6d7..642cd07a84 100644 --- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs +++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs @@ -174,7 +174,6 @@ public static class ModuleExtensionConfigurationHelper property.DefaultValue = propertyConfig.DefaultValue; property.DefaultValueFactory = propertyConfig.DefaultValueFactory; property.Lookup = propertyConfig.UI.Lookup; - property.Configuration.Clear(); foreach (var configuration in propertyConfig.Configuration) { property.Configuration[configuration.Key] = configuration.Value; diff --git a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj index 8be7bbd01b..bbfce19981 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj +++ b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Swashbuckle Volo.Abp.Swashbuckle $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.csproj b/framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.csproj index f098ecc80d..670502cdb7 100644 --- a/framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.csproj +++ b/framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj b/framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj index adba125cd3..64425620dc 100644 --- a/framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj +++ b/framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj @@ -17,7 +17,7 @@ - + diff --git a/framework/test/AbpTestBase/AbpTestBase.csproj b/framework/test/AbpTestBase/AbpTestBase.csproj index f6fa9793cc..96c8860ac0 100644 --- a/framework/test/AbpTestBase/AbpTestBase.csproj +++ b/framework/test/AbpTestBase/AbpTestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 AbpTestBase AbpTestBase diff --git a/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj b/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj index 6762cf2e53..6863fb0242 100644 --- a/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj +++ b/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 @@ -18,7 +18,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj index 05435e64d6..569064de96 100644 --- a/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 latest Volo.Abp.AspNetCore.Authentication.OAuth.Tests Volo.Abp.AspNetCore.Authentication.OAuth.Tests diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj index bda5373e69..67952c736a 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.MultiTenancy.Tests Volo.Abp.AspNetCore.MultiTenancy.Tests diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj index d917afa97f..2d39963d3d 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Library true true diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj index 53a9bd3747..5cc7aa3857 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; Volo.Abp.AspNetCore.Mvc.Tests Volo.Abp.AspNetCore.Mvc.Tests diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs index 5a0f0b3395..fdfda83ac9 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs @@ -1,12 +1,25 @@ using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Shouldly; +using Volo.Abp.AspNetCore.Security; using Xunit; namespace Volo.Abp.AspNetCore.Mvc.Security.Headers; public class SecurityHeadersTestController_Tests : AspNetCoreMvcTestBase { + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) + { + services.Configure(options => + { + options.UseContentSecurityPolicyHeader = true; + }); + + base.ConfigureServices(context, services); + } + [Fact] public async Task SecurityHeaders_Should_Be_Added() { @@ -14,5 +27,7 @@ public class SecurityHeadersTestController_Tests : AspNetCoreMvcTestBase responseMessage.Headers.ShouldContain(x => x.Key == "X-Content-Type-Options" & x.Value.First().ToString() == "nosniff"); responseMessage.Headers.ShouldContain(x => x.Key == "X-XSS-Protection" & x.Value.First().ToString() == "1; mode=block"); responseMessage.Headers.ShouldContain(x => x.Key == "X-Frame-Options" & x.Value.First().ToString() == "SAMEORIGIN"); + responseMessage.Headers.ShouldContain(x => x.Key == "X-Content-Type-Options" & x.Value.First().ToString() == "nosniff"); + responseMessage.Headers.ShouldContain(x => x.Key == "Content-Security-Policy" & x.Value.First().ToString() == "object-src 'none'; form-action 'self'; frame-ancestors 'none'"); } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs index e26e6ce2c3..ad4a222c33 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs @@ -16,10 +16,10 @@ public class Startup var hostEnvironment = services.GetHostingEnvironment(); #if DEBUG var plugDllInPath = Path.Combine(hostEnvironment.ContentRootPath, - @"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Debug\net6.0\"); + @"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Debug\net7.0\"); #else plugDllInPath = Path.Combine(_env.ContentRootPath, - @"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Release\net6.0\"); + @"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Release\net7.0\"); #endif options.PlugInSources.AddFolder(plugDllInPath); diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj index 7519c6a787..393e967adf 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; Volo.Abp.AspNetCore.Mvc.UI.Tests Volo.Abp.AspNetCore.Mvc.UI.Tests diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj index e18e2d0829..ad0eecce03 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj index 3c26bc0184..a32ff29516 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; Volo.Abp.AspNetCore.Mvc.Versioning.Tests Volo.Abp.AspNetCore.Mvc.Versioning.Tests diff --git a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj index 18f7107cfd..f5f0315929 100644 --- a/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Serilog.Tests Volo.Abp.AspNetCore.Serilog.Tests diff --git a/framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj index 89765ecd2e..4636f88c7f 100644 --- a/framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj index 44a6ee9a5b..4c5beb1de7 100644 --- a/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Tests Volo.Abp.AspNetCore.Tests true diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj b/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj index 4e3fc4d3f7..fd4fe16eb9 100644 --- a/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj +++ b/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.Auditing.Tests Volo.Abp.Auditing.Tests true diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/JsonNetAuditSerializer_Test.cs b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/JsonNetAuditSerializer_Test.cs index 1dc3fcf839..4de7881cac 100644 --- a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/JsonNetAuditSerializer_Test.cs +++ b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/JsonNetAuditSerializer_Test.cs @@ -8,13 +8,6 @@ namespace Volo.Abp.Auditing; public class JsonNetAuditSerializer_Test : AbpAuditingTestBase { - private readonly JsonNetAuditSerializer _jsonNetAuditSerializer; - - public JsonNetAuditSerializer_Test() - { - _jsonNetAuditSerializer = GetRequiredService(); - } - protected override void AfterAddApplication(IServiceCollection services) { services.Configure(options => @@ -34,7 +27,7 @@ public class JsonNetAuditSerializer_Test : AbpAuditingTestBase {"input2", new Input2Dto {UserName = "admin", Password = "1q2w3E*", Birthday = DateTime.Now}} }; - var str = _jsonNetAuditSerializer.Serialize(arguments); + var str = GetRequiredService().Serialize(arguments); str.ShouldNotContain("IdCard"); str.ShouldNotContain("1q2w3E*"); diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj index f0ec4953f5..eea95c887a 100644 --- a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.Authorization.Tests Volo.Abp.Authorization.Tests true diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj b/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj index 383277717b..585192dce3 100644 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.AutoMapper.Tests Volo.Abp.AutoMapper.Tests diff --git a/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj b/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj index 5d4e88e18f..3685ddb9d0 100644 --- a/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj +++ b/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.Autofac.Tests Volo.Abp.Autofac.Tests true diff --git a/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj b/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj index 7eeb7359e2..11b8b39864 100644 --- a/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj +++ b/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.BackgroundJobs.Tests Volo.Abp.BackgroundJobs.Tests diff --git a/framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj index b31678d56b..00d58302bd 100644 --- a/framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj +++ b/framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 9f0d2c00-80c1-435b-bfab-2c39c8249091 @@ -12,7 +12,7 @@ - + diff --git a/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj index 935a3cc0ec..be778dbfde 100644 --- a/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj +++ b/framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 9f0d2c00-80c1-435b-bfab-2c39c8249091 diff --git a/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj index 90df4dbd00..e332f922b0 100644 --- a/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj +++ b/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 9f0d2c00-80c1-435b-bfab-2c39c8249091 diff --git a/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.csproj index 05568e46a3..f2aa172a60 100644 --- a/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.csproj +++ b/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.csproj index 4d47f1af72..db79d126cd 100644 --- a/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.csproj +++ b/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 9f0d2c00-80c1-435b-bfab-2c39c8249091 diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj index 0eba37644c..86004b8d29 100644 --- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj +++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.csproj b/framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.csproj index 2804ae395a..9686fe4253 100644 --- a/framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.csproj +++ b/framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj b/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj index 907388b083..5827f21b9c 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj +++ b/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Volo.Abp.Caching.Tests Volo.Abp.Caching.Tests diff --git a/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj b/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj index 44d6527daf..35db882572 100644 --- a/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj +++ b/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj b/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj index dee24c99d6..eab8d36faa 100644 --- a/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj b/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj index 0f00d385b2..b0d7c525d7 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj +++ b/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.csproj b/framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.csproj index 72948eebf8..f5be5aff5a 100644 --- a/framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.csproj +++ b/framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj b/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj index 1a42dd1bfc..ae175956ae 100644 --- a/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj +++ b/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/DataSeederExtensions_Tests.cs b/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/DataSeederExtensions_Tests.cs new file mode 100644 index 0000000000..25d20b58b5 --- /dev/null +++ b/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/DataSeederExtensions_Tests.cs @@ -0,0 +1,43 @@ +using System; +using System.Data; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using NSubstitute; +using Volo.Abp.Modularity; +using Volo.Abp.Testing; +using Volo.Abp.Uow; +using Xunit; + +namespace Volo.Abp.Data; + +public class DataSeederExtensions_Tests : AbpIntegratedTest +{ + private IDataSeeder _dataSeeder; + + protected override void AfterAddApplication(IServiceCollection services) + { + _dataSeeder = Substitute.For(); + services.Replace(ServiceDescriptor.Singleton(_dataSeeder)); + base.AfterAddApplication(services); + } + + [Fact] + public void SeedInSeparateUowAsync() + { + var tenantId = Guid.NewGuid(); + _dataSeeder.SeedInSeparateUowAsync(tenantId, new AbpUnitOfWorkOptions(true, IsolationLevel.Serializable, 888), true); + + _dataSeeder.Received().SeedAsync(Arg.Is(x => x.TenantId == tenantId && + x.Properties[DataSeederExtensions.SeedInSeparateUow].To() == true && + x.Properties[DataSeederExtensions.SeedInSeparateUowOptions].As().IsTransactional == true && + x.Properties[DataSeederExtensions.SeedInSeparateUowOptions].As().IsolationLevel == IsolationLevel.Serializable && + x.Properties[DataSeederExtensions.SeedInSeparateUowOptions].As().Timeout == 888 && + x.Properties[DataSeederExtensions.SeedInSeparateUowRequiresNew].To() == true)); + } + + [DependsOn(typeof(AbpDataModule))] + public class TestModule : AbpModule + { + + } +} diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj b/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj index b6a478866f..ce26f12583 100644 --- a/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj +++ b/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.csproj b/framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.csproj index 8194846f0c..2d12d5a63b 100644 --- a/framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.csproj +++ b/framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj index 16612c2365..f900a8f1ce 100644 --- a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.csproj b/framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.csproj index 1e3dd32be7..d09d2a25b4 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.csproj +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true true diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj index a463929d6c..15943cde6c 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/UnitTestModelCacheKeyFactory.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/UnitTestModelCacheKeyFactory.cs index e29f28d148..b5c3d96485 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/UnitTestModelCacheKeyFactory.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/UnitTestModelCacheKeyFactory.cs @@ -13,4 +13,9 @@ public class UnitTestModelCacheKeyFactory : IModelCacheKeyFactory { return context; } + + public virtual object Create(DbContext context, bool designTime) + { + return context; + } } diff --git a/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj b/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj index 6113e158a7..b01a779b74 100644 --- a/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj +++ b/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj index ad1932bc7b..163dec5f9c 100644 --- a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj +++ b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj b/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj index caab7b56ae..cb7ac72fbd 100644 --- a/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj +++ b/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.csproj b/framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.csproj index ce95cf5eef..8e5cd8b6a7 100644 --- a/framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.csproj +++ b/framework/test/Volo.Abp.GlobalFeatures.Tests/Volo.Abp.GlobalFeatures.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.csproj b/framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.csproj index f76183d6ec..5c670a014c 100644 --- a/framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.csproj +++ b/framework/test/Volo.Abp.Http.Client.IdentityModel.Web.Tests/Volo.Abp.Http.Client.IdentityModel.Web.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj b/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj index cc44e37d3d..91f0f51b33 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.csproj b/framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.csproj index 38e412b7e1..4cf18261f9 100644 --- a/framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.csproj +++ b/framework/test/Volo.Abp.Http.Tests/Volo.Abp.Http.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.csproj b/framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.csproj index dd7ba0d439..a2206d8a19 100644 --- a/framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.csproj +++ b/framework/test/Volo.Abp.IdentityModel.Tests/Volo.Abp.IdentityModel.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.csproj b/framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.csproj index 44f761798e..9d1bad51f2 100644 --- a/framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.csproj +++ b/framework/test/Volo.Abp.Json.Tests/Volo.Abp.Json.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.csproj b/framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.csproj index d34f082a09..d608933b64 100644 --- a/framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.csproj +++ b/framework/test/Volo.Abp.Ldap.Tests/Volo.Abp.Ldap.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj b/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj index 4766e63f1e..f282b36438 100644 --- a/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj +++ b/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.csproj b/framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.csproj index 1a3ee859c7..a079374b04 100644 --- a/framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.csproj +++ b/framework/test/Volo.Abp.MailKit.Tests/Volo.Abp.MailKit.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj b/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj index d7cf9dde01..565806f9c3 100644 --- a/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj +++ b/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj b/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj index 46c4b1c22a..bdbeff278b 100644 --- a/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj +++ b/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.csproj b/framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.csproj index b51ab8c799..5ed64d6ea0 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.csproj +++ b/framework/test/Volo.Abp.MongoDB.Tests.SecondContext/Volo.Abp.MongoDB.Tests.SecondContext.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true true diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj b/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj index b38a453d43..ef1ff44a00 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.csproj b/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.csproj index b124e20722..a037cfbcf3 100644 --- a/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.csproj +++ b/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj index 86040d3500..875e837853 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.csproj b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.csproj index b2d0263467..989ef61c2a 100644 --- a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.csproj +++ b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.csproj b/framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.csproj index bc8bd44946..68f993c07e 100644 --- a/framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.csproj +++ b/framework/test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj b/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj index 62ef44f206..dc2e24b67d 100644 --- a/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj +++ b/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj b/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj index f4746df20d..3b0efdb9c2 100644 --- a/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj +++ b/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj b/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj index 9f47e239ab..fcb5b1bed7 100644 --- a/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj +++ b/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.csproj b/framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.csproj index df7e4cd390..f43cebafaf 100644 --- a/framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.csproj +++ b/framework/test/Volo.Abp.Sms.Aliyun.Tests/Volo.Abp.Sms.Aliyun.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 9f0d2c00-80c1-435b-bfab-2c39c8249091 @@ -12,7 +12,7 @@ - + diff --git a/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj b/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj index dfa4d6363e..073387267d 100644 --- a/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj +++ b/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj b/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj index f251df0947..bc01e7035b 100644 --- a/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj +++ b/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index 5a6382eb80..b617600dcd 100644 --- a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs index 7291fcf585..72492238d4 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs @@ -2,6 +2,7 @@ using System.Text.Json.Serialization; using System.Threading.Tasks; using Shouldly; +using Volo.Abp.Caching; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Caching; @@ -110,6 +111,7 @@ public class Product : FullAuditedAggregateRoot } [Serializable] +[CacheName("ProductCacheItem")] public class ProductCacheItem { public Guid Id { get; set; } diff --git a/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.csproj b/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.csproj index d91645b537..06f957b165 100644 --- a/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.csproj +++ b/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo.Abp.TextTemplating.Razor.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.csproj b/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.csproj index 9546a1bb86..e0c9a59743 100644 --- a/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.csproj +++ b/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo.Abp.TextTemplating.Scriban.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj b/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj index c150d2c0e0..d8875b01a0 100644 --- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj +++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.csproj b/framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.csproj index c770dc6763..74a4ef6593 100644 --- a/framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.csproj +++ b/framework/test/Volo.Abp.Threading.Tests/Volo.Abp.Threading.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj index 7d5a99562e..3c3a8dff37 100644 --- a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj +++ b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj b/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj index 28536701fe..2b1cb36093 100644 --- a/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj +++ b/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj b/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj index 75e8997ce5..ebed71046e 100644 --- a/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj +++ b/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj index 4cb884a7ca..2d845fd6cc 100644 --- a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj +++ b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true @@ -16,7 +16,7 @@ - + diff --git a/global.json b/global.json index 10b65be864..0c9553269a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100", + "version": "7.0.100-rc.2.22477.23", "rollForward": "latestFeature" } } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj index 4b5029d234..d6b87b957d 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj @@ -21,7 +21,7 @@ - + diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json index b9840ed207..cdabc68af1 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "تم حفظ الإعدادات الشخصية", "PasswordChanged": "تم تغيير كلمة المرور", "NewPasswordConfirmFailed": "يرجى تأكيد كلمة المرور الجديدة.", + "NewPasswordSameAsOld": "يجب أن تكون كلمة المرور الجديدة مختلفة عن كلمة المرور الحالية.", "Manage": "إدارة", "MyAccount": "حسابي", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "هل تم تمكين التسجيل الذاتي", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json index 3266adae51..35b356274a 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Osobní nastavení uloženo", "PasswordChanged": "Heslo změněno", "NewPasswordConfirmFailed": "Potvrďte nové heslo.", + "NewPasswordSameAsOld": "Nové heslo musí být odlišné od současného.", "Manage": "Spravovat", "MyAccount": "Můj účet", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je povolena automatická registrace", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json index 38d81e8516..40092d7c9d 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Personlige indstillinger gemt", "PasswordChanged": "Kodeord gemt", "NewPasswordConfirmFailed": "Bekræft venligst det nye kodeord.", + "NewPasswordSameAsOld": "Det nye kodeord skal være anderledes end det gamle.", "Manage": "Administrer", "MyAccount": "Min konto", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Er registrering aktiveret", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json index 02eae9240d..519c47c36c 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Persönliche Einstellungen gespeichert", "PasswordChanged": "Passwort geändert", "NewPasswordConfirmFailed": "Bitte bestätigen Sie das neue Passwort.", + "NewPasswordSameAsOld": "Das neue Passwort muss sich vom alten Passwort unterscheiden.", "Manage": "Verwalten", "MyAccount": "Mein Benutzerkonto", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Selbstregistrierung ist aktiviert", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json index f66217156b..327e8b5a62 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Persönliche Einstellungen gespeichert", "PasswordChanged": "Passwort geändert", "NewPasswordConfirmFailed": "Bitte bestätigen Sie das neue Passwort.", + "NewPasswordSameAsOld": "Das neue Passwort muss sich vom alten Passwort unterscheiden.", "Manage": "Verwalten", "MyAccount": "Mein Konto", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Ist die Selbstregistrierung aktiviert", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json index e5af66d6fe..70f319968d 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Οι προσωπικές ρυθμίσεις αποθηκεύτηκαν", "PasswordChanged": "Ο κωδικός πρόσβασης άλλαξε", "NewPasswordConfirmFailed": "Παρακαλώ επιβεβαιώστε τον νέο κωδικό πρόσβασης.", + "NewPasswordSameAsOld": "Ο νέος κωδικός πρόσβασης πρέπει να είναι διαφορετικός από τον τρέχοντα.", "Manage": "Διαχείρηση", "MyAccount": "Ο λογαριασμός μου", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Είναι ενεργοποιημένη η αυτοεγγραφή", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json index 7bfcdccec7..404cd88c2c 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Personal settings saved", "PasswordChanged": "Password changed", "NewPasswordConfirmFailed": "Please confirm the new password.", + "NewPasswordSameAsOld": "The new password must be different from the old one.", "Manage": "Manage", "MyAccount": "My account", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is self-registration enabled", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json index d5f881e365..a046aad12a 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Personal settings saved", "PasswordChanged": "Password changed", "NewPasswordConfirmFailed": "Please confirm the new password.", + "NewPasswordSameAsOld": "New password must be different from the old one.", "Manage": "Manage", "MyAccount": "My account", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is self-registration enabled", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json index d6389de2a9..b3bcad86f9 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json @@ -32,6 +32,7 @@ "PersonalSettingsSaved": "Ajustes personales guardados", "PasswordChanged": "Cambia la contraseña", "NewPasswordConfirmFailed": "Por favor, confirme la nueva contraseña.", + "NewPasswordSameAsOld": "La nueva contraseña debe ser diferente de la contraseña actual.", "Manage": "Administrar", "MyAccount": "Mi cuenta" } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json index 9632dc91f2..0e883a1372 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Ajustes personales guardados", "PasswordChanged": "Cambiar la contraseña", "NewPasswordConfirmFailed": "Por favor, confirme la nueva contraseña.", + "NewPasswordSameAsOld": "La nueva contraseña debe ser diferente de la contraseña actual.", "Manage": "Administrar", "MyAccount": "Mi cuenta", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "¿El auto-registro está habilitado?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json index 7116a202eb..b417ec4d71 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "تنظیمات شخصی ذخیره گردید", "PasswordChanged": "گذرواژه تغییر کرد", "NewPasswordConfirmFailed": "لطفاً گذرواژه جدید را تأیید کنید.", + "NewPasswordSameAsOld": "گذرواژه جدید نباید با گذرواژه قبلی یکسان باشد.", "Manage": "مدیریت", "MyAccount": "حساب من", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "آیا امکان ثبت نام فعال است", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json index 42dfb59005..b917834a53 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Henkilökohtaiset asetukset tallennettu", "PasswordChanged": "Salasana vaihdettu", "NewPasswordConfirmFailed": "Vahvista uusi salasana.", + "NewPasswordSameAsOld": "Uusi salasana ei voi olla sama kuin vanha salasana.", "Manage": "Hallitse", "MyAccount": "Tilini", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Onko itserekisteröinti käytössä", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json index afce5f6bdd..d357e7fafd 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Paramètres personnels enregistrés", "PasswordChanged": "Mot de passe changé", "NewPasswordConfirmFailed": "Veuillez confirmer le nouveau mot de passe.", + "NewPasswordSameAsOld": "Le nouveau mot de passe doit être différent de l'ancien.", "Manage": "Gérer", "MyAccount": "Mon compte", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "L’auto-inscription est-elle activée", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json index d406e3f6d5..0dedd78fb9 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "व्यक्तिगत सेटिंग्स सहेजे गए", "PasswordChanged": "पासवर्ड बदला गया", "NewPasswordConfirmFailed": "कृपया नए पासवर्ड की पुष्टि करें।", + "NewPasswordSameAsOld": "नया पासवर्ड वर्तमान पासवर्ड से एक ही होना चाहिए।", "Manage": "प्रबंधित", "MyAccount": "मेरा खाता", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "क्या स्व-पंजीकरण सक्षम है", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json index 655ac74c10..30f578cb08 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Személyes beállítások mentve", "PasswordChanged": "Jelszó megváltoztatva", "NewPasswordConfirmFailed": "Kérjük, erősítse meg az új jelszót.", + "NewPasswordSameAsOld": "Az új jelszó nem lehet azonos a régi jelszóval.", "Manage": "Kezelés", "MyAccount": "A fiókom", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Engedélyezve van az önregisztráció", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json index e592e956aa..744b483dba 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Persónulegar stillingar vistaðar", "PasswordChanged": "Lykilorði breytt", "NewPasswordConfirmFailed": "Vinsamlegast staðfestu nýja lykilorðið.", + "NewPasswordSameAsOld": "Nýtt lykilorð verður að vera frábrugðið núverandi lykilorði.", "Manage": "Umsjá", "MyAccount": "Minn aðgangur", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Er sjálfskráning virk", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json index 5c3dfb77ac..830a01e507 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Impostazioni personali salvate", "PasswordChanged": "Password cambiata", "NewPasswordConfirmFailed": "Conferma la nuova password.", + "NewPasswordSameAsOld": "La nuova password deve essere diversa dalla vecchia.", "Manage": "Gestire", "MyAccount": "Il mio account", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "L'auto-registrazione è abilitata", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json index 19bc055db9..3238f1ceb9 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Persoonlijke instellingen opgeslagen", "PasswordChanged": "Wachtwoord veranderd", "NewPasswordConfirmFailed": "Bevestig het nieuwe wachtwoord a.u.b.", + "NewPasswordSameAsOld": "Het nieuwe wachtwoord moet verschillen van het huidige wachtwoord.", "Manage": "Beheer", "MyAccount": "Mijn rekening", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is zelfregistratie ingeschakeld", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json index 21af5b9ce1..39bf144303 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Zapisano ustawienia osobiste", "PasswordChanged": "Hasło zostało zmienione", "NewPasswordConfirmFailed": "Potwierdź nowe hasło.", + "NewPasswordSameAsOld": "Nowe hasło musi być inne niż poprzednie.", "Manage": "Zarządzać", "MyAccount": "Moje konto", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Czy włączona jest samodzielna rejestracja?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json index 71adf7be31..bf912a3d61 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Configurações pessoais salvas", "PasswordChanged": "Senha alterada", "NewPasswordConfirmFailed": "Por favor, confirme a nova senha.", + "NewPasswordSameAsOld": "A nova senha deve ser diferente da senha atual.", "Manage": "Gerenciar", "MyAccount": "Minha conta", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "O autorregistro está habilitado", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json index 149ad71d95..29de263594 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Setări personale salvate", "PasswordChanged": "Parola schimbată", "NewPasswordConfirmFailed": "Vă rugăm să confirmaţi noua parolă.", + "NewPasswordSameAsOld": "Noua parolă trebuie să fie diferită de cea curentă.", "Manage": "Administrează", "MyAccount": "Contul meu", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Este înregistrarea personală activată", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json index 337bf2836a..2894feb09d 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Персональные настройки сохранены", "PasswordChanged": "Пароль изменен", "NewPasswordConfirmFailed": "Пожалуйста подтвердите новый пароль.", + "NewPasswordSameAsOld": "Новый пароль не должен совпадать со старым.", "Manage": "Управление учетной записью", "MyAccount": "Мой аккаунт", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Самостоятельная регистрация включена", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json index c0467110ae..37a1777351 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Osobné nastavenia boli uložené", "PasswordChanged": "Heslo bolo zmenené", "NewPasswordConfirmFailed": "Prosím potvrďte nové heslo.", + "NewPasswordSameAsOld": "Nové heslo musí byť odlišné od aktuálneho.", "Manage": "Spravovať", "MyAccount": "Môj účet", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je povolená samoregistrácia", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json index 5298b8d968..f8e68ca7e5 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Osebne nastavitve so shranjene", "PasswordChanged": "Geslo je spremenjeno", "NewPasswordConfirmFailed": "Prosimo potrdite novo geslo.", + "NewPasswordSameAsOld": "Novo geslo mora biti drugačno od starega.", "Manage": "Upravljaj", "MyAccount": "Moj račun", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je lastna registracija uporabnika omogočena", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json index 6edaf2c1c4..116ddd2508 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "Kişisel ayarlar kaydedildi", "PasswordChanged": "Şifre değiştirildi", "NewPasswordConfirmFailed": "Lütfen yeni şifreyi onaylayın.", + "NewPasswordSameAsOld": "Yeni şifre eski şifre ile aynı olamaz.", "Manage": "Manage", "MyAccount": "Hesabım", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "self-registration etkin mi ?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json index 430bdd3c26..de82983e22 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json @@ -35,6 +35,7 @@ "PersonalSettingsSaved": "Đã lưu cài đặt cá nhân", "PasswordChanged": "mật khẩu đã được thay đổi", "NewPasswordConfirmFailed": "Vui lòng xác nhận mật khẩu mới.", + "NewPasswordSameAsOld": "Mật khẩu mới không được giống như mật khẩu cũ.", "Manage": "Quản lý", "MyAccount": "Tài khoản của tôi", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Tự đăng ký có được bật không", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json index 1c51fb1fa9..9b723be748 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "个人设置已保存", "PasswordChanged": "修改密码", "NewPasswordConfirmFailed": "请确认新密码", + "NewPasswordSameAsOld": "新密码不能与旧密码相同", "Manage": "管理", "MyAccount": "我的账户", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "启用自行注册", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json index dc0f6a94b9..794bf2afb2 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json @@ -36,6 +36,7 @@ "PersonalSettingsSaved": "個人設置已保存", "PasswordChanged": "修改密碼", "NewPasswordConfirmFailed": "請確認新密碼", + "NewPasswordSameAsOld": "新密碼不能與舊密碼相同", "Manage": "管理", "MyAccount": "我的賬戶", "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "啟用自行註冊", diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj index 35f0f2a352..812ea46e23 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj +++ b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Account.Application Volo.Abp.Account.Application true @@ -25,7 +25,7 @@ - + diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj index 027afb9e70..b96d049912 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj +++ b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Account.Blazor diff --git a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj b/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj index 460da4f8dc..cccd02e38a 100644 --- a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj +++ b/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Account.HttpApi Volo.Abp.Account.HttpApi diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj index 8ad72ac461..d9d3f6b21c 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj index c664c3fb8b..2e2b28fcc6 100644 --- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Account.Web.IdentityServer Volo.Abp.Account.Web.IdentityServer true @@ -38,7 +38,7 @@ - + diff --git a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.csproj b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.csproj index 637947b62f..6fa9812461 100644 --- a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.csproj +++ b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Account.Web.OpenIddict Volo.Abp.Account.Web.OpenIddict true @@ -28,7 +28,7 @@ - + diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js index 4410fd9e46..e2f2fd4969 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js @@ -22,7 +22,12 @@ if (input.currentPassword && input.currentPassword == ''){ return; } - + + if(input.currentPassword == input.newPassword) { + abp.message.error(l('NewPasswordSameAsOld')); + return; + } + volo.abp.account.profile.changePassword(input).then(function (result) { abp.message.success(l('PasswordChanged')); abp.event.trigger('passwordChanged'); diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml index 4fad4f91cc..40b8d87048 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml @@ -11,8 +11,8 @@

@L["ResetPassword_Information"]

- - + + @L["Cancel"] diff --git a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj b/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj index 322291da3e..0a19b8e1a0 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj +++ b/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Account.Web Volo.Abp.Account.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -44,7 +44,7 @@ - + diff --git a/modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.csproj b/modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.csproj index c01aaf95cd..fc662baa97 100644 --- a/modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.csproj +++ b/modules/account/test/Volo.Abp.Account.Application.Tests/Volo.Abp.Account.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj index a28148f0b7..4e22a65727 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.csproj index cf8a116b59..1c09f9d407 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo.Abp.AuditLogging.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj index 5a04e797a5..deb16126e8 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj b/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj index 8091f4b7ce..67aa3fcaf3 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.csproj b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.csproj index e2e7ed4558..6599d1e446 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.csproj +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.csproj b/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.csproj index ff3df67641..a6b5ff8505 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.csproj +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.TestBase/Volo.Abp.AuditLogging.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.csproj b/modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.csproj index ee5d70cc1a..03ba57fb17 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.csproj +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.Tests/Volo.Abp.AuditLogging.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj index 2e52fe8dd6..acad01b8e9 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj index 9d96010a1b..8fe68d246c 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.csproj index 9ed318622a..242ea3fd15 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq/Volo.Abp.BackgroundJobs.DemoApp.RabbitMq.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj index f62357c566..bca4cf8a22 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.csproj index e538bea2b6..70d6f91247 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj index 05bd0b8f6b..da44184bc4 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj index a9b42370b8..4d1fdcddca 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj index 8f98fa4c39..bd373a31c6 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj index afd26815ac..7e763bdcc0 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj index 779be70019..9f8d1936c1 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj index f9f741ac0a..2cb8153293 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.csproj b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.csproj index 5499c59a8f..565949c5a9 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.csproj +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Volo.Abp.AspNetCore.Components.Web.BasicTheme.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj index 4b58204601..d124430440 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj index 7a9a73305c..97132c6e5e 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj index 5c9e9c6305..7b1c87e564 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj index ee105e4721..745f32a633 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj index ff2f7ecff9..dca7a19065 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 8e1e22127a..d9065c25b3 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^6.0.0-rc.5", + "@abp/aspnetcore.mvc.ui.theme.shared": "^6.0.0", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index 57fceb683d..9226aad348 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.shared@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -34,144 +34,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj index 41de32d955..c2d285b01a 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 83e66ea044..bd111851b8 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5", - "@abp/prismjs": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0", + "@abp/prismjs": "^6.0.0" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index 90f20578a1..2f563a56c9 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,161 +41,161 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.5.tgz#071d3da1597a7ed706a60b75400ad5970b2a2eed" - integrity sha512-Vj1yvK7Vcqy1aZ9XIbqGDlwe4d1vneMIVA0hypAHtLi+0lLySgS8QAXUpXo0RkRoyksiTRuM2gRkJRZzdiXSNA== +"@abp/clipboard@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0.tgz#eb9fd86a3660d33f85bfd29c6042ac3155f1e5ef" + integrity sha512-QwDap2HqynF0C5ybapQBO10RGen3B76eRs+4fzsOmLJYCDEa+bayj1wGwgfMx2Uezxb9Sd/DVEEn1qOC2D6PDQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.5.tgz#c908113295aed8ecf4b04c1691d9295b6af47964" - integrity sha512-SiRkUfqWf0VAwJ4nfassN+Me/0A6cIji2TWmSaKuOlen3Ph55iGy9od6nE5njnZqUAmuL8XqTisvt7Gx8Cd4DQ== +"@abp/prismjs@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0.tgz#05f4ba60548035f7c88897e9792d8ed446860991" + integrity sha512-BtbX6kORlDhcmrnSXNw9Q1lnKNNvuMkaoQMmluNGFZXx1jUX9hfRkipD8Stbvjq85B9dzcVawocwP8Qu12Fn9A== dependencies: - "@abp/clipboard" "~6.0.0-rc.5" - "@abp/core" "~6.0.0-rc.5" + "@abp/clipboard" "~6.0.0" + "@abp/core" "~6.0.0" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj index de333dc7aa..0e6f151047 100644 --- a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj +++ b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj index eee69f5a35..a326c2081a 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj index cb351f8da9..7ac2ce2691 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.csproj b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.csproj index fd9b0d2da1..f3d6706088 100644 --- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.csproj +++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/Volo.Abp.BlobStoring.Database.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.BlobStoring.Database diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.csproj b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.csproj index a1b9f2730d..2f5b7ebbe2 100644 --- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.csproj +++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.BlobStoring.Database diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.csproj b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.csproj index ad3981ab2b..c4d517912b 100644 --- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.csproj +++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/Volo.Abp.BlobStoring.Database.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.BlobStoring.Database diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.csproj b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.csproj index 1472b77878..bba2a88cf2 100644 --- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.csproj +++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.BlobStoring.Database diff --git a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.csproj b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.csproj index f1229951df..953b743749 100644 --- a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index 455a25b131..64cfe35a5c 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 InProcess diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index c75f37d984..5acbf04e08 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5", - "@abp/blogging": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0", + "@abp/blogging": "^6.0.0" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index d1a25c4b80..b45897af8d 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,187 +41,187 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-6.0.0-rc.5.tgz#3556fa57cc3e37bbb6437b0617139c9c3ec41556" - integrity sha512-oMonxRWUmN0qTGqclvr2Tb+f51qf1lzkTCJsU9WsjuT120MD8xlPS5Gpv2au5emTDsWbc11fdNs3nG56Ahwxgg== +"@abp/blogging@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-6.0.0.tgz#b9c8d02bfa86885c61a8869c10e812042b27c942" + integrity sha512-XXqj1bflLFZIZl3EOggfEP4nHtK/Ii5+lXkheoQJSCSjGmhW2jiTrLKs6blwqEYdN4KK/8zs2rRpHz1ACaaf0Q== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - "@abp/owl.carousel" "~6.0.0-rc.5" - "@abp/prismjs" "~6.0.0-rc.5" - "@abp/tui-editor" "~6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + "@abp/owl.carousel" "~6.0.0" + "@abp/prismjs" "~6.0.0" + "@abp/tui-editor" "~6.0.0" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.5.tgz#071d3da1597a7ed706a60b75400ad5970b2a2eed" - integrity sha512-Vj1yvK7Vcqy1aZ9XIbqGDlwe4d1vneMIVA0hypAHtLi+0lLySgS8QAXUpXo0RkRoyksiTRuM2gRkJRZzdiXSNA== +"@abp/clipboard@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0.tgz#eb9fd86a3660d33f85bfd29c6042ac3155f1e5ef" + integrity sha512-QwDap2HqynF0C5ybapQBO10RGen3B76eRs+4fzsOmLJYCDEa+bayj1wGwgfMx2Uezxb9Sd/DVEEn1qOC2D6PDQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/owl.carousel@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-6.0.0-rc.5.tgz#19dabc93a7d59059f9b544176969d0a30b9d321c" - integrity sha512-mF2S5vnAZ57E5poif0uYdJsuQfdAmis+s/8adlz0xHp8PU8A8LeTYsCY43HDU34WP+oCPeT8DpcGRAm/B0BE8Q== +"@abp/owl.carousel@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-6.0.0.tgz#58c5b069c61e6ecf9894d83d8a65661bf847348b" + integrity sha512-eIh2pJXsRojJpdyiL4r86Nak/yGMf6kVPIFk7+u+VXZBAGxc6svf+l43fCOl8Xq/LHdm2JUeMp1lY3Zf1or8CQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" owl.carousel "^2.3.4" -"@abp/prismjs@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.5.tgz#c908113295aed8ecf4b04c1691d9295b6af47964" - integrity sha512-SiRkUfqWf0VAwJ4nfassN+Me/0A6cIji2TWmSaKuOlen3Ph55iGy9od6nE5njnZqUAmuL8XqTisvt7Gx8Cd4DQ== +"@abp/prismjs@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0.tgz#05f4ba60548035f7c88897e9792d8ed446860991" + integrity sha512-BtbX6kORlDhcmrnSXNw9Q1lnKNNvuMkaoQMmluNGFZXx1jUX9hfRkipD8Stbvjq85B9dzcVawocwP8Qu12Fn9A== dependencies: - "@abp/clipboard" "~6.0.0-rc.5" - "@abp/core" "~6.0.0-rc.5" + "@abp/clipboard" "~6.0.0" + "@abp/core" "~6.0.0" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/tui-editor@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.5.tgz#9d9e6035d8b145d9d7ebe9f236ecf2c140f00a6b" - integrity sha512-Q+Nx+nvqj7iUUDH4uCHxxJ2dZssJ6nxzNmIhlL5jW2rAotQGbUkw1ByQeFJBA83qGVD8whlBZUKNEIz06JYcvA== +"@abp/tui-editor@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0.tgz#907059be960ee24f75ac3418800e9601edfad672" + integrity sha512-6xLoH0DcZGBlXazPEVBA7sJP4kaNG26+aYOTa3g21cl4dgiMmUqzFV+XiEEUbyOkAPyuW+MJXWCeH1R496dx9A== dependencies: - "@abp/jquery" "~6.0.0-rc.5" - "@abp/prismjs" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" + "@abp/prismjs" "~6.0.0" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.csproj b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.csproj index 6df6b27bb7..adc000a44b 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.csproj +++ b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.Admin.Application Volo.Blogging.Admin.Application diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.csproj b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.csproj index 0ba8bfd200..29f78311d0 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.csproj +++ b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.Admin.HttpApi Volo.Blogging.Admin.HttpApi diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj index 0f3c2f52c7..6afb71c7e9 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.Admin.Web Volo.Blogging.Admin.Web 2.8 @@ -24,7 +24,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj index 99c491231b..9f1b8a1a00 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj +++ b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.Application Volo.Blogging.Application diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.csproj b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.csproj index 96c14f8da0..c56b888d38 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.csproj +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.csproj @@ -21,7 +21,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json index 40c44e55c0..b9f4e44bde 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json @@ -58,6 +58,7 @@ "ClearCache": "Clear cache", "ClearCacheConfirmationMessage": "Are you sure you want to clear the cache?", "MarkdownSupported": "Markdown is supported", - "FileUploadInfo": "Drag, drop, or paste a copied image." + "FileUploadInfo": "Drag, drop, or paste a copied image.", + "PostDescriptionHint": "* Will be rendered in the article link preview, supports HTML" } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.csproj b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.csproj index ba3c5e65e0..805c517211 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.csproj +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.EntityFrameworkCore Volo.Blogging.EntityFrameworkCore diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj index 3e1ca067c9..38424e1e07 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj +++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.HttpApi Volo.Blogging.HttpApi diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj index 643522f32b..74de48410f 100644 --- a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml index c1104ff2aa..2fb737654e 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml @@ -60,7 +60,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml index 5ed9dcb4ac..4c32261a22 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml @@ -57,7 +57,7 @@ - +
diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj index a05cff2692..0ba240d8c2 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj +++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Blogging.Web Volo.Blogging.Web 2.8 @@ -24,7 +24,7 @@ - + diff --git a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.csproj b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.csproj index 311fb70e29..432027ed2b 100644 --- a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.csproj +++ b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo.Blogging.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.csproj b/modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.csproj index 1226436a12..92834131e2 100644 --- a/modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.csproj +++ b/modules/blogging/test/Volo.Blogging.Domain.Tests/Volo.Blogging.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj index 064f524ea3..119ff6807b 100644 --- a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj +++ b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.csproj b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.csproj index e6b7cc1b87..a2bfdf915a 100644 --- a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.csproj +++ b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo.Blogging.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.csproj b/modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.csproj index 5dc973770e..b6151dd5bd 100644 --- a/modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.csproj +++ b/modules/blogging/test/Volo.Blogging.TestBase/Volo.Blogging.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj index 3207233860..4295d91c77 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 07c57996fb..f32f5db0e1 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index fe54a1cbe2..08684b2715 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj b/modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj index 06204eaa87..c244344969 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.ClientSimulation.Web Volo.ClientSimulation.Web Library diff --git a/modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.csproj b/modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.csproj index 274c11aed3..c29d50b132 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.csproj +++ b/modules/client-simulation/src/Volo.ClientSimulation/Volo.ClientSimulation.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.ClientSimulation Volo.ClientSimulation diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 9476b5baba..77a6930a49 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.5", - "@abp/ng.identity": "~6.0.0-rc.5", - "@abp/ng.setting-management": "~6.0.0-rc.5", - "@abp/ng.tenant-management": "~6.0.0-rc.5", - "@abp/ng.theme.basic": "~6.0.0-rc.5", + "@abp/ng.account": "~6.0.0", + "@abp/ng.identity": "~6.0.0", + "@abp/ng.setting-management": "~6.0.0", + "@abp/ng.tenant-management": "~6.0.0", + "@abp/ng.theme.basic": "~6.0.0", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index 279f830d3d..20fbb088a4 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=6.0.0-rc.5", - "@abp/ng.theme.shared": ">=6.0.0-rc.5" + "@abp/ng.core": ">=6.0.0", + "@abp/ng.theme.shared": ">=6.0.0" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj index 8b2547b795..4016735f48 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit true Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj index e3f3b0cf3f..a619c0e744 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit true Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 034a6b96b3..0db176b1d0 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 9269b9a5b8..c4ae9637c6 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj index be312facab..6615f72396 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit true Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index ff2b518df8..13ca021ace 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index b1358b833e..8a7f6a6cba 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220504032430_Initial.Designer.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220808112328_Initial.Designer.cs similarity index 99% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220504032430_Initial.Designer.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220808112328_Initial.Designer.cs index fc428d9f31..a94401a3a4 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220504032430_Initial.Designer.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220808112328_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.CmsKit.EntityFrameworkCore; namespace Volo.CmsKit.Migrations { [DbContext(typeof(UnifiedDbContext))] - [Migration("20220504032430_Initial")] + [Migration("20220808112328_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace Volo.CmsKit.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -1662,6 +1662,9 @@ namespace Volo.CmsKit.Migrations .HasDefaultValue(false) .HasColumnName("IsDeleted"); + b.Property("IsHomePage") + .HasColumnType("bit"); + b.Property("LastModificationTime") .HasColumnType("datetime2") .HasColumnName("LastModificationTime"); diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220504032430_Initial.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220808112328_Initial.cs similarity index 99% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220504032430_Initial.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220808112328_Initial.cs index e48811ee84..5f499c30a9 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220504032430_Initial.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20220808112328_Initial.cs @@ -433,6 +433,7 @@ namespace Volo.CmsKit.Migrations Content = table.Column(type: "nvarchar(max)", maxLength: 2147483647, nullable: true), Script = table.Column(type: "nvarchar(max)", nullable: true), Style = table.Column(type: "nvarchar(max)", nullable: true), + IsHomePage = table.Column(type: "bit", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs index 2a5d13e732..4205bd31c3 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace Volo.CmsKit.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -1660,6 +1660,9 @@ namespace Volo.CmsKit.Migrations .HasDefaultValue(false) .HasColumnName("IsDeleted"); + b.Property("IsHomePage") + .HasColumnType("bit"); + b.Property("LastModificationTime") .HasColumnType("datetime2") .HasColumnName("LastModificationTime"); diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj index 38130dc961..45aa6da55d 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit true Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index bb3aa0a9b4..01ba56a7bd 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5", - "@abp/cms-kit": "6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0", + "@abp/cms-kit": "6.0.0" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index c74d53ddeb..569b448c56 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,243 +41,243 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.5.tgz#071d3da1597a7ed706a60b75400ad5970b2a2eed" - integrity sha512-Vj1yvK7Vcqy1aZ9XIbqGDlwe4d1vneMIVA0hypAHtLi+0lLySgS8QAXUpXo0RkRoyksiTRuM2gRkJRZzdiXSNA== +"@abp/clipboard@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0.tgz#eb9fd86a3660d33f85bfd29c6042ac3155f1e5ef" + integrity sha512-QwDap2HqynF0C5ybapQBO10RGen3B76eRs+4fzsOmLJYCDEa+bayj1wGwgfMx2Uezxb9Sd/DVEEn1qOC2D6PDQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" clipboard "^2.0.8" -"@abp/cms-kit.admin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-6.0.0-rc.5.tgz#646988447d89d305a9cf6ce0ccacec0d4cbae5c7" - integrity sha512-p3e3nMC1YmR/eU9T5GSJwsc/mGS2XUTnzSbd3s+NmPs0fXf8wZhzzbBERi0BbSh0mEJSUUiuFZpu5l+BdblCUQ== +"@abp/cms-kit.admin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-6.0.0.tgz#4b6e4dbe6d0406bb055a118d786507ee8ffba1e4" + integrity sha512-PWXDGqRuCXAA19A2n5zTHTBSYt9HnE0HRWNIm32pUmlS6JiBtbmbOdSVkj3crPHRjTKlJjc+iFLGD03tGRGsoA== dependencies: - "@abp/codemirror" "~6.0.0-rc.5" - "@abp/jstree" "~6.0.0-rc.5" - "@abp/slugify" "~6.0.0-rc.5" - "@abp/tui-editor" "~6.0.0-rc.5" - "@abp/uppy" "~6.0.0-rc.5" + "@abp/codemirror" "~6.0.0" + "@abp/jstree" "~6.0.0" + "@abp/slugify" "~6.0.0" + "@abp/tui-editor" "~6.0.0" + "@abp/uppy" "~6.0.0" -"@abp/cms-kit.public@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-6.0.0-rc.5.tgz#9d386e74af2ca006650853006eba0ba5580dcb8e" - integrity sha512-0LD1rsP8uStqjRTQECirkrgJqn+NJ+bV3b2d/bEd430AxdxOw45J2DFRnVzIS/ZS5J8UmqyCC9d9cypunUT9ng== +"@abp/cms-kit.public@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-6.0.0.tgz#63cf9e4bc3c213362edec9037f3b6ca11c7701d0" + integrity sha512-gREwIELg9/925oWjz/7VXTAyZsIMgj287WDLU8zsiR+3tDyOCrZAGI7r2PNoxetSXnbfAy/WCFQxj/qyBxE+9g== dependencies: - "@abp/highlight.js" "~6.0.0-rc.5" - "@abp/star-rating-svg" "~6.0.0-rc.5" + "@abp/highlight.js" "~6.0.0" + "@abp/star-rating-svg" "~6.0.0" -"@abp/cms-kit@6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-6.0.0-rc.5.tgz#413632d5d8111f69f9a9c20d5929e597a171bd95" - integrity sha512-J5LUYa/R9LBZDHgSWPvyo+mJWujZOJkINHGjdnurwgsf7LT2Ep6LZjldQFD8yvJVoca5FLCVX+ViRhNLcbeeFg== +"@abp/cms-kit@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-6.0.0.tgz#73207c6b845dd3c5e17f3fa9bd3abc87fa02f87f" + integrity sha512-3U78M5yg2ciSD0nQqyN0QKcRNqx7LVDeVzjHnt6XO5Y+SLJF9oYmJjNnjAcppW2GfUaSr6Br98MCz7k8W7uXjQ== dependencies: - "@abp/cms-kit.admin" "~6.0.0-rc.5" - "@abp/cms-kit.public" "~6.0.0-rc.5" + "@abp/cms-kit.admin" "~6.0.0" + "@abp/cms-kit.public" "~6.0.0" -"@abp/codemirror@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-6.0.0-rc.5.tgz#2cb4f4f9e841fba7cd1e19d7081ac8d1475665af" - integrity sha512-mHDC9TAuKxjXp1We7lgko9y0rYeIy/EwNFFEbm6DLQKkPFDFgYfNhzKhgRvt2WyndBIfLgQRed9aWZLFkpkcIg== +"@abp/codemirror@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-6.0.0.tgz#4d644ea0acebd051473df2d51e87cbfd0a524547" + integrity sha512-j+5pFtaj2EvNFsRyUkqYtjJ6mhW0W4vRw2yCd0QPI0z+ZG2NY1qugeH4H6Cir4tuZlp5tZohXJE3M+BYGHhXFA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" codemirror "^5.65.1" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-6.0.0-rc.5.tgz#daa41be253d266867903d175c87ee4a1c0d5507b" - integrity sha512-GjMXoPUtwoZ/M1n+VlIthFswKFU+WNSOW8jr3FKiGDDwY0kjRXNWsuLaQ+fewHZFFpTrPAUfpkRYk/aKFa1eQQ== +"@abp/highlight.js@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-6.0.0.tgz#3b8b79470de8ab3d227fa32b3eea9c72b8bef3b1" + integrity sha512-MT2FflUQallp4RLtkIyojQez9HaRUMKd2pPs++4mSWD/rdl9Q0HsSPRbvdJVsH6v7Ymaun16Q1DmnINft5c+Aw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/jstree@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-6.0.0-rc.5.tgz#520f9f1898cb99b392318e0ad6f28c64c84ba69f" - integrity sha512-rNVUn+UMCDZ+Q3V5Ss5CUB1HKQxr6xWAmTejHWHmRO4O7zypxejkNJaT88J2QHFon9GjhzojRksMKvgfWZ+ftg== +"@abp/jstree@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-6.0.0.tgz#5609e73a4fe4964a6c81fe30ee6a14e407fc8d62" + integrity sha512-/vLZLR5GoaX7AsTXWJOlUSXI9U4yxsH0Jj1PP8O/3Ff4+wH5bFO59RWm/i9E49gwej6F2N8P20do5AKzOhTfLw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jstree "^3.3.12" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.5.tgz#c908113295aed8ecf4b04c1691d9295b6af47964" - integrity sha512-SiRkUfqWf0VAwJ4nfassN+Me/0A6cIji2TWmSaKuOlen3Ph55iGy9od6nE5njnZqUAmuL8XqTisvt7Gx8Cd4DQ== +"@abp/prismjs@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0.tgz#05f4ba60548035f7c88897e9792d8ed446860991" + integrity sha512-BtbX6kORlDhcmrnSXNw9Q1lnKNNvuMkaoQMmluNGFZXx1jUX9hfRkipD8Stbvjq85B9dzcVawocwP8Qu12Fn9A== dependencies: - "@abp/clipboard" "~6.0.0-rc.5" - "@abp/core" "~6.0.0-rc.5" + "@abp/clipboard" "~6.0.0" + "@abp/core" "~6.0.0" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/slugify@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-6.0.0-rc.5.tgz#d4d6e62e3c38f7f15b0a8be7c4a9cc4c847a1dbc" - integrity sha512-W7yGpFfHi4gTjlEls+OlqY4Az+VXp97tJR+OMP+ZpHbTUlPlcHTu9JUTtX3ulGcIB1N4m8pbabKIDttnZghGqw== +"@abp/slugify@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-6.0.0.tgz#16b97cfb4ae768fd809f8e3b6d1b1c2f29bec29d" + integrity sha512-UkhmRbnqmC38dcwlbICkE5STwnUMgDY7kOTn/EaxbrNSkoI7Dgqk/tv+zp2rGQZvFyZHaa4h/czaTi15JcCBAw== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-6.0.0-rc.5.tgz#bb123c006c98abd9803c47bde5aa74cf672225c6" - integrity sha512-nkIwpI2lAF6jkCTRVl7/i+SSnV87WcC98eTY3Wm/RHeZn6IyAVg7kc/lWFv/eZwpvWZgHhXsRjVfUISqJPBjzw== +"@abp/star-rating-svg@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-6.0.0.tgz#6f3f9ee5e55e35080dfbe023401970b840811bf4" + integrity sha512-HoiuNTiP/Kg7KbSdP1LVAvxZ5isQxqQkj9BeFst8N5UtCu0rrfNirsJmu/yZoLqcvfRc4Q6Zx9mTTio1mMbblQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/tui-editor@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.5.tgz#9d9e6035d8b145d9d7ebe9f236ecf2c140f00a6b" - integrity sha512-Q+Nx+nvqj7iUUDH4uCHxxJ2dZssJ6nxzNmIhlL5jW2rAotQGbUkw1ByQeFJBA83qGVD8whlBZUKNEIz06JYcvA== +"@abp/tui-editor@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0.tgz#907059be960ee24f75ac3418800e9601edfad672" + integrity sha512-6xLoH0DcZGBlXazPEVBA7sJP4kaNG26+aYOTa3g21cl4dgiMmUqzFV+XiEEUbyOkAPyuW+MJXWCeH1R496dx9A== dependencies: - "@abp/jquery" "~6.0.0-rc.5" - "@abp/prismjs" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" + "@abp/prismjs" "~6.0.0" -"@abp/uppy@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-6.0.0-rc.5.tgz#6e81fc0ee281f43db9a91cb15ff8d317e81b0535" - integrity sha512-T6FBrGuPJ66BgkdwMmjELzuKCOa2vCtYyVzhiUC+le4tEaSunSvk54pDgXqV0ahgV3CzJ7myMzmGyyKCV6kIwg== +"@abp/uppy@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-6.0.0.tgz#00348e2d911e4a3fd733d4b9c60cf9fee6087b4e" + integrity sha512-IEhzcFPx9z0gzem4VMXuqLSiwB2yfopXhOYjnItxjyck6oVw2HsorpyPHFYTl4EpJVQmHuXXDcTVkXMpyIs6Vw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" uppy "^1.16.1" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs index ec7cb919f9..e0d901bdd5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs @@ -1,11 +1,10 @@ using System; using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -using Volo.Abp.Content; namespace Volo.CmsKit.Admin.Pages; public interface IPageAdminAppService : ICrudAppService { + Task SetAsHomePageAsync(Guid id); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs index 20a76bf43e..f8348302d2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs @@ -17,5 +17,7 @@ public class PageDto : AuditedEntityDto, IHasConcurrencyStamp public string Style { get; set; } + public bool IsHomePage { get; set; } + public string ConcurrencyStamp { get; set; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs index b89b38d43a..7ba4cc2d84 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs @@ -35,6 +35,8 @@ public class CmsKitAdminPermissionDefinitionProvider : PermissionDefinitionProvi .RequireGlobalFeatures(typeof(PagesFeature)); pageManagement.AddChild(CmsKitAdminPermissions.Pages.Delete, L("Permission:PageManagement:Delete")) .RequireGlobalFeatures(typeof(PagesFeature)); + pageManagement.AddChild(CmsKitAdminPermissions.Pages.SetAsHomePage, L("Permission:PageManagement:SetAsHomePage")) + .RequireGlobalFeatures(typeof(PagesFeature)); var blogManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Blogs.Default, L("Permission:BlogManagement")) .RequireGlobalFeatures(typeof(BlogsFeature)); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs index b5d2a8eaa6..2852a0b4ee 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs @@ -1,8 +1,6 @@ -using Volo.Abp.Reflection; +namespace Volo.CmsKit.Permissions; -namespace Volo.CmsKit.Permissions; - -public class CmsKitAdminPermissions +public static class CmsKitAdminPermissions { public const string GroupName = "CmsKit"; @@ -34,6 +32,7 @@ public class CmsKitAdminPermissions public const string Create = Default + ".Create"; public const string Update = Default + ".Update"; public const string Delete = Default + ".Delete"; + public const string SetAsHomePage = Default + ".SetAsHomePage"; } public static class Blogs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj index 09faad6247..31b472d7ee 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs index 647568e561..7c3f3fd71e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs @@ -86,4 +86,12 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi { await PageRepository.DeleteAsync(id); } + + [Authorize(CmsKitAdminPermissions.Pages.SetAsHomePage)] + public virtual async Task SetAsHomePageAsync(Guid id) + { + var page = await PageRepository.GetAsync(id); + + await PageManager.SetHomePageAsync(page); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/PageAdminClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/PageAdminClientProxy.Generated.cs index 5d404b2751..efa0315690 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/PageAdminClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/PageAdminClientProxy.Generated.cs @@ -55,4 +55,12 @@ public partial class PageAdminClientProxy : ClientProxyBase" + }, + "SetAsHomePageAsyncById": { + "uniqueName": "SetAsHomePageAsyncById", + "name": "SetAsHomePageAsync", + "httpMethod": "PUT", + "url": "api/cms-kit-admin/pages/setashomepage/{id}", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "id", + "name": "id", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": false, + "implementFrom": "Volo.CmsKit.Admin.Pages.IPageAdminAppService" } } }, diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj index c1634ea1b7..25b90a7bae 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs index 5acccb07aa..26a11c19fb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs @@ -62,4 +62,12 @@ public class PageAdminController : CmsKitAdminController, IPageAdminAppService { return PageAdminAppService.DeleteAsync(id); } + + [HttpPut] + [Authorize(CmsKitAdminPermissions.Pages.SetAsHomePage)] + [Route("setashomepage/{id}")] + public virtual Task SetAsHomePageAsync([FromRoute] Guid id) + { + return PageAdminAppService.SetAsHomePageAsync(id); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs index be4d85ddcc..4c886b9185 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs @@ -1,19 +1,19 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc; -using Volo.CmsKit.Admin.Web.Menus; using Volo.Abp.AspNetCore.Mvc.Localization; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars; +using Volo.Abp.AutoMapper; +using Volo.Abp.Http.ProxyScripting.Generators.JQuery; +using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; +using Volo.CmsKit.Admin.MediaDescriptors; +using Volo.CmsKit.Admin.Web.Menus; using Volo.CmsKit.Localization; -using Volo.CmsKit.Web; using Volo.CmsKit.Permissions; -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars; -using Volo.Abp.Localization; -using Volo.Abp.AutoMapper; -using Volo.Abp.Http.ProxyScripting.Generators.JQuery; -using Volo.CmsKit.Admin.MediaDescriptors; +using Volo.CmsKit.Web; namespace Volo.CmsKit.Admin.Web; @@ -64,6 +64,7 @@ public class CmsKitAdminWebModule : AbpModule options.Conventions.AuthorizeFolder("/CmsKit/Pages", CmsKitAdminPermissions.Pages.Default); options.Conventions.AuthorizeFolder("/CmsKit/Pages/Create", CmsKitAdminPermissions.Pages.Create); options.Conventions.AuthorizeFolder("/CmsKit/Pages/Update", CmsKitAdminPermissions.Pages.Update); + options.Conventions.AuthorizeFolder("/CmsKit/Pages/SetAsHomePage", CmsKitAdminPermissions.Pages.SetAsHomePage); options.Conventions.AuthorizeFolder("/CmsKit/Blogs", CmsKitAdminPermissions.Blogs.Default); options.Conventions.AuthorizeFolder("/CmsKit/Blogs/Create", CmsKitAdminPermissions.Blogs.Create); options.Conventions.AuthorizeFolder("/CmsKit/Blogs/Update", CmsKitAdminPermissions.Blogs.Update); @@ -98,7 +99,7 @@ public class CmsKitAdminWebModule : AbpModule Configure(options => { - options.Configure( + options.Configure( toolbar => { toolbar.AddButton( @@ -110,7 +111,7 @@ public class CmsKitAdminWebModule : AbpModule } ); - options.Configure( + options.Configure( toolbar => { toolbar.AddButton( @@ -121,7 +122,7 @@ public class CmsKitAdminWebModule : AbpModule ); }); - options.Configure( + options.Configure( toolbar => { toolbar.AddButton( @@ -133,7 +134,7 @@ public class CmsKitAdminWebModule : AbpModule ); }); - options.Configure( + options.Configure( toolbar => { toolbar.AddButton( @@ -145,7 +146,7 @@ public class CmsKitAdminWebModule : AbpModule ); }); - options.Configure( + options.Configure( toolbar => { toolbar.AddButton( diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js index fc429e03ff..6d211ec636 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js @@ -10,7 +10,9 @@ $(function (){ return $datePicker.data('date'); }; - + moment.localeData().preparse = (s)=>s; + moment.localeData().postformat = (s)=>s; + $('.singledatepicker').daterangepicker({ "singleDatePicker": true, "showDropdowns": true, diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js index 3a8612072c..730c9b6b30 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js @@ -1,4 +1,4 @@ -$(function (){ +$(function () { var l = abp.localization.getResource("CmsKit"); var pagesService = volo.cmsKit.admin.pages.pageAdmin; @@ -17,7 +17,7 @@ $(function (){ scrollCollapse: true, scrollX: true, ordering: true, - order: [[3, "desc"]], + order: [[4, "desc"]], ajax: abp.libs.datatables.createAjax(pagesService.getList, getFilter), columnDefs: [ { @@ -46,6 +46,21 @@ $(function (){ abp.notify.success(l('SuccessfullyDeleted')); }); } + }, + { + text: l('SetAsHomePage'), + visible: abp.auth.isGranted('CmsKit.Pages.SetAsHomePage'), + action: function (data) { + pagesService + .setAsHomePage(data.record.id) + .then(function () { + + _dataTable.ajax.reload(); + data.record.isHomePage ? + abp.notify.warn(l('RemovedSettingAsHomePage')) + : abp.notify.success(l('CompletedSettingAsHomePage')); + }); + } } ] } @@ -60,6 +75,11 @@ $(function (){ orderable: true, data: "slug" }, + { + title: l("IsHomePage"), + orderable: true, + data: "isHomePage" + }, { title: l("CreationTime"), orderable: true, diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj index e7068a41a8..03a1542d46 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -18,7 +18,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js index 3a61ef6a78..3198bb3e3e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js @@ -136,6 +136,14 @@ }, ajaxParams)); }; + volo.cmsKit.admin.pages.pageAdmin.setAsHomePage = function(id, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/pages/setashomepage/' + id + '', + type: 'PUT', + dataType: null + }, ajaxParams)); + }; + })(); // controller volo.cmsKit.admin.menus.menuItemAdmin diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj index 51282692af..85a3d48229 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.csproj index 145c7adac6..d6a1713198 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.csproj index decaf89c40..432e1c2c0b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj index e717f49be5..8e86d9eee4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -19,7 +19,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj index 550a704a75..d117a4e080 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj @@ -13,7 +13,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs index 773ca621a2..16e070769b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs @@ -11,7 +11,8 @@ public static class CmsKitErrorCodes public static class Pages { public const string SlugAlreadyExist = "CmsKit:Page:0001"; - } + public const string MultipleHomePage = "CmsKit:Page:0002"; + } public static class Ratings { diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 0faaf04e81..b6fb5f5aea 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -112,6 +112,7 @@ "Permission:PageManagement:Create": "Create", "Permission:PageManagement:Delete": "Delete", "Permission:PageManagement:Update": "Update", + "Permission:PageManagement:SetAsHomePage": "Set As Home Page", "Permission:TagManagement": "Tag Management", "Permission:TagManagement.Create": "Create", "Permission:TagManagement.Delete": "Delete", @@ -188,6 +189,10 @@ "SelectAnAuthor": "Select an Author", "InThisDocument": "In This Document", "GoToTop": "Go To Top", + "SetAsHomePage": "Change Home Page Status", + "CompletedSettingAsHomePage": "Set as home page", + "IsHomePage": "Is Home Page", + "RemovedSettingAsHomePage": "Removed setting the home page", "Feature:CmsKitGroup": "Cms Kit", "Feature:BlogEnable": "Enabled blog page", "Feature:BlogEnableDescription": "Enable blog page in the application.", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index 6b47d5ad47..e143332425 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -112,6 +112,7 @@ "Permission:PageManagement:Create": "Oluşturmak", "Permission:PageManagement:Delete": "Silmek", "Permission:PageManagement:Update": "Güncelleme", + "Permission:PageManagement:SetAsHomePage": "Anasayfa Olarak Ayarla", "Permission:TagManagement": "Etiket Yönetimi", "Permission:TagManagement.Create": "Etiket Oluşturma", "Permission:TagManagement.Delete": "Etiket Silme", @@ -161,8 +162,6 @@ "YourReply": "Cevabınız", "MarkdownSupported": "Markdown destekler.", "GlobalResources": "Global Kaynaklar", - "Script": "Script", - "Style": "Style", "SavedSuccessfully": "Başarıyla kaydedildi", "CmsKit.BlogPost.Status.0": "Taslak", "CmsKit.BlogPost.Status.1": "Yayınlandı", @@ -189,6 +188,10 @@ "Add": "Ekle", "AddWidget": "Widget Ekle", "PleaseConfigureWidgets": "Lütfen widget'leri yapılandırın", + "SetAsHomePage": "Ana sayfa Durumunu Değiştir", + "CompletedSettingAsHomePage": "Ana Sayfa olarak ayarlandı", + "IsHomePage": "Ana Sayfa Mı", + "RemovedSettingAsHomePage": "Ana sayfa ayarı kaldırıldı", "Permission:GlobalResources": "Global Kaynaklar", "Feature:CmsKitGroup": "Cms Kit", "Feature:BlogEnable": "Blog sayfasını etkinleştirin", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/IPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/IPageRepository.cs index 020622f080..0b75c32d6b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/IPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/IPageRepository.cs @@ -22,4 +22,6 @@ public interface IPageRepository : IBasicRepository Task FindBySlugAsync(string slug, CancellationToken cancellationToken = default); Task ExistsAsync(string slug, CancellationToken cancellationToken = default); + + Task> GetListOfHomePagesAsync(CancellationToken cancellationToken = default); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs new file mode 100644 index 0000000000..1cf4028e39 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/MultipleHomePageException.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp; + +namespace Volo.CmsKit.Domain.Volo.CmsKit.Pages; + +[Serializable] +public class MultipleHomePageException : BusinessException +{ + public MultipleHomePageException() + { + Code = CmsKitErrorCodes.Pages.MultipleHomePage; + } + + public MultipleHomePageException(SerializationInfo serializationInfo, StreamingContext context) + : base(serializationInfo, context) + { + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs index d5cd64fbed..449b07091b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs @@ -20,6 +20,8 @@ public class Page : FullAuditedAggregateRoot, IMultiTenant public virtual string Style { get; protected set; } + public virtual bool IsHomePage { get; protected set; } + protected Page() { } @@ -49,9 +51,7 @@ public class Page : FullAuditedAggregateRoot, IMultiTenant internal virtual void SetSlug(string slug) { - Slug = SlugNormalizer.Normalize( - Check.NotNullOrEmpty(slug, nameof(slug), PageConsts.MaxSlugLength) - ); + Slug = SlugNormalizer.Normalize(Check.NotNullOrEmpty(slug, nameof(slug), PageConsts.MaxSlugLength)); } public virtual void SetContent(string content) @@ -68,4 +68,9 @@ public class Page : FullAuditedAggregateRoot, IMultiTenant { Style = Check.Length(style, nameof(style), PageConsts.MaxStyleLength); } + + internal void SetIsHomePage(bool isHomePage) + { + IsHomePage = isHomePage; + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs index f0d1bac1e7..96393084c9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs @@ -1,9 +1,6 @@ -using JetBrains.Annotations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using System.Threading.Tasks; +using JetBrains.Annotations; using Volo.Abp; using Volo.Abp.Domain.Services; @@ -11,49 +8,76 @@ namespace Volo.CmsKit.Pages; public class PageManager : DomainService { - protected IPageRepository PageRepository { get; } - - public PageManager(IPageRepository pageRepository) - { - PageRepository = pageRepository; - } - - public virtual async Task CreateAsync( - [NotNull] string title, - [NotNull] string slug, - [CanBeNull] string content = null, - [CanBeNull] string script = null, - [CanBeNull] string style = null) - { - Check.NotNullOrEmpty(title, nameof(title)); - Check.NotNullOrEmpty(slug, nameof(slug)); - - await CheckPageSlugAsync(slug); - - return new Page( - GuidGenerator.Create(), - title, - slug, - content, - script, - style, - CurrentTenant.Id); - } - - public virtual async Task SetSlugAsync(Page page, string newSlug) - { - if (page.Slug != newSlug) - { - await CheckPageSlugAsync(newSlug); - page.SetSlug(newSlug); - } - } - - protected virtual async Task CheckPageSlugAsync(string slug) - { - if (await PageRepository.ExistsAsync(slug)) - { - throw new PageSlugAlreadyExistsException(slug); - } - } + protected IPageRepository PageRepository { get; } + + public PageManager(IPageRepository pageRepository) + { + PageRepository = pageRepository; + } + + public virtual async Task CreateAsync( + [NotNull] string title, + [NotNull] string slug, + [CanBeNull] string content = null, + [CanBeNull] string script = null, + [CanBeNull] string style = null) + { + Check.NotNullOrEmpty(title, nameof(title)); + Check.NotNullOrEmpty(slug, nameof(slug)); + + await CheckPageSlugAsync(slug); + + return new Page( + GuidGenerator.Create(), + title, + slug, + content, + script, + style, + CurrentTenant.Id); + } + + public virtual async Task SetSlugAsync(Page page, string newSlug) + { + if (page.Slug != newSlug) + { + await CheckPageSlugAsync(newSlug); + page.SetSlug(newSlug); + } + } + + public virtual async Task SetHomePageAsync(Page page) + { + var currentHomePages = await PageRepository.GetListAsync(); + + foreach (var homePage in currentHomePages) + { + homePage.SetIsHomePage(false); + } + + await PageRepository.UpdateManyAsync(currentHomePages); + await PageRepository.UpdateAsync(page); + + page.SetIsHomePage(true); + } + + public virtual async Task GetHomePageAsync() + { + var currentHomePages = await PageRepository.GetListAsync(); + + if (currentHomePages.Count > 1) + { + throw new BusinessException("There can be only one home page."); + } + + return currentHomePages.FirstOrDefault(); + } + + protected virtual async Task CheckPageSlugAsync(string slug) + { + if (await PageRepository.ExistsAsync(slug)) + { + throw new PageSlugAlreadyExistsException(slug); + } + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj index eb970235d7..264c1aabdb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index 125c1a97ff..aefd834013 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -63,4 +63,9 @@ public class EfCorePageRepository : EfCoreRepository x.Slug == slug, GetCancellationToken(cancellationToken)); } + + public virtual Task> GetListOfHomePagesAsync(CancellationToken cancellationToken = default) + { + return GetListAsync(x => x.IsHomePage, cancellationToken: GetCancellationToken(cancellationToken)); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj index 481bfb18f8..6c7e80d065 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj index 75cf15ad04..916f122386 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index 74c5d8cc3c..d398e7de64 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -71,4 +71,9 @@ public class MongoPageRepository : MongoDbRepository x.Slug == slug, GetCancellationToken(cancellationToken)); } + + public virtual Task> GetListOfHomePagesAsync(CancellationToken cancellationToken = default) + { + return GetListAsync(x => x.IsHomePage, cancellationToken: GetCancellationToken(cancellationToken)); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs index 230b8ded97..bec4261f19 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs @@ -8,4 +8,5 @@ namespace Volo.CmsKit.Public.Pages; public interface IPagePublicAppService : IApplicationService { Task FindBySlugAsync([NotNull] string slug); + Task FindDefaultHomePageAsync(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj index 0e192cec7a..9f6d08fea6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs index c93adcd5a7..b151775d8a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs @@ -1,4 +1,7 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.Caching.Distributed; +using Volo.Abp.Caching; using Volo.Abp.Features; using Volo.Abp.GlobalFeatures; using Volo.CmsKit.Contents; @@ -13,10 +16,15 @@ namespace Volo.CmsKit.Public.Pages; public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppService { protected IPageRepository PageRepository { get; } + protected PageManager PageManager { get; } - public PagePublicAppService(IPageRepository pageRepository) + protected IDistributedCache PageCache { get; } + + public PagePublicAppService(IPageRepository pageRepository, PageManager pageManager, IDistributedCache pageCache) { PageRepository = pageRepository; + PageManager = pageManager; + PageCache = pageCache; } public virtual async Task FindBySlugAsync(string slug) @@ -30,4 +38,24 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe return ObjectMapper.Map(page); } + + public virtual async Task FindDefaultHomePageAsync() + { + var pageDto = await PageCache.GetAsync("DefaultHomePage"); + if (pageDto is null) + { + var page = await PageManager.GetHomePageAsync(); + if (page is null) + { + return null; + } + + pageDto = ObjectMapper.Map(page); + + await PageCache.SetAsync("DefaultHomePage", pageDto, + new DistributedCacheEntryOptions { AbsoluteExpiration = DateTimeOffset.Now.AddHours(1) }); + } + + return pageDto; + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs index f26816e88d..79b883aa49 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs @@ -2,8 +2,11 @@ using System; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; +using Volo.Abp.Http.Client; +using Volo.Abp.Http.Modeling; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.ClientProxying; +using Volo.CmsKit.Public.Blogs; using Volo.CmsKit.Contents; using Volo.CmsKit.Users; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs index f992bb3dbf..2ae4e790a6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs @@ -1,7 +1,12 @@ // This file is automatically generated by ABP framework to use MVC Controllers from CSharp +using System; using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Http.Client; +using Volo.Abp.Http.Modeling; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.ClientProxying; +using Volo.CmsKit.Public.Pages; using Volo.CmsKit.Contents; // ReSharper disable once CheckNamespace @@ -18,4 +23,9 @@ public partial class PagesPublicClientProxy : ClientProxyBase FindDefaultHomePageAsync() + { + return await RequestAsync(nameof(FindDefaultHomePageAsync)); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json index e3b3802ee9..2892c636e3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json @@ -553,6 +553,21 @@ }, "allowAnonymous": null, "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" + }, + "FindDefaultHomePageAsync": { + "uniqueName": "FindDefaultHomePageAsync", + "name": "FindDefaultHomePageAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/pages", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "Volo.CmsKit.Contents.PageDto", + "typeSimple": "Volo.CmsKit.Contents.PageDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" } } }, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj index 34682192d6..b85a6537a4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs index 22f2bd75bd..d6550977ef 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs @@ -29,4 +29,10 @@ public class PagesPublicController : CmsKitPublicControllerBase, IPagePublicAppS { return PageAppService.FindBySlugAsync(slug); } + + [HttpGet] + public Task FindDefaultHomePageAsync() + { + return PageAppService.FindDefaultHomePageAsync(); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs index 3ce96f1a86..4121999f91 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs @@ -1,9 +1,11 @@ using Markdig; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.Ui.LayoutHooks; using Volo.Abp.AutoMapper; +using Volo.Abp.Caching; using Volo.Abp.GlobalFeatures; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; @@ -75,6 +77,11 @@ public class CmsKitPublicWebModule : AbpModule { options.DisableModule(CmsKitPublicRemoteServiceConsts.ModuleName); }); + + Configure(options => + { + options.KeyPrefix = "CmsKit:"; + }); } public override void PostConfigureServices(ServiceConfigurationContext context) @@ -88,21 +95,31 @@ public class CmsKitPublicWebModule : AbpModule options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug:minlength(1)}"); }); } - + if (GlobalFeatureManager.Instance.IsEnabled()) { Configure(options => { options.Add( - LayoutHooks.Head.Last, - typeof(GlobalStyleViewComponent) + LayoutHooks.Head.Last, + typeof(GlobalStyleViewComponent) ); options.Add( - LayoutHooks.Body.Last, - typeof(GlobalScriptViewComponent) + LayoutHooks.Body.Last, + typeof(GlobalScriptViewComponent) ); }); } } + + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + var app = context.GetApplicationBuilder(); + + if (GlobalFeatureManager.Instance.IsEnabled()) + { + app.UseHomePageDefaultMiddleware(); + } + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs new file mode 100644 index 0000000000..bb30a5276c --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Volo.CmsKit.Pages; +using Volo.CmsKit.Public.Pages; + +namespace Volo.CmsKit.Public.Web; + +public class DefaultHomePageMiddleware +{ + private readonly RequestDelegate _next; + private readonly IPagePublicAppService _pagePublicAppService; + + public DefaultHomePageMiddleware(RequestDelegate next, IPagePublicAppService pagePublicAppService) + { + _next = next; + _pagePublicAppService = pagePublicAppService; + } + public async Task InvokeAsync(HttpContext httpContext) + { + var page = await _pagePublicAppService.FindDefaultHomePageAsync(); + if (page is not null && httpContext.Request.Path.Value == "/") + { + httpContext.Request.Path = $"{PageConsts.UrlPrefix}{page.Slug}"; + } + + await _next(httpContext); + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/HomePageDefaultMiddlewareExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/HomePageDefaultMiddlewareExtensions.cs new file mode 100644 index 0000000000..c5a2d8516f --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/HomePageDefaultMiddlewareExtensions.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Builder; + +namespace Volo.CmsKit.Public.Web; + +public static class HomePageDefaultMiddlewareExtensions +{ + public static IApplicationBuilder UseHomePageDefaultMiddleware(this IApplicationBuilder builder) + { + return builder.UseMiddleware(); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj index b4aeb556fe..da794f2eac 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -15,7 +15,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js index e1cdae5ec3..ec98417af5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js @@ -95,6 +95,13 @@ }, ajaxParams)); }; + volo.cmsKit.public.pages.pagesPublic.findDefaultHomePage = function(ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-public/pages', + type: 'GET' + }, ajaxParams)); + }; + })(); // controller volo.cmsKit.public.menus.menuItemPublic @@ -188,7 +195,7 @@ volo.cmsKit.public.blogs.blogPostPublic.getList = function(blogSlug, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/blog-posts/' + blogSlug + '' + abp.utils.buildQueryString([{ name: 'authorId', value: input.authorId }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + url: abp.appPath + 'api/cms-kit-public/blog-posts/' + blogSlug + '' + abp.utils.buildQueryString([{ name: 'authorId', value: input.authorId }, { name: 'tagId', value: input.tagId }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', type: 'GET' }, ajaxParams)); }; diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj index a22da28426..ea7e47859b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -19,7 +19,7 @@ - + diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs index 97a931fb70..86346da843 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs @@ -130,4 +130,17 @@ public class PageAdminAppService_Tests : CmsKitApplicationTestBase await Should.ThrowAsync(async () => await _pageRepository.GetAsync(_data.Page_1_Id)); } + + [Fact] + public async Task ShouldSetAsHomePageAsync() + { + await _pageAdminAppService.SetAsHomePageAsync(_data.Page_1_Id); + + var setAsHomePage = await _pageAdminAppService.GetAsync(_data.Page_1_Id); + var setAsHomePageAsFalse = await _pageAdminAppService.GetAsync(_data.Page_2_Id); + + setAsHomePage.IsHomePage.ShouldBeTrue(); + setAsHomePageAsFalse.IsHomePage.ShouldBeFalse(); + + } } diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj index 0fcb1c227e..a6b48225f8 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Pages/PageManager_Test.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Pages/PageManager_Test.cs index 208de3817f..44cea7d005 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Pages/PageManager_Test.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Pages/PageManager_Test.cs @@ -1,70 +1,113 @@ using System.Threading.Tasks; using Shouldly; +using Volo.CmsKit.Tags; using Xunit; namespace Volo.CmsKit.Pages; public class PageManager_Test : CmsKitDomainTestBase { - private readonly PageManager pageManager; - private readonly CmsKitTestData testData; - private readonly IPageRepository pageRepository; - - public PageManager_Test() - { - pageManager = GetRequiredService(); - testData = GetRequiredService(); - pageRepository = GetRequiredService(); - } - - [Fact] - public async Task CreateAsync_ShouldWorkProperly_WithNonExistingSlug() - { - var title = "My awesome page"; - var slug = "my-awesome-page"; - var content = "

My Awesome Page

This is my awesome page content!

"; - - var page = await pageManager.CreateAsync(title, slug, content); - - page.ShouldNotBeNull(); - page.Title.ShouldBe(title); - page.Slug.ShouldBe(slug); - page.Content.ShouldBe(content); - } - - [Fact] - public async Task CreateAsync_ShouldThrowException_WithExistingSlug() - { - var title = "My awesome page"; - var slug = testData.Page_1_Slug; - var content = "

My Awesome Page

This is my awesome page content!

"; - - var exception = await Should.ThrowAsync(async () => - await pageManager.CreateAsync(title, slug, content)); - - exception.ShouldNotBeNull(); - } - - [Fact] - public async Task SetSlugAsync_ShouldWorkProperly_WithNonExistingSlug() - { - var newSlug = "freshly-generated-new-slug"; - var page = await pageRepository.GetAsync(testData.Page_1_Id); - - await pageManager.SetSlugAsync(page, newSlug); - - page.Slug.ShouldBe(newSlug); - } - - [Fact] - public async Task SetSlugAsync_ShouldThrowException_WithExistingSlug() - { - var newSlug = testData.Page_2_Slug; - var page = await pageRepository.GetAsync(testData.Page_1_Id); - - var exception = await Should.ThrowAsync(async () => - await pageManager.SetSlugAsync(page, newSlug)); - - exception.ShouldNotBeNull(); - } + private readonly PageManager pageManager; + private readonly CmsKitTestData testData; + private readonly IPageRepository pageRepository; + + public PageManager_Test() + { + pageManager = GetRequiredService(); + testData = GetRequiredService(); + pageRepository = GetRequiredService(); + } + + [Fact] + public async Task CreateAsync_ShouldWorkProperly_WithNonExistingSlug() + { + var title = "My awesome page"; + var slug = "my-awesome-page"; + var content = "

My Awesome Page

This is my awesome page content!

"; + + var page = await pageManager.CreateAsync(title, slug, content); + + page.ShouldNotBeNull(); + page.Title.ShouldBe(title); + page.Slug.ShouldBe(slug); + page.Content.ShouldBe(content); + } + + [Fact] + public async Task CreateAsync_ShouldThrowException_WithExistingSlug() + { + var title = "My awesome page"; + var slug = testData.Page_1_Slug; + var content = "

My Awesome Page

This is my awesome page content!

"; + + var exception = await Should.ThrowAsync(async () => + await pageManager.CreateAsync(title, slug, content)); + + exception.ShouldNotBeNull(); + } + + [Fact] + public async Task SetSlugAsync_ShouldWorkProperly_WithNonExistingSlug() + { + var newSlug = "freshly-generated-new-slug"; + var page = await pageRepository.GetAsync(testData.Page_1_Id); + + await pageManager.SetSlugAsync(page, newSlug); + + page.Slug.ShouldBe(newSlug); + } + + [Fact] + public async Task SetSlugAsync_ShouldThrowException_WithExistingSlug() + { + var newSlug = testData.Page_2_Slug; + var page = await pageRepository.GetAsync(testData.Page_1_Id); + + var exception = await Should.ThrowAsync(async () => + await pageManager.SetSlugAsync(page, newSlug)); + + exception.ShouldNotBeNull(); + } + + [Fact] + public async Task SetHomePageAsync_ShouldWorkProperly_IfExistHomePage() + { + await WithUnitOfWorkAsync(async ()=> + { + var page = await pageRepository.GetAsync(testData.Page_1_Id); + + await pageManager.SetHomePageAsync(page); + }); + + var page = await pageRepository.GetAsync(testData.Page_1_Id); + page.IsHomePage.ShouldBeTrue(); + + var pageSetAsHomePageAsFalse = await pageRepository.GetAsync(testData.Page_2_Id); + pageSetAsHomePageAsFalse.IsHomePage.ShouldBeFalse(); + } + + [Fact] + public async Task SetHomePageAsync_ShouldFix_WhenMultipleHomePageExist() + { + await WithUnitOfWorkAsync(async () => + { + var page1 = await pageRepository.GetAsync(testData.Page_1_Id); + var page2 = await pageRepository.GetAsync(testData.Page_2_Id); + + page1.SetIsHomePage(true); + page2.SetIsHomePage(true); + + await pageRepository.UpdateManyAsync(new[] { page1, page2 }, autoSave: true); + + await pageManager.SetHomePageAsync(page1); + }); + + var page1 = await pageRepository.GetAsync(testData.Page_1_Id); + var page2 = await pageRepository.GetAsync(testData.Page_2_Id); + + page2 = await pageRepository.GetAsync(testData.Page_2_Id); + + page1.IsHomePage.ShouldBeTrue(); + page2.IsHomePage.ShouldBeFalse(); + } } diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj index d2fdb5d123..f12130fac5 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj index 89319b548f..ed960bc8a0 100644 --- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.csproj b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.csproj index afad061355..3119777e1b 100644 --- a/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.HttpApi.Client.ConsoleTestApp/Volo.CmsKit.HttpApi.Client.ConsoleTestApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj index c34425e716..b735bc5645 100644 --- a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Pages/PageRepository_Test.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Pages/PageRepository_Test.cs index 4b56f77f43..dcdcef5ad3 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/Pages/PageRepository_Test.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Pages/PageRepository_Test.cs @@ -7,88 +7,96 @@ using Xunit; namespace Volo.CmsKit.Pages; public abstract class PageRepository_Test : CmsKitTestBase - where TStartupModule : IAbpModule + where TStartupModule : IAbpModule { - private readonly CmsKitTestData _cmsKitTestData; - private readonly IPageRepository _pageRepository; + private readonly CmsKitTestData _cmsKitTestData; + private readonly IPageRepository _pageRepository; - protected PageRepository_Test() - { - _cmsKitTestData = GetRequiredService(); - _pageRepository = GetRequiredService(); - } + protected PageRepository_Test() + { + _cmsKitTestData = GetRequiredService(); + _pageRepository = GetRequiredService(); + } - [Fact] - public async Task CountAsync() - { - var totalCount = await _pageRepository.GetCountAsync(); + [Fact] + public async Task CountAsync() + { + var totalCount = await _pageRepository.GetCountAsync(); - totalCount.ShouldBe(2); + totalCount.ShouldBe(2); - var filteredCount = await _pageRepository.GetCountAsync(_cmsKitTestData.Page_2_Title); + var filteredCount = await _pageRepository.GetCountAsync(_cmsKitTestData.Page_2_Title); - filteredCount.ShouldBe(1); - } + filteredCount.ShouldBe(1); + } - [Fact] - public async Task GetListAsync() - { - var list = await _pageRepository.GetListAsync(); + [Fact] + public async Task GetListAsync() + { + var list = await _pageRepository.GetListAsync(); - list.ShouldNotBeNull(); - list.Count.ShouldBe(2); + list.ShouldNotBeNull(); + list.Count.ShouldBe(2); - var list_page_1 = await _pageRepository.GetListAsync(maxResultCount: 1); - var list_page_2 = await _pageRepository.GetListAsync(maxResultCount: 1, skipCount: 1); + var list_page_1 = await _pageRepository.GetListAsync(maxResultCount: 1); + var list_page_2 = await _pageRepository.GetListAsync(maxResultCount: 1, skipCount: 1); - list_page_1.ShouldNotBeNull(); - list_page_1.Count.ShouldBe(1); - list_page_1.First().Title.ShouldBe(_cmsKitTestData.Page_1_Title); + list_page_1.ShouldNotBeNull(); + list_page_1.Count.ShouldBe(1); + list_page_1.First().Title.ShouldBe(_cmsKitTestData.Page_1_Title); - list_page_2.ShouldNotBeNull(); - list_page_1.Count.ShouldBe(1); - list_page_2.First().Title.ShouldBe(_cmsKitTestData.Page_2_Title); - } + list_page_2.ShouldNotBeNull(); + list_page_1.Count.ShouldBe(1); + list_page_2.First().Title.ShouldBe(_cmsKitTestData.Page_2_Title); + } - [Fact] - public async Task ShouldGetByUrlAsync() - { - var page = await _pageRepository.GetBySlugAsync(_cmsKitTestData.Page_1_Slug); + [Fact] + public async Task ShouldGetByUrlAsync() + { + var page = await _pageRepository.GetBySlugAsync(_cmsKitTestData.Page_1_Slug); - page.ShouldNotBeNull(); - page.Title.ShouldBe(_cmsKitTestData.Page_1_Title); - } + page.ShouldNotBeNull(); + page.Title.ShouldBe(_cmsKitTestData.Page_1_Title); + } - [Fact] - public async Task ShouldFindByUrlAsync() - { - var page = await _pageRepository.FindBySlugAsync(_cmsKitTestData.Page_1_Slug); + [Fact] + public async Task ShouldFindByUrlAsync() + { + var page = await _pageRepository.FindBySlugAsync(_cmsKitTestData.Page_1_Slug); - page.ShouldNotBeNull(); - page.Title.ShouldBe(_cmsKitTestData.Page_1_Title); - } + page.ShouldNotBeNull(); + page.Title.ShouldBe(_cmsKitTestData.Page_1_Title); + } - [Fact] - public async Task ShouldNotFindByUrlAsync() - { - var page = await _pageRepository.FindBySlugAsync("not-exist-lyrics"); + [Fact] + public async Task ShouldNotFindByUrlAsync() + { + var page = await _pageRepository.FindBySlugAsync("not-exist-lyrics"); - page.ShouldBeNull(); - } + page.ShouldBeNull(); + } - [Fact] - public async Task ShouldBeExistAsync() - { - var page = await _pageRepository.ExistsAsync(_cmsKitTestData.Page_1_Slug); + [Fact] + public async Task ShouldBeExistAsync() + { + var page = await _pageRepository.ExistsAsync(_cmsKitTestData.Page_1_Slug); - page.ShouldBeTrue(); - } + page.ShouldBeTrue(); + } - [Fact] - public async Task ShouldNotBeExistAsync() - { - var page = await _pageRepository.ExistsAsync("not-exist-lyrics"); + [Fact] + public async Task ShouldNotBeExistAsync() + { + var page = await _pageRepository.ExistsAsync("not-exist-lyrics"); - page.ShouldBeFalse(); - } + page.ShouldBeFalse(); + } + + [Fact] + public async Task ShouldntFindByIsHomePageAsync() + { + var pages = await _pageRepository.GetListOfHomePagesAsync(); + + pages.ShouldBeEmpty(); + } } diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj b/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj index 4e7550c00c..57bf7af9f5 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.CmsKit diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj index 84dce5e2e4..cfd2728af5 100644 --- a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj +++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj index 05d3072d87..9dd4a5e1a9 100644 --- a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj +++ b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Exe win-x64;linux-x64;osx-x64 diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index 1fe70d3232..499b038132 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true true false diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 5608ae4c0a..041eb03cb8 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5", - "@abp/docs": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0", + "@abp/docs": "^6.0.0" } } diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj index 781dc024c5..e7f372dfc6 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj @@ -23,7 +23,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj index 72f94bdd47..eb1c23a955 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.Admin.Application Volo.Docs.Admin.Application diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.csproj b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.csproj index b82f4bba91..2be7decae7 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.csproj +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.Admin.HttpApi Volo.Docs.Admin.HttpApi diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js index d8a8bbd9f9..a1ff58ff63 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js @@ -6,7 +6,9 @@ $(function () { return $datePicker.data('date'); }; - + moment.localeData().preparse = (s)=>s; + moment.localeData().postformat = (s)=>s; + $('.singledatepicker').daterangepicker({ "singleDatePicker": true, "showDropdowns": true, diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj index 1c83977e3a..0e184f85ce 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.Admin.Web Volo.Docs.Admin.Web Library @@ -27,7 +27,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj index b00754b104..689c7ba62f 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj +++ b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.Application Volo.Docs.Application diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index d8548c9bbc..29020e50bc 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj index 0ffb7999a0..81d4f3304f 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.EntityFrameworkCore Volo.Docs.EntityFrameworkCore diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.csproj b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.csproj index a9c7c6a4e5..88c41e50da 100644 --- a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.csproj +++ b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.HttpApi Volo.Docs.HttpApi diff --git a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj index 322d689782..e5aa21834b 100644 --- a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj +++ b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj index 43fb1bb9bb..24085924a7 100644 --- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj +++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Docs.Web Volo.Docs.Web Library @@ -23,7 +23,7 @@ - + diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj index 431a785799..626f8d74a5 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj +++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.csproj b/modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.csproj index 4ca20fbe28..8b14273f9c 100644 --- a/modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.csproj +++ b/modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.csproj b/modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.csproj index a4218704d9..94baa3cb98 100644 --- a/modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.csproj +++ b/modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj b/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj index 2ee496241e..6e1ebecc8f 100644 --- a/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj +++ b/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.csproj b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.csproj index 3403137a3f..a99fe71479 100644 --- a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.csproj +++ b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.csproj b/modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.csproj index e8a295d1b0..92fff9f042 100644 --- a/modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.csproj +++ b/modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj index 4ea705d8ef..b1d73f3b39 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj index 18bc701f47..cf125135ca 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj index 6ca6827345..e6883c3e65 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj index 49d7ffd6c6..4034f39c12 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj index 9f1260ee56..21f8595cf7 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj @@ -15,7 +15,7 @@ - + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.csproj index 9059e0e14b..06376b2198 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.csproj index f522c517e7..accd91a9c7 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj index 892777d2ab..b1599f685f 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj index f9e1bdb16e..4c72508f43 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -28,7 +28,7 @@ - + diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.csproj b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.csproj index 64407eeaac..558ce8d4ec 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.csproj +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo.Abp.FeatureManagement.Application.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.csproj b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.csproj index 554b15141e..f6ee203f43 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.csproj +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo.Abp.FeatureManagement.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj index f028c9b9b6..2b2dd43864 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.csproj b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.csproj index 8f00ecf998..4e5a1775c4 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.csproj +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo.Abp.FeatureManagement.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.csproj b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.csproj index 89341bd394..4380732711 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.csproj +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo.Abp.FeatureManagement.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj index 4698a381fa..4a01b833aa 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.Application Volo.Abp.Identity.Application $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.csproj b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.csproj index 3e00d7d2ce..5bb4e3b29e 100644 --- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.csproj +++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo.Abp.Identity.AspNetCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.AspNetCore Volo.Abp.Identity.AspNetCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj index c3606503b8..eed96d26ce 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj index 590ac76e92..7ee187e3cd 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 9cd0164a02..ab9107118e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -47,7 +47,7 @@ - @L["DisplayName:RoleName"] + @L["DisplayName:RoleName"] * @@ -85,7 +85,7 @@ - @L["DisplayName:RoleName"] + @L["DisplayName:RoleName"] * diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index fdd979b2a0..1aa88f2c14 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -64,7 +64,7 @@ - @L["DisplayName:UserName"] + @L["DisplayName:UserName"] * @@ -94,7 +94,7 @@ - @L["DisplayName:Password"] + @L["DisplayName:Password"] * @@ -109,7 +109,7 @@ - @L["DisplayName:Email"] + @L["DisplayName:Email"] * @@ -183,7 +183,7 @@ - @L["DisplayName:UserName"] + @L["DisplayName:UserName"] * @@ -228,7 +228,7 @@ - @L["DisplayName:Email"] + @L["DisplayName:Email"] * diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj index 4cd965e0eb..1cdab5e69f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj index fd461ebe66..ddd23ab870 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj @@ -27,7 +27,7 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj index 41cf02d96e..8dd4ffa899 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.EntityFrameworkCore Volo.Abp.Identity.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj index 374001080d..a5f9a793a0 100644 --- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj +++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.HttpApi Volo.Abp.Identity.HttpApi $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj index 71cdf1eff3..6978ce16b7 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml index b192a5323b..2a4216d5d7 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml @@ -29,7 +29,7 @@
- +
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml index db0dd8422e..28d0fd6da6 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml @@ -29,7 +29,7 @@
- + diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj index e3baeb0892..e9b57c9b01 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.Web Volo.Abp.Identity.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -45,7 +45,7 @@ - + diff --git a/modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.csproj b/modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.csproj index 43ce47b016..08e8c32d87 100644 --- a/modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.csproj +++ b/modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo.Abp.Identity.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.Application.Tests Volo.Abp.Identity.Application.Tests true diff --git a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.csproj b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.csproj index 50963e1538..798cb3473f 100644 --- a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.csproj +++ b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo.Abp.Identity.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.AspNetCore.Tests Volo.Abp.Identity.AspNetCore.Tests true diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.csproj b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.csproj index 825c31a2eb..efec94a7ea 100644 --- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.csproj +++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo.Abp.Identity.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.Domain.Tests Volo.Abp.Identity.Domain.Tests true @@ -19,7 +19,7 @@ - + diff --git a/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj b/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj index 139ccc9262..9f583a4d1b 100644 --- a/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj +++ b/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.EntityFrameworkCore.Tests Volo.Abp.Identity.EntityFrameworkCore.Tests true diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.csproj b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.csproj index 4288c3073b..d9704ac108 100644 --- a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.csproj +++ b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo.Abp.Identity.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.MongoDB.Tests Volo.Abp.Identity.MongoDB.Tests true diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.csproj b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.csproj index 81f145e863..5b4929712f 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.csproj +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo.Abp.Identity.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.Identity.TestBase Volo.Abp.Identity.TestBase true diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs index 04deba09fe..be757d5008 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs @@ -124,7 +124,7 @@ public abstract class OrganizationUnitRepository_Tests : AbpIden [Fact] public async Task RemoveOrganizationUnitFromUser() { - using (var uow = _unitOfWorkManager.Begin()) + using (var uow = _unitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) { var ou112 = await _organizationUnitRepository.GetAsync( _lookupNormalizer.NormalizeName("OU112")); diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj index 525cea6871..c945924124 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.Domain Volo.Abp.IdentityServer.Domain $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj index 14de1ee8c9..f295a9b3a2 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.EntityFrameworkCore Volo.Abp.IdentityServer.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj index 6b99c2fd47..fd07105633 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj index 6ed1f9ba6b..a088db3778 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.MongoDB Volo.Abp.IdentityServer.MongoDB $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.csproj b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.csproj index fe9c092f4f..531d7db8cf 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.csproj +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo.Abp.IdentityServer.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.Domain.Tests Volo.Abp.IdentityServer.Domain.Tests true diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj index e23e9416d5..49fcacef4e 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.EntityFrameworkCore.Tests Volo.Abp.IdentityServer.EntityFrameworkCore.Tests true diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.csproj b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.csproj index 7200a74ce6..43cd256eac 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.csproj +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo.Abp.IdentityServer.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.MongoDB.Tests Volo.Abp.IdentityServer.MongoDB.Tests true diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.csproj b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.csproj index 5ea3296863..cc3210f7c7 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.csproj +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo.Abp.IdentityServer.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.IdentityServer.TestBase Volo.Abp.IdentityServer.TestBase true diff --git a/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj index fc8ba192d3..055162f5ac 100644 --- a/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj index 8291ec7157..70721e10c1 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.csproj b/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.csproj index 8302a5d26e..12b1085bc2 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable enable diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj index f1fc938e17..51010aa002 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj index 3bf02ee182..d779929d9a 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable OpenIddict.Demo.Server1 diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 36923e0e3d..0848bae9a3 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index 1c266cf036..3def08cbc7 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.5", - "@abp/ng.components": "~6.0.0-rc.5", - "@abp/ng.core": "~6.0.0-rc.5", - "@abp/ng.identity": "~6.0.0-rc.5", - "@abp/ng.setting-management": "~6.0.0-rc.5", - "@abp/ng.tenant-management": "~6.0.0-rc.5", - "@abp/ng.theme.basic": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.account": "~6.0.0", + "@abp/ng.components": "~6.0.0", + "@abp/ng.core": "~6.0.0", + "@abp/ng.identity": "~6.0.0", + "@abp/ng.setting-management": "~6.0.0", + "@abp/ng.tenant-management": "~6.0.0", + "@abp/ng.theme.basic": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.0-rc.5", + "@abp/ng.schematics": "~6.0.0", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj index fabcb8116b..ac3eef6a01 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Library true diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj index 34a4d6c334..2644d555f4 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj @@ -15,7 +15,7 @@ - + diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs index 87ef747f7b..34ff4ba41f 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs @@ -25,6 +25,7 @@ public static class OpenIddictApplicationExtensions foreach (var extraProperty in model.ExtraProperties) { + entity.ExtraProperties.Remove(extraProperty.Key); entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } @@ -86,6 +87,7 @@ public static class OpenIddictApplicationExtensions foreach (var extraProperty in entity.ExtraProperties) { + model.ExtraProperties.Remove(extraProperty.Key); model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs index 28ad28a206..80ef56539b 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs @@ -19,6 +19,7 @@ public static class OpenIddictAuthorizationExtensions foreach (var extraProperty in model.ExtraProperties) { + entity.ExtraProperties.Remove(extraProperty.Key); entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } @@ -68,6 +69,7 @@ public static class OpenIddictAuthorizationExtensions foreach (var extraProperty in entity.ExtraProperties) { + model.ExtraProperties.Remove(extraProperty.Key); model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs index b6870d9d67..6734af2e1b 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs @@ -19,6 +19,7 @@ public static class OpenIddictScopeExtensions foreach (var extraProperty in model.ExtraProperties) { + entity.ExtraProperties.Remove(extraProperty.Key); entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } @@ -69,6 +70,7 @@ public static class OpenIddictScopeExtensions foreach (var extraProperty in entity.ExtraProperties) { + model.ExtraProperties.Remove(extraProperty.Key); model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs index 5799188483..10b290f272 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs @@ -24,6 +24,7 @@ public static class OpenIddictTokenExtensions foreach (var extraProperty in model.ExtraProperties) { + entity.ExtraProperties.Remove(extraProperty.Key); entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } @@ -81,6 +82,7 @@ public static class OpenIddictTokenExtensions foreach (var extraProperty in entity.ExtraProperties) { + model.ExtraProperties.Remove(extraProperty.Key); model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value); } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.csproj index 3a4b4147bc..fadaaa201a 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj index d2cdd84b53..23e62b1773 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.csproj index ff155124b1..0607a4723e 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj index bc0107236b..3e06388401 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj index 959bdcbfef..46e791178d 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj index 12cb1cfddd..77e2d9c59f 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj index 08d40ade84..3eb46bff4e 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.csproj index 080432db39..3a37ab6d33 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.Application Volo.Abp.PermissionManagement.Application $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj index a89e5cfaee..695170a1a0 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj index a8ff989b53..a2eaf1bfb2 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj index 18b2dda1a0..965cd5f0d9 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj index c44c0b326f..70c8b26f2d 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj @@ -25,7 +25,7 @@ - + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj index 83d07fbd40..e22990e2f8 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.EntityFrameworkCore Volo.Abp.PermissionManagement.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.csproj index 8f6c2e9006..870cd86aa1 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.HttpApi Volo.Abp.PermissionManagement.HttpApi $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj index c98cf37a80..166e5ea06c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj index bf11efd61d..1fb94a5eae 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.Web Volo.Abp.PermissionManagement.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -35,7 +35,7 @@ - + diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.csproj index ae945dd4a9..3aed24a20e 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.csproj index 8e77b2d56c..246f5ba05d 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo.Abp.PermissionManagement.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.Tests Volo.Abp.PermissionManagement.Tests true diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj index 2caab81eb6..e0a283e27c 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests true diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.csproj index 9a23915ee8..96e4cb97ef 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo.Abp.PermissionManagement.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.MongoDB.Tests Volo.Abp.PermissionManagement.MongoDB.Tests true diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.csproj index 66d69fe5c1..9b5d6cc9f9 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo.Abp.PermissionManagement.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.PermissionManagement.TestBase Volo.Abp.PermissionManagement.TestBase true diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj index d844f022ae..397202db72 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 InProcess true diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index c94821f48a..441197077f 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index e9a4e0ce7e..b868eae065 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.csproj index 8061d285e7..024fa9ad60 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj index bb4d130a4b..86ce407803 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj index d237edd4c5..9d3b2bf0a3 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj index d10f250d58..6aeeb72dc4 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.SettingManagement.Blazor diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.csproj index f6c3e0a102..38991408d5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.csproj @@ -21,7 +21,7 @@ - + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.csproj index cde8078b21..3938a0bbd4 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.SettingManagement.EntityFrameworkCore Volo.Abp.SettingManagement.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.csproj index f46efa14ee..e90095f43d 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj index 80d67a675e..afdc3b8f6f 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml index a5e0275535..f653ec54a0 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml @@ -21,7 +21,7 @@
- +
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj index 7b77c68f22..f4f03b3706 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Library true $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -23,7 +23,7 @@ - + diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj b/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj index a1d22398ab..905949555c 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.SettingManagement.EntityFrameworkCore.Tests Volo.Abp.SettingManagement.EntityFrameworkCore.Tests true diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.csproj b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.csproj index a0b59785ad..ee315162a7 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.csproj +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo.Abp.SettingManagement.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.SettingManagement.MongoDB.Tests Volo.Abp.SettingManagement.MongoDB.Tests true diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.csproj b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.csproj index 58846a3c59..6a50c2c08d 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.csproj +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo.Abp.SettingManagement.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.SettingManagement.TestBase Volo.Abp.SettingManagement.TestBase true diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.csproj b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.csproj index 2cef566e1f..eddc8c95c4 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.csproj +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo.Abp.SettingManagement.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.SettingManagement.Tests Volo.Abp.SettingManagement.Tests true diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj index 25e39ab17c..81e405b030 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.Application Volo.Abp.TenantManagement.Application $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj index 5fdaf68394..9bec240ef7 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj index 6c3485a812..1966e0bcdd 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index 1662d8a961..a1d4f66427 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor @@ -46,7 +46,7 @@ - @L["TenantName"] + @L["TenantName"] * @@ -56,7 +56,7 @@ - @L["DisplayName:AdminEmailAddress"] + @L["DisplayName:AdminEmailAddress"] * @@ -66,7 +66,7 @@ - @L["DisplayName:AdminPassword"] + @L["DisplayName:AdminPassword"] * @@ -100,7 +100,7 @@ - @L["TenantName"] + @L["TenantName"] * diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj index 664af8aa4c..23e373f003 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.csproj index 7aa53a7476..effe1e51f4 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.csproj @@ -25,7 +25,7 @@ - + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.csproj index 38e4bd007a..9b12c9b859 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.EntityFrameworkCore Volo.Abp.TenantManagement.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.csproj index 65b638427e..40aa3b5af2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.HttpApi Volo.Abp.TenantManagement.HttpApi $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj index 639761f65b..cd32bccc17 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj index 57bcb8be37..baa3cdb03c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.Web Volo.Abp.TenantManagement.Web true @@ -39,7 +39,7 @@ - + diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.csproj b/modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.csproj index 813368f1cb..14d682f05e 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.csproj +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo.Abp.TenantManagement.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.Application.Tests Volo.Abp.TenantManagement.Application.Tests true diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.csproj b/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.csproj index 14fae122ed..b2f13e5502 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.csproj +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo.Abp.TenantManagement.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj index 938b36c9e8..d3c9a0ec89 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.EntityFrameworkCore.Tests Volo.Abp.TenantManagement.EntityFrameworkCore.Tests true diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.csproj b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.csproj index a6c673baa0..c37658f4ec 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.csproj +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo.Abp.TenantManagement.MongoDB.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.MongoDB.Tests Volo.Abp.TenantManagement.MongoDB.Tests true diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.csproj b/modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.csproj index e6b67f478d..a79a6914dd 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.csproj +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.TestBase/Volo.Abp.TenantManagement.TestBase.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 Volo.Abp.TenantManagement.TestBase Volo.Abp.TenantManagement.TestBase true diff --git a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.csproj b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.csproj index be263c46d7..b524fe897d 100644 --- a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.csproj +++ b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 Volo.Abp.Users.EntityFrameworkCore Volo.Abp.Users.EntityFrameworkCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj index fbce82ad48..905725324b 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj index e3eccbec46..04ab3f124a 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 aspnet-Volo.Abp.VirtualFileExplorer.DemoApp-234AF9E1-C3E0-4F8F-BD7D-840627CC8E46 diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index a3175d0e5a..cbbd2e89e8 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5", - "@abp/virtual-file-explorer": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0", + "@abp/virtual-file-explorer": "^6.0.0" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index 68bcdaab66..461928dede 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.5.tgz#671940d72fd50e7eab5db922bcec2a27cdca28ed" - integrity sha512-w4cWXcF2aB5fF2J0Jco8ddPF1r522uSIc29zpvUWzUA0X4DC9m7QUairwVbsX5T3Xp4y6guLoizSMkfQe0Sb8A== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.5.tgz#d3f997b9f7b19b68e94df83dc5cf3053416d8da4" - integrity sha512-OX4iTN0tFAdkBJiYQAM1GFoqF5ZVcOZfo7N6xhscWqucXIVtcGut5fuL/qIWF8xSH6afN/wH//a0O5+DjGnPmw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.5" - "@abp/bootstrap" "~6.0.0-rc.5" - "@abp/bootstrap-datepicker" "~6.0.0-rc.5" - "@abp/datatables.net-bs5" "~6.0.0-rc.5" - "@abp/font-awesome" "~6.0.0-rc.5" - "@abp/jquery-form" "~6.0.0-rc.5" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.5" - "@abp/lodash" "~6.0.0-rc.5" - "@abp/luxon" "~6.0.0-rc.5" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.5" - "@abp/select2" "~6.0.0-rc.5" - "@abp/sweetalert2" "~6.0.0-rc.5" - "@abp/timeago" "~6.0.0-rc.5" - "@abp/toastr" "~6.0.0-rc.5" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.5.tgz#d7ab5693091c079dce6b5cfdd60832194881b571" - integrity sha512-U8NBcsL80joHsqQo+tnYkUwW+TyIwG5SRFZ3yfb2jTiu1KMlgGcY02+iTEZMF/BhQ3rPrxQ/pH2YmD6Ip095tw== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#7bef80e93a75fae848334ad847d031152cb7369a" + integrity sha512-YSnR6pfaWActO9fOndfhLJWF8Aj+p+yHcHTmTwmopTL4AdcjKM2mnGXzri9FN+jt9vxsyK2gxt+VtuHO87V8Xg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#47ab51282347788018dbc64b3effd3159b2d89fe" + integrity sha512-BMZ7dZi58WZFSJK76SPvujb0vOaOWXqURzhAPmdjD/3+rsx/FVT6A394muh8Ko0Fm3A5/WE2NNuKvwmIk107/Q== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#f579d8d46f53cc7a417afbdf745e547db62a7c74" + integrity sha512-z6vyEGvGCwlaAY3OKNj8cH14cWYvvwuqJ+bHIVHQ4iwwcCa0la/dwjuBEu9eKesdaOLlCBIMxar3LQ9ltcGHHw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,171 +41,171 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.5.tgz#4fe0c9b107ae23261121afeb5b72053822b0747f" - integrity sha512-PztuCk/15vhGlisjvZTn6soIZAJp/Mqc0+ipV7Z4O+qBphvp2nFD5lfiVM/E0r2Ql8HzkOq3BO56ZVb0IMIw1g== +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#2e75d721ad647a1bb8fc01868b1a64076889051c" + integrity sha512-6ktejU2B0yE6mgVC43quOdw2P/tiOthaGPdYJ9ogso4qMjgoIdWiqNkvz9W8F3BQIj0Ot236lCQXgHOaos98vA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.5.tgz#83b08282b4b1496b853179780a3b1e953975bdc3" - integrity sha512-EoiygyyRYwXMO6bbeLuqbfaaZuHUrOGgC9dtVxtyFWgCbWiRAERaHrAHQ12WmxnFXGvXGmy9pATfYQB4ALuLWQ== +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#da3dfc3ed50df72531a7565608f386330cfa3552" + integrity sha512-hDAuG83+8tznKJlSDV+rN58yHhHA/TgDUjz3x+LC9un5SISbt7JAWdlcaRmx38ghfsHRJ9U/tlm3XvWGjYJQOQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.5.tgz#071d3da1597a7ed706a60b75400ad5970b2a2eed" - integrity sha512-Vj1yvK7Vcqy1aZ9XIbqGDlwe4d1vneMIVA0hypAHtLi+0lLySgS8QAXUpXo0RkRoyksiTRuM2gRkJRZzdiXSNA== +"@abp/clipboard@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0.tgz#eb9fd86a3660d33f85bfd29c6042ac3155f1e5ef" + integrity sha512-QwDap2HqynF0C5ybapQBO10RGen3B76eRs+4fzsOmLJYCDEa+bayj1wGwgfMx2Uezxb9Sd/DVEEn1qOC2D6PDQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.5.tgz#09f9bfaca17383539e3b79554e26510ac27366fc" - integrity sha512-htOfVSUSaErPlXg5QraeOvIH0pcApYt/mvgnXTi49qZmzUJgzuZ7l8B2UC4KGLdyjhjHHY3Vy66jNrm98IsA2g== +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#d0191fbf9b81db75bd48316ead4821dec073a9e2" + integrity sha512-X5hqT/Yat2BnTmUj2SlRTENv4tKGcu0Ex+eKPyNlVnk7bTnbmz+oYfYslkGlGni0/ocSYbS3exaQ2P+I84VSFg== dependencies: - "@abp/utils" "~6.0.0-rc.5" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.5.tgz#a89a4b028ae3bdeef41be38442a79e51b959c51f" - integrity sha512-x2TvTfYkUOOuKakXYT/h9Qi2s1oUYO7PrX0kPuNjQo9Qa7GlDhH10AoyJeKu9AfB/PyczrEZn74IqOI8xh6gjA== +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f121500576ec5666498bfc8594b438fe63e3f609" + integrity sha512-bPQyHes9pRp8tLGWlDqizRs8pBid56koKr7JSryOapLQSGhvYFzqMztOtFTHsR5pgLeuuB0DT9cN3uHEjrLsWQ== dependencies: - "@abp/datatables.net" "~6.0.0-rc.5" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.5.tgz#a3d8f7717f850346455abbeed6fa5ded752e47d3" - integrity sha512-h1LK1h8AKmp4oKfeHoFobnHImbj+BwtwcHU3xAUd7UF+tGBCmjBVNjaiPoUrTize+iwjZvBK5jea901NdJpWRA== +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#9f9b1023399ced1e72d577c260fc4d5d1b3e12e2" + integrity sha512-LIgiyTJ7rek9Mt7P1rzIRcbcaWI3WAdTXFIwG8o4LcfEt7C24XEQI41fzIz4TeTqqRWKiM3LNT+pOaU6feT06w== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.5.tgz#5625867e26b36853053b0ff8561538ea59149365" - integrity sha512-KtZ9fOFzdQw03Xar68M7IExzLUyQR3zyxa/71vUNfspup3E6LkBXhKILm2nSmp1zJTPoGXRs7DiHO6CyBStBAg== +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#843a52b3864516b49ed041f2ddf3fc65dfe22718" + integrity sha512-c86AOd2nLbQ75S3SnFM7PNasE4HPYJk8oLts88ImLEyy0p3gRfpjCzuLTYyS812M53OLIersRMKyd29UbxSKHw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.5.tgz#7c7f21b0314c93d618a4ba4ffba5d6134887e2c8" - integrity sha512-YSA3K/uvollrGR6xnyhtd4SPp+YmmDDYgL6HGygNSjl+JQbb0ZM/SSaN2TBi67Aq1FNs9TkOQegPIwVWB/LokQ== +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#c8fef921f31622e7c6260550165bf32aa12260dc" + integrity sha512-jSw1Hf0R+7oQH8DP2ksue8ciMiYhxEJIcdw2wOKOhAPTheXbkuvFZxuAB1vI0EKe9ljLX0+c0UywWPfcwnhSpA== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.5.tgz#d649564c3fc079b91cb253e7537e8bbd62dae97d" - integrity sha512-i9Aa92au9HtxC9jo9WjNwHeDaem8dXFiB8jEHFbtzn74iZSF4ZYd0s+rgo7TscsKkXeiSMOy02FmYes6Ldpy1w== +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#642472a3fbe080d4c40da367493e49e7ca46cff0" + integrity sha512-tKcbJsPjgFV8n8DY48MtB/4rMowxeJzFxQRKjRaMuYuMkrlSDmU7lh4YDAcfOOdGPMEYF3plBu/5wBnpLdURBA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.5" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.5.tgz#b61cd7e9be3d982aa12a579be7e9bcb8442ad03c" - integrity sha512-VdTvyRadDave2X6wTeqLlpeUQKaHohAdwB7ex57Y+WmXSsAlhB1Bwa33YjSkukpnRKYLpQ55KwVJ4iaSItyY2g== +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#a3fba4bcc24819f0a1d3e34eb8bd18ff9c50af08" + integrity sha512-ezMi9rB3R1EuGWBOBdnegvlHWfou4Qkppx7sBzpyaRfUagef1IhOrxDnOByviZP/53a31501FDM5Sn4qDu9G7Q== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.5.tgz#c6e6d322512b26a57fc5a1e5fe4c0ea5da79a705" - integrity sha512-OKP96FFLpwaZnZZDLiwkzhE7bP0y4RCpeDtTrL5aLO/D9l7Vi66hZVAx4cliXTGwpu99joNFXlTmbwkilGqPMA== +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#709de2b9109aaa3149b76faf8c9d7371f15c7069" + integrity sha512-mCDT1kepSgV2ecQfqVWXsqbbIqUCs33wBaQcnYpX+nTX1SsuiPZvDyqWYxDhKDzZ6E3kPuYv/c7+/InqXTbfCA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.5.tgz#165107270460624a263cd88c8a7816a58cf41ca8" - integrity sha512-KieDq0v6wZB/kSZR2dJ+HKnPYHQng0udbxZqlha5dtlDJxRslz0eK9nVrB0VEzjs+xHrzTj10mpgyAjo21GR0Q== +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#5f08f5cb262981cb6782587a05c1b3bd9f62eeef" + integrity sha512-3FNl1gZksfbRRXYQ8+PVer4OTHjIx31IYhHzHe766y6C1mDKnskQz7HaHEPQ3kMd6omyNPuj9Od9h4Y9fm3Bnw== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.5.tgz#e91b64da0b558c729f4b604a9b1bcbd35df40722" - integrity sha512-BgnkwH7JyMfmxVzkj1HGzwmjnQT6D2CZT5DzqnjtMN7JO5gQo20SE8QS5QHq7/LvaSI/34AeSCiCONWkMOufKg== +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#764d3a6525c208d38631b1f0934b2762e1ddc512" + integrity sha512-Skzu4vjXSX5zKNVPND8V9/onqcElmjpY2UXO5XC+47Vd3+p4uSNjg9PG9/Eg9Y67Pw48AVpYlO/Kr6KcPlgEQQ== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.5.tgz#61d23e5f7198b36a9faa1e6c79b04f2d5179e3c4" - integrity sha512-1xQIYhw+xX59dYEZ6o4dfZvfYSigXiWqh0M11O5Thfy6Ew0Vd3yYGp8+8xlCg5+ivsdYnIRmKHjdFpogYhyLiA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#abd5d95d0adad26efd5bb998089128ba4a1f83ad" + integrity sha512-/W4Rj30q9y+CJuNsVhDRE1FFLewuNykjbtdr2GGwlbp4+utE6aHJdBLfNlS0A0RRJN7B1RR25zWT2hrA5EwBqg== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.5.tgz#c908113295aed8ecf4b04c1691d9295b6af47964" - integrity sha512-SiRkUfqWf0VAwJ4nfassN+Me/0A6cIji2TWmSaKuOlen3Ph55iGy9od6nE5njnZqUAmuL8XqTisvt7Gx8Cd4DQ== +"@abp/prismjs@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0.tgz#05f4ba60548035f7c88897e9792d8ed446860991" + integrity sha512-BtbX6kORlDhcmrnSXNw9Q1lnKNNvuMkaoQMmluNGFZXx1jUX9hfRkipD8Stbvjq85B9dzcVawocwP8Qu12Fn9A== dependencies: - "@abp/clipboard" "~6.0.0-rc.5" - "@abp/core" "~6.0.0-rc.5" + "@abp/clipboard" "~6.0.0" + "@abp/core" "~6.0.0" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.5.tgz#294eb907f85ef012b0b2f73e1b8561be3597cee6" - integrity sha512-P9tqcZbzC/ZSq8o0P2otTfSdSd9tBGyV6ngLUcZ2aA1R3+l4Lcp4rX9y81qPDaH9uLBOJkXd6AVTi11qBzPyZw== +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#72cd661069d3b5641f1a079bd6c8ce966524cb50" + integrity sha512-2XYEP3FgelO87D+5nTA0AeISNLrcGX5eAZkPbJo/9HL7xr0KxNNwc0SgtGM7mnxUNSb1KnDGGBhzglmWy9f0og== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.5.tgz#baf7ef24a1551945bd476547c003056bb048409e" - integrity sha512-6N6+DkecO4AXEaCV09W9iRvZPQLn1sZaAFJBvzphwFVOWv3BivJTQCFJRQ5scqc31mWaZ4/UGjOdrq0a/qDiAQ== +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#61816fa63d3c01c045dfa1b9c706572ca74b054f" + integrity sha512-Bo3hlRN4//40YXYec3GFzHQRH1m2oWcFHOe2jrLre8aGZR2PLCurCjnB24ryi3kFTasOnVTf6N+RkBNOPdvweA== dependencies: - "@abp/core" "~6.0.0-rc.5" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.5.tgz#0dd52cf24574e10e523a5b6e90740a25123a7745" - integrity sha512-uIc9WZN7J7cqFsxCYt8egapQRGyBMFi8+7ega7OaxmO0R4t8+QisVOsyeXMQvWuF9M9gXKMKlrV5bP6nsnDg0A== +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#8290a4d84a436007f4f5eb6e2990c64db7d5b27c" + integrity sha512-due1idv86iY9hMg+8TrC0JyFlydRklhlo+kcpOgNNTd9oCy/pJ/ShMDiTM/IcYiW8qwVBFYY9PH8JXGlxGDqrQ== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.5.tgz#8cfbe6d30b57282417feff3f1bccb5fc493c9215" - integrity sha512-UDn0+DP4BAULN9MERWP+QSJQdvZELhkaHcrwTEB80+wcNZ13xf2zShvO60+3rz63Nqf+/kwZcBMNFuwD2ekjww== +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#62459b9541a20d41b875cf5e76489774c20f462b" + integrity sha512-LgZqsbKd3LIT7erc6aAMO04jBODtBiPDI3HnoCEc7CMu7HdJ22jlRkbBqXwRZsbbDuR35XEh77wYKegat3Yzgw== dependencies: - "@abp/jquery" "~6.0.0-rc.5" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.5.tgz#c05df5bb5a776ea8a9bd4589d0df6a373bfff1ef" - integrity sha512-X/UGqMJu1vbz6WQOMP7+MXkUB3rIwnm/1PkmGOM+gFqmQJt21IEKbV/gG2/CNR4/QY02HJhj5v4/wm0UBEH56g== +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#62e5a363eea36f00d28ccf5d9b495dc63a4aa018" + integrity sha512-OMYSjdTy7QSofhjPvQ56I6Bw5B5juZ17KywOgkzPliMv6HVw1CT5BDLb8/Gp2jALj6Fu/4OLSa8WXBR6A4A0dw== dependencies: just-compare "^1.3.0" -"@abp/virtual-file-explorer@^6.0.0-rc.5": - version "6.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-6.0.0-rc.5.tgz#6e2c35af08b52569f8666963f2d6d3ebb466bd29" - integrity sha512-uBNr959eddMjxccKWCW1GBhzh6OkhHTL6kUkWESVfzipMTWUHq5RBFmvSP8Fa03r0/FQ19ZGpUHNJ/XkpK6pHQ== +"@abp/virtual-file-explorer@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-6.0.0.tgz#3a90fbf1e13a5fd502bba5ff2ac987b27b63ccc9" + integrity sha512-VUZvujkWLW6FN/2fzUGESstXgOzocGJhBvVt1MO6SdDEgEBUm3VThBYZolzF5db4SXNdSbjGjEujcm23mhKkfA== dependencies: - "@abp/clipboard" "~6.0.0-rc.5" - "@abp/prismjs" "~6.0.0-rc.5" + "@abp/clipboard" "~6.0.0" + "@abp/prismjs" "~6.0.0" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj index 330816a049..1171cd6fb7 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 true diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.csproj index e314e532f9..4558a035fc 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.csproj +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false @@ -34,7 +34,7 @@ - + diff --git a/npm/lerna.json b/npm/lerna.json index fe6877d316..e1d6c59a97 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/apps/dev-app/src/app/app.module.ts b/npm/ng-packs/apps/dev-app/src/app/app.module.ts index 9c89658357..cff75b7bfa 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.module.ts @@ -13,6 +13,7 @@ import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { APP_ROUTE_PROVIDER } from './route.provider'; +import { FeatureManagementModule } from '@abp/ng.feature-management'; @NgModule({ imports: [ @@ -29,6 +30,7 @@ import { APP_ROUTE_PROVIDER } from './route.provider'; AccountConfigModule.forRoot(), IdentityConfigModule.forRoot(), TenantManagementConfigModule.forRoot(), + FeatureManagementModule.forRoot(), SettingManagementConfigModule.forRoot(), ThemeBasicModule.forRoot(), ], diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index 5cbcfe18a6..de8b8b53d8 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index a1162fdba1..fa60565367 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -40,7 +40,7 @@ }, "private": true, "devDependencies": { - "@abp/utils": "~6.0.0-rc.5", + "@abp/utils": "~6.0.0", "@angular-devkit/build-angular": "14.2.1", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~14.2.1", @@ -59,17 +59,17 @@ "@angular/platform-browser": "14.2.1", "@angular/platform-browser-dynamic": "14.2.1", "@angular/router": "14.2.1", - "@abp/ng.account": "~6.0.0-rc.5", - "@abp/ng.account.core": "~6.0.0-rc.5", - "@abp/ng.core": "~6.0.0-rc.5", - "@abp/ng.feature-management": "~6.0.0-rc.5", - "@abp/ng.identity": "~6.0.0-rc.5", - "@abp/ng.permission-management": "~6.0.0-rc.5", - "@abp/ng.schematics": "~6.0.0-rc.5", - "@abp/ng.setting-management": "~6.0.0-rc.5", - "@abp/ng.tenant-management": "~6.0.0-rc.5", - "@abp/ng.theme.basic": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.account": "~6.0.0", + "@abp/ng.account.core": "~6.0.0", + "@abp/ng.core": "~6.0.0", + "@abp/ng.feature-management": "~6.0.0", + "@abp/ng.identity": "~6.0.0", + "@abp/ng.permission-management": "~6.0.0", + "@abp/ng.schematics": "~6.0.0", + "@abp/ng.setting-management": "~6.0.0", + "@abp/ng.tenant-management": "~6.0.0", + "@abp/ng.theme.basic": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~13.0.0", "@ngneat/spectator": "^10.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 187c3ea511..3e13279c71 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.core": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 7e6f59bded..dc52b43087 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.account.core": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 3ee992a153..2d37007960 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=6.0.0-rc.5", - "@abp/ng.theme.shared": ">=6.0.0-rc.5", + "@abp/ng.core": ">=6.0.0", + "@abp/ng.theme.shared": ">=6.0.0", "@ng-bootstrap/ng-bootstrap": ">=10.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index fb4fdef886..f6b0475d43 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~6.0.0-rc.5", + "@abp/utils": "~6.0.0", "angular-oauth2-oidc": "^13.0.1", "just-clone": "^3.2.1", "just-compare": "^1.4.0", diff --git a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts index 61846ad126..5f39e5c865 100644 --- a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts +++ b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts @@ -82,7 +82,19 @@ export class DynamicLayoutComponent { const key = this.layouts.get(expectedLayout); this.layout = this.getComponent(key)?.component; this.layoutKey = expectedLayout; + if(!this.layout){ + this.showLayoutNotFoundError(expectedLayout); + } + } + + showLayoutNotFoundError(layoutName: string) { + let message = `Layout ${layoutName} not found.`; + if(layoutName === 'account'){ + message = 'Account layout not found. Please check your configuration. If you are using LeptonX, please make sure you have added "AccountLayoutModule.forRoot()" to your app.module configuration.'; + } + console.warn(message); } + private listenToLanguageChange() { this.subscription.addOne(this.localizationService.languageChange$, () => { diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 720829d6a9..6cf48822c3 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.html new file mode 100644 index 0000000000..7c80a20ff2 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.html @@ -0,0 +1,19 @@ + + + diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.ts new file mode 100644 index 0000000000..3ac018478e --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.ts @@ -0,0 +1,20 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'abp-feature-management-tab', + templateUrl: './feature-management-tab.component.html', +}) +export class FeatureManagementTabComponent { + visibleFeatures = false; + providerKey: string; + + openFeaturesModal() { + setTimeout(() => { + this.visibleFeatures = true; + }, 0); + } + + onVisibleFeaturesChange = (value: boolean) => { + this.visibleFeatures = value; + }; +} diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/index.ts b/npm/ng-packs/packages/feature-management/src/lib/components/index.ts index 64f8bd0fc5..50146e4f1a 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/index.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/components/index.ts @@ -1 +1,2 @@ export * from './feature-management/feature-management.component'; +export * from './feature-management-tab/feature-management-tab.component'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/enums/feature-management-tab-names.ts b/npm/ng-packs/packages/feature-management/src/lib/enums/feature-management-tab-names.ts new file mode 100644 index 0000000000..bda1a05057 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/enums/feature-management-tab-names.ts @@ -0,0 +1,3 @@ +export const enum eFeatureManagementTabNames { + FeatureManagement = 'AbpFeatureManagement::Permission:FeatureManagement', +} diff --git a/npm/ng-packs/packages/feature-management/src/lib/enums/index.ts b/npm/ng-packs/packages/feature-management/src/lib/enums/index.ts new file mode 100644 index 0000000000..76e73d8e03 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/enums/index.ts @@ -0,0 +1,2 @@ +export * from './feature-management-tab-names'; +export * from './components'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts index 45fef5a64b..2de14108f1 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts @@ -1,15 +1,28 @@ import { CoreModule } from '@abp/ng.core'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; -import { NgModule } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { FeatureManagementComponent } from './components/feature-management/feature-management.component'; import { FreeTextInputDirective } from './directives/free-text-input.directive'; +import { FEATURE_MANAGEMENT_SETTINGS_PROVIDERS } from './providers'; +import { FeatureManagementTabComponent } from './components'; -const exported = [FeatureManagementComponent, FreeTextInputDirective]; +const exported = [ + FeatureManagementComponent, + FreeTextInputDirective, + FeatureManagementTabComponent, +]; @NgModule({ declarations: [...exported], imports: [CoreModule, ThemeSharedModule, NgbNavModule], exports: [...exported], }) -export class FeatureManagementModule {} +export class FeatureManagementModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: FeatureManagementModule, + providers: [FEATURE_MANAGEMENT_SETTINGS_PROVIDERS], + }; + } +} diff --git a/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-settings.provider.ts b/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-settings.provider.ts new file mode 100644 index 0000000000..2d7664bb46 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-settings.provider.ts @@ -0,0 +1,26 @@ +import { SettingTabsService } from '@abp/ng.setting-management/config'; +import { APP_INITIALIZER } from '@angular/core'; +import { eFeatureManagementTabNames } from '../enums/feature-management-tab-names'; +import { FeatureManagementTabComponent } from '../components'; + +export const FEATURE_MANAGEMENT_SETTINGS_PROVIDERS = [ + { + provide: APP_INITIALIZER, + useFactory: configureSettingTabs, + deps: [SettingTabsService], + multi: true, + }, +]; + +export function configureSettingTabs(settingtabs: SettingTabsService) { + return () => { + settingtabs.add([ + { + name: eFeatureManagementTabNames.FeatureManagement, + order: 104, + requiredPolicy: 'FeatureManagement.ManageHostFeatures', + component: FeatureManagementTabComponent, + }, + ]); + }; +} diff --git a/npm/ng-packs/packages/feature-management/src/lib/providers/index.ts b/npm/ng-packs/packages/feature-management/src/lib/providers/index.ts new file mode 100644 index 0000000000..34f4a30f78 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/providers/index.ts @@ -0,0 +1 @@ +export * from './feature-management-settings.provider'; diff --git a/npm/ng-packs/packages/feature-management/src/public-api.ts b/npm/ng-packs/packages/feature-management/src/public-api.ts index b9073df803..ee7c276e92 100644 --- a/npm/ng-packs/packages/feature-management/src/public-api.ts +++ b/npm/ng-packs/packages/feature-management/src/public-api.ts @@ -1,5 +1,6 @@ export * from './lib/components'; export * from './lib/directives'; +export * from './lib/providers'; export * from './lib/enums/components'; export * from './lib/feature-management.module'; -export * from './lib/models'; \ No newline at end of file +export * from './lib/models'; diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 37de421ce1..2ff43f7ffb 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.identity", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.permission-management": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.permission-management": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 88d2f43fe5..73d8902498 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index b299d79c80..7738e69447 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "6.0.0-rc.5", + "version": "6.0.0", "description": "Schematics that works with ABP Backend", "keywords": [ "schematics" diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 32c7b0dc8b..87841943bf 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.components": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 9ed0a35751..3c46ac20a4 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.feature-management": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 78d71498de..7a815f4b7a 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.account.core": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html index 9cdc06401c..d66ad6c344 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -1,17 +1,13 @@ - - + - + -
+
- + @@ -103,7 +99,7 @@ [class.is-invalid]="typeahead.classList.contains('is-invalid')" class="form-control" /> - +
@@ -143,11 +139,14 @@ >
- - + diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts index ec1ba4ea1b..e18c0ab8a4 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts @@ -60,7 +60,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { asterisk = ''; - containerClassName = 'mb-3 form-group' + containerClassName = 'mb-3 form-group'; options$: Observable[]> = of([]); @@ -136,6 +136,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { ngAfterViewInit() { if (this.first && this.fieldRef) { this.fieldRef.nativeElement.focus(); + this.cdRef.detectChanges(); } } @@ -213,7 +214,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { this.validators = validators(this.data); this.setAsterisk(); } - if(className !== undefined){ + if (className !== undefined) { this.containerClassName = className; } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html index 7fc36fab31..e15ba5414c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html @@ -1,4 +1,10 @@ - + implements OnChanges { } @Input() actionsTemplate: TemplateRef; + @Output() tableActivate = new EventEmitter(); + getInjected: (token: Type | InjectionToken, notFoundValue?: T, flags?: InjectFlags) => T; hasAtLeastOnePermittedAction: boolean; @@ -158,7 +162,6 @@ export class ExtensibleTableComponent implements OnChanges { value, }; if (prop.value.component) { - const injector = Injector.create({ providers: [ { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts index 14de1a94f4..af0ae767d7 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts @@ -9,6 +9,7 @@ import { PropContributorCallback, PropContributorCallbacks, PropData, + PropDisplayTextResolver, PropList, PropPredicate, Props, @@ -69,6 +70,7 @@ export class FormProp extends Prop { readonly template?: Type; readonly className?: string; readonly group?: FormPropGroup | undefined; + readonly displayTextResolver?: PropDisplayTextResolver; constructor(options: FormPropOptions) { super( @@ -93,6 +95,7 @@ export class FormProp extends Prop { this.id = options.id || options.name; const defaultValue = options.defaultValue; this.defaultValue = isFalsyValue(defaultValue) ? defaultValue : defaultValue || null; + this.displayTextResolver = options.displayTextResolver; } static create(options: FormPropOptions) { @@ -128,6 +131,7 @@ export type FormPropOptions = O.Optional< | 'defaultValue' | 'options' | 'id' + | 'displayTextResolver' >; export type CreateFormPropDefaults = Record[]>; diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts index 3799c419a7..456a280ba8 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts @@ -35,6 +35,7 @@ export abstract class Prop { public readonly isExtra = false, public readonly template?: Type, public readonly className?: string, + public readonly displayTextResolver?: PropDisplayTextResolver, ) { this.displayName = this.displayName || this.name; } @@ -42,6 +43,7 @@ export abstract class Prop { export type PropCallback = (data: Omit, 'data'>, auxData?: any) => R; export type PropPredicate = (data?: Omit, 'data'>, auxData?: any) => boolean; +export type PropDisplayTextResolver = (data?: Omit, 'data'>) => string; export abstract class PropsFactory> { protected abstract _ctor: Type; diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 9a5fab0bb4..ffab07e519 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "6.0.0-rc.5", + "version": "6.0.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~6.0.0-rc.5", + "@abp/ng.core": "~6.0.0", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "13.0.0", "@ngx-validate/core": "^0.1.2", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 982c27c1b2..f4940c85a7 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 2bb878bf22..5bd1511cef 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~6.0.0-rc.5" + "@abp/aspnetcore.components.server.theming": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index adb9cab8fb..fad04adda4 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~6.0.0-rc.5", - "@abp/font-awesome": "~6.0.0-rc.5" + "@abp/bootstrap": "~6.0.0", + "@abp/font-awesome": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index ea9dfa1d9e..d3ff29f384 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index a9153341fd..cf092af0f5 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,20 +10,20 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~6.0.0-rc.5", - "@abp/bootstrap": "~6.0.0-rc.5", - "@abp/bootstrap-datepicker": "~6.0.0-rc.5", - "@abp/datatables.net-bs5": "~6.0.0-rc.5", - "@abp/font-awesome": "~6.0.0-rc.5", - "@abp/jquery-form": "~6.0.0-rc.5", - "@abp/jquery-validation-unobtrusive": "~6.0.0-rc.5", - "@abp/lodash": "~6.0.0-rc.5", - "@abp/luxon": "~6.0.0-rc.5", - "@abp/malihu-custom-scrollbar-plugin": "~6.0.0-rc.5", - "@abp/select2": "~6.0.0-rc.5", - "@abp/sweetalert2": "~6.0.0-rc.5", - "@abp/timeago": "~6.0.0-rc.5", - "@abp/toastr": "~6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui": "~6.0.0", + "@abp/bootstrap": "~6.0.0", + "@abp/bootstrap-datepicker": "~6.0.0", + "@abp/datatables.net-bs5": "~6.0.0", + "@abp/font-awesome": "~6.0.0", + "@abp/jquery-form": "~6.0.0", + "@abp/jquery-validation-unobtrusive": "~6.0.0", + "@abp/lodash": "~6.0.0", + "@abp/luxon": "~6.0.0", + "@abp/malihu-custom-scrollbar-plugin": "~6.0.0", + "@abp/select2": "~6.0.0", + "@abp/sweetalert2": "~6.0.0", + "@abp/timeago": "~6.0.0", + "@abp/toastr": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 32b347bfde..e0e5ba896e 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "6.0.0-rc.5", + "version": "6.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index efea35a603..52b40907fa 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 97321c95ab..6c179d55f4 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0-rc.5", - "@abp/owl.carousel": "~6.0.0-rc.5", - "@abp/prismjs": "~6.0.0-rc.5", - "@abp/tui-editor": "~6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0", + "@abp/owl.carousel": "~6.0.0", + "@abp/prismjs": "~6.0.0", + "@abp/tui-editor": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index d74c062806..d387098f40 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 609a6ded02..f85bd15780 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index e6b480b821..6d54e76ea7 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 1c4bdd8998..ce96f9caaa 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 79e609fb57..a2cb11f24e 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~6.0.0-rc.5", - "@abp/jstree": "~6.0.0-rc.5", - "@abp/slugify": "~6.0.0-rc.5", - "@abp/tui-editor": "~6.0.0-rc.5", - "@abp/uppy": "~6.0.0-rc.5" + "@abp/codemirror": "~6.0.0", + "@abp/jstree": "~6.0.0", + "@abp/slugify": "~6.0.0", + "@abp/tui-editor": "~6.0.0", + "@abp/uppy": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index db53039707..b2e1a2e7e0 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~6.0.0-rc.5", - "@abp/star-rating-svg": "~6.0.0-rc.5" + "@abp/highlight.js": "~6.0.0", + "@abp/star-rating-svg": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 2eeb749ca3..7964b51077 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~6.0.0-rc.5", - "@abp/cms-kit.public": "~6.0.0-rc.5" + "@abp/cms-kit.admin": "~6.0.0", + "@abp/cms-kit.public": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 2a3b54ed19..fe36f1124f 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index ca394ccbf1..b2add42d86 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~6.0.0-rc.5" + "@abp/utils": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js index 838392cb92..5a2747a3c7 100644 --- a/npm/packs/core/src/abp.js +++ b/npm/packs/core/src/abp.js @@ -204,12 +204,10 @@ var abp = abp || {}; abp.auth = abp.auth || {}; - abp.auth.policies = abp.auth.policies || {}; - abp.auth.grantedPolicies = abp.auth.grantedPolicies || {}; abp.auth.isGranted = function (policyName) { - return abp.auth.policies[policyName] != undefined && abp.auth.grantedPolicies[policyName] != undefined; + return abp.auth.grantedPolicies[policyName] != undefined; }; abp.auth.isAnyGranted = function () { diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 8c5c6cd916..3be6fa924c 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 351b99c3b4..1054e476b7 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~6.0.0-rc.5", + "@abp/datatables.net": "~6.0.0", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index d293c9232b..29820c3690 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~6.0.0-rc.5", + "@abp/datatables.net": "~6.0.0", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 36e528d7bc..c85944df30 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index 08c7dc9a75..513f19db1b 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~6.0.0-rc.5", - "@abp/clipboard": "~6.0.0-rc.5", - "@abp/malihu-custom-scrollbar-plugin": "~6.0.0-rc.5", - "@abp/popper.js": "~6.0.0-rc.5", - "@abp/prismjs": "~6.0.0-rc.5" + "@abp/anchor-js": "~6.0.0", + "@abp/clipboard": "~6.0.0", + "@abp/malihu-custom-scrollbar-plugin": "~6.0.0", + "@abp/popper.js": "~6.0.0", + "@abp/prismjs": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 2d745ba594..a3ef027ecc 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 030a573169..d8e7cc5c39 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 6da74bc3c2..bf2ba60b0b 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 9ea2ac0cb3..4fd3a931a8 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 64e5ccef29..814b007c30 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~6.0.0-rc.5", + "@abp/jquery-validation": "~6.0.0", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 84f9b9bb31..031b8dcc98 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index df9fbdd1d9..01eb7253c0 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index c514897516..91d652be5a 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 070d24ff04..0856f9fbfa 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index ec0ec1a978..d9c69fce53 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 1efde9de02..eba5d3b3e1 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index bde077a82d..cad7518f85 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 6e94920c74..94d364fceb 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 938849e165..8c48465341 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index c8d61326c9..40abe12c84 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~6.0.0-rc.5", - "@abp/core": "~6.0.0-rc.5", + "@abp/clipboard": "~6.0.0", + "@abp/core": "~6.0.0", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 320978c2e5..777732f443 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index b07d10c28c..fa40eddc32 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 653cc57307..fc0b9c707e 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index e4131df7a7..ca70b687fe 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 689aaf54ab..d2294345f7 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 64d5e25bd6..2cbd292e7b 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index cbee9b15a3..962f4ef407 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", + "@abp/jquery": "~6.0.0", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 11bfdc9ec1..f6ca8d8319 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~6.0.0-rc.5", - "@abp/prismjs": "~6.0.0-rc.5" + "@abp/jquery": "~6.0.0", + "@abp/prismjs": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index 9b26e8b7c2..07e6c1fd60 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~6.0.0-rc.5", + "@abp/core": "~6.0.0", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index d1e7ca5cec..6800ef0068 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "6.0.0-rc.5", + "version": "6.0.0", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index 0269f33ad0..6c4785712d 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~6.0.0-rc.5", + "@abp/vue": "~6.0.0", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 11fb652d4e..b4b86eb6f1 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~6.0.0-rc.5", - "@abp/prismjs": "~6.0.0-rc.5" + "@abp/clipboard": "~6.0.0", + "@abp/prismjs": "~6.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index d8c8e20de4..7ffb61a059 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.5", + "version": "6.0.0", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.csproj b/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.csproj index ff32f7eefc..31945a6778 100644 --- a/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index 65d640ed91..4bf88c77bf 100644 Binary files a/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.csproj b/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.csproj index e52db56ad7..478eec905f 100644 --- a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index c8bed34e0a..46c2f2286e 100644 Binary files a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.csproj b/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.csproj index 6076424029..4a96c8171b 100644 --- a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index d3c33175ab..2f18c3ff2a 100644 Binary files a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.csproj b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.csproj index 4496c586d9..2a514ef40b 100644 --- a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip index 141c8e443c..92504e60bd 100644 Binary files a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.csproj b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.csproj index cb4dd198a0..ca8d68865a 100644 --- a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index 1a47cd6c52..076d8bf14f 100644 Binary files a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.csproj b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.csproj index 1135d55f1a..56b7608ad2 100644 --- a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index 836862308f..4c4b67dd5d 100644 Binary files a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.csproj b/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.csproj index 8f10f1ae5b..f6aa9f7b68 100644 --- a/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index 98dcd232db..79066b2f42 100644 Binary files a/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.csproj b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.csproj index b8f93f5ab1..2838f95dbe 100644 --- a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index 2cffd2fc08..dc79f0ec0a 100644 Binary files a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj index e44edc4033..8abe6e6a1e 100644 --- a/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip index 896d376dad..443b2abefa 100644 Binary files a/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.csproj b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.csproj index 3a61ff5a4a..0bf4d38be4 100644 --- a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index 0e7e09d2ed..e576935124 100644 Binary files a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.csproj b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.csproj index d1df2a61d8..be3c7d07cc 100644 --- a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index 8a55087fd5..94efad3cb7 100644 Binary files a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.csproj b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.csproj index 6a3e5f317c..4f8e923b65 100644 --- a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index d71e2f20dc..eb9e9247e9 100644 Binary files a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.csproj b/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.csproj index ca0f28a959..fdefecbac9 100644 --- a/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index bc01f1b09a..9404295c66 100644 Binary files a/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.csproj b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.csproj index e8daef2a09..c5a1b2c530 100644 --- a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index 95559aa4ed..e95eca5126 100644 Binary files a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.csproj b/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.csproj index 9a836e5f35..48e82d3803 100644 --- a/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.csproj +++ b/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index af43fa139c..496b9e9a03 100644 Binary files a/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip index 08165121be..71d5eba7df 100644 Binary files a/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and b/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip differ diff --git a/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.csproj b/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.csproj index 5b5d0a3632..99aa51eb22 100644 --- a/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.csproj +++ b/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index 1b2b7c512e..50ef71dd21 100644 Binary files a/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.csproj b/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.csproj index e8f3b5aa53..98718442af 100644 --- a/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.csproj +++ b/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.csproj @@ -4,7 +4,7 @@ - net6.0 + net7.0 diff --git a/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index 830306ebf2..2a7ce8cb27 100644 Binary files a/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 0e825d1df9..5c553efd11 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,13 +12,13 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.5", - "@abp/ng.components": "~6.0.0-rc.5", - "@abp/ng.core": "~6.0.0-rc.5", - "@abp/ng.identity": "~6.0.0-rc.5", - "@abp/ng.setting-management": "~6.0.0-rc.5", - "@abp/ng.tenant-management": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.account": "~6.0.0", + "@abp/ng.components": "~6.0.0", + "@abp/ng.core": "~6.0.0", + "@abp/ng.identity": "~6.0.0", + "@abp/ng.setting-management": "~6.0.0", + "@abp/ng.tenant-management": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "@abp/ng.theme.lepton-x": "~2.0.0-preview20220912", "@angular/animations": "^14.2.1", "@angular/common": "^14.2.1", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.0-rc.5", + "@abp/ng.schematics": "~6.0.0", "@angular-devkit/build-angular": "^14.2.3", "@angular-eslint/builder": "~14.1.1", "@angular-eslint/eslint-plugin": "~14.1.1", diff --git a/templates/app-nolayers/angular/src/app/app.module.ts b/templates/app-nolayers/angular/src/app/app.module.ts index 159bc14f4d..33744f6b00 100644 --- a/templates/app-nolayers/angular/src/app/app.module.ts +++ b/templates/app-nolayers/angular/src/app/app.module.ts @@ -14,6 +14,7 @@ import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { APP_ROUTE_PROVIDER } from './route.provider'; +import { FeatureManagementModule } from '@abp/ng.feature-management'; @NgModule({ imports: [ @@ -31,6 +32,7 @@ import { APP_ROUTE_PROVIDER } from './route.provider'; SettingManagementConfigModule.forRoot(), ThemeLeptonXModule.forRoot(), SideMenuLayoutModule.forRoot(), + FeatureManagementModule.forRoot(), ], declarations: [AppComponent], providers: [APP_ROUTE_PROVIDER], diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index f4cfbf4778..2355449ab5 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -81,7 +81,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/web.config b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/web.config new file mode 100644 index 0000000000..0b3e21751c --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Data/MyProjectNameDbContextFactory.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Data/MyProjectNameDbContextFactory.cs new file mode 100644 index 0000000000..91fdc9c6fb --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Data/MyProjectNameDbContextFactory.cs @@ -0,0 +1,31 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; + +namespace MyCompanyName.MyProjectName.Data; + +public class MyProjectNameDbContextFactory : IDesignTimeDbContextFactory +{ + public MyProjectNameDbContext CreateDbContext(string[] args) + { +// + // https://www.npgsql.org/efcore/release-notes/6.0.html#opting-out-of-the-new-timestamp-mapping-logic + AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); +// + + var configuration = BuildConfiguration(); + + var builder = new DbContextOptionsBuilder() + .UseSqlServer(configuration.GetConnectionString("Default")); + + return new MyProjectNameDbContext(builder.Options); + } + + private static IConfigurationRoot BuildConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: false); + + return builder.Build(); + } +} diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 2d4b727e7c..3846ea0334 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -82,11 +82,11 @@ - + - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/web.config b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/web.config new file mode 100644 index 0000000000..a326a7a566 --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index a4cd35e914..aecc44472a 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -73,7 +73,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/web.config b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/web.config new file mode 100644 index 0000000000..84952077df --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/MyProjectNameDbContextFactory.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/MyProjectNameDbContextFactory.cs new file mode 100644 index 0000000000..91fdc9c6fb --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/MyProjectNameDbContextFactory.cs @@ -0,0 +1,31 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; + +namespace MyCompanyName.MyProjectName.Data; + +public class MyProjectNameDbContextFactory : IDesignTimeDbContextFactory +{ + public MyProjectNameDbContext CreateDbContext(string[] args) + { +// + // https://www.npgsql.org/efcore/release-notes/6.0.html#opting-out-of-the-new-timestamp-mapping-logic + AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); +// + + var configuration = BuildConfiguration(); + + var builder = new DbContextOptionsBuilder() + .UseSqlServer(configuration.GetConnectionString("Default")); + + return new MyProjectNameDbContext(builder.Options); + } + + private static IConfigurationRoot BuildConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: false); + + return builder.Build(); + } +} diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index e39893b7c3..24af4e1b9e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -74,11 +74,11 @@ - + - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/web.config b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/web.config new file mode 100644 index 0000000000..7eddffb5cb --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 0b7707245a..3603cea721 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -76,7 +76,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/web.config b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/web.config new file mode 100644 index 0000000000..373e8d2627 --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Data/MyProjectNameDbContextFactory.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Data/MyProjectNameDbContextFactory.cs new file mode 100644 index 0000000000..91fdc9c6fb --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Data/MyProjectNameDbContextFactory.cs @@ -0,0 +1,31 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; + +namespace MyCompanyName.MyProjectName.Data; + +public class MyProjectNameDbContextFactory : IDesignTimeDbContextFactory +{ + public MyProjectNameDbContext CreateDbContext(string[] args) + { +// + // https://www.npgsql.org/efcore/release-notes/6.0.html#opting-out-of-the-new-timestamp-mapping-logic + AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); +// + + var configuration = BuildConfiguration(); + + var builder = new DbContextOptionsBuilder() + .UseSqlServer(configuration.GetConnectionString("Default")); + + return new MyProjectNameDbContext(builder.Options); + } + + private static IConfigurationRoot BuildConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: false); + + return builder.Build(); + } +} diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 692c05efa8..71f7c871ef 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -77,11 +77,11 @@ - + - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/web.config b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/web.config new file mode 100644 index 0000000000..a561c56d47 --- /dev/null +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 8ad6c76e6a..52081f76df 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.5", - "@abp/ng.components": "~6.0.0-rc.5", - "@abp/ng.core": "~6.0.0-rc.5", - "@abp/ng.identity": "~6.0.0-rc.5", - "@abp/ng.setting-management": "~6.0.0-rc.5", - "@abp/ng.tenant-management": "~6.0.0-rc.5", + "@abp/ng.account": "~6.0.0", + "@abp/ng.components": "~6.0.0", + "@abp/ng.core": "~6.0.0", + "@abp/ng.identity": "~6.0.0", + "@abp/ng.setting-management": "~6.0.0", + "@abp/ng.tenant-management": "~6.0.0", "@abp/ng.theme.lepton-x": "~2.0.0-preview20220912", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.theme.shared": "~6.0.0", "@angular/animations": "^14.2.1", "@angular/common": "^14.2.1", "@angular/compiler": "^14.2.1", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.0-rc.5", + "@abp/ng.schematics": "~6.0.0", "@angular-devkit/build-angular": "^14.2.3", "@angular-eslint/builder": "~14.1.1", "@angular-eslint/eslint-plugin": "~14.1.1", diff --git a/templates/app/angular/src/app/app.module.ts b/templates/app/angular/src/app/app.module.ts index 159bc14f4d..33744f6b00 100644 --- a/templates/app/angular/src/app/app.module.ts +++ b/templates/app/angular/src/app/app.module.ts @@ -14,6 +14,7 @@ import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { APP_ROUTE_PROVIDER } from './route.provider'; +import { FeatureManagementModule } from '@abp/ng.feature-management'; @NgModule({ imports: [ @@ -31,6 +32,7 @@ import { APP_ROUTE_PROVIDER } from './route.provider'; SettingManagementConfigModule.forRoot(), ThemeLeptonXModule.forRoot(), SideMenuLayoutModule.forRoot(), + FeatureManagementModule.forRoot(), ], declarations: [AppComponent], providers: [APP_ROUTE_PROVIDER], diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index 25e526fd2d..8037a452b4 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index 92fb889665..86ec014797 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs index 30d7951a1e..fb963a81c7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs @@ -102,7 +102,7 @@ public class MyProjectNameAuthServerModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); + //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web.OpenIddict", Path.DirectorySeparatorChar))); // diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/web.config new file mode 100644 index 0000000000..1ca250e68a --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index 1fa4f1b7de..d7a0fb2671 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true true true diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs index 1b3870f783..1033c73a57 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs @@ -193,7 +193,7 @@ public class MyProjectNameBlazorModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); + //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar))); //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/web.config new file mode 100644 index 0000000000..d0f5d132f4 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index c0ffd82143..84f728d2ee 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true true true diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index 355299b237..b4f2e723e3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -151,7 +151,7 @@ public class MyProjectNameBlazorModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); + //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar))); //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/web.config new file mode 100644 index 0000000000..a326a7a566 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index ede5b4e9a2..c445a4b065 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true service-worker-assets.js @@ -13,8 +13,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index 77892c5cc5..a0d8ac4d0e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -4,7 +4,7 @@ Exe - net6.0 + net7.0 @@ -21,7 +21,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 112c33a01e..2830b16e9d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -25,7 +25,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index 85787e9ffd..16f823b3ba 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index b3ed2380a9..68532c4d78 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName @@ -21,9 +21,9 @@ - + + all runtime; build; native; contentfiles; analyzers - compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index e33e002731..91f8e9af8a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c @@ -12,8 +12,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/web.config new file mode 100644 index 0000000000..75beec5baf --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 0d954718d8..6e72b6879f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/web.config new file mode 100644 index 0000000000..34fe7ed5f2 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj index 630a23c3bd..2a585f45a4 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj index 01cca1665c..e9f07986e2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 382abd0d7c..a0fe553f6a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true @@ -18,7 +18,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index beb85d4851..55302dde61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -184,7 +184,7 @@ public class MyProjectNameWebModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); + //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); // diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/web.config new file mode 100644 index 0000000000..b3f0af69aa --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 81e5609f91..560ba570dd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index c716df4ced..18863a59ff 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -140,7 +140,7 @@ public class MyProjectNameWebModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); + //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/web.config b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/web.config new file mode 100644 index 0000000000..a47301da46 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/web.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index f7c2ea234d..ee00e7f04c 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index c54db160e0..defd452da5 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 7c0d168034..6806868b1c 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj index 66d5efd55e..cba50f2f41 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 368d378885..b9844d6d0f 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index 57ea860a60..efdeb6718b 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj index b9aad6bf1d..05193d0987 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 Exe $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; MyCompanyName.MyProjectName diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index b79488f83f..0bb6102ece 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -4,7 +4,7 @@ Exe - net6.0 + net7.0 @@ -12,7 +12,7 @@ - + diff --git a/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index 73a3c5c110..812a35552c 100644 --- a/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -3,10 +3,10 @@ - net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net6.0-windows10.0.19041.0 + net7.0-android;net7.0-ios;net7.0-maccatalyst + $(TargetFrameworks);net7.0-windows10.0.19041.0 - + Exe MyCompanyName.MyProjectName true @@ -34,7 +34,7 @@ - + diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index fbc2b3aa68..809b27b310 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.5", - "@abp/ng.components": "~6.0.0-rc.5", - "@abp/ng.core": "~6.0.0-rc.5", - "@abp/ng.identity": "~6.0.0-rc.5", - "@abp/ng.setting-management": "~6.0.0-rc.5", - "@abp/ng.tenant-management": "~6.0.0-rc.5", - "@abp/ng.theme.basic": "~6.0.0-rc.5", - "@abp/ng.theme.shared": "~6.0.0-rc.5", + "@abp/ng.account": "~6.0.0", + "@abp/ng.components": "~6.0.0", + "@abp/ng.core": "~6.0.0", + "@abp/ng.identity": "~6.0.0", + "@abp/ng.setting-management": "~6.0.0", + "@abp/ng.tenant-management": "~6.0.0", + "@abp/ng.theme.basic": "~6.0.0", + "@abp/ng.theme.shared": "~6.0.0", "@angular/animations": "^14.2.1", "@angular/common": "^14.2.1", "@angular/compiler": "^14.2.1", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.0-rc.5", + "@abp/ng.schematics": "~6.0.0", "@angular-devkit/build-angular": "^14.2.3", "@angular-eslint/builder": "~14.1.1", "@angular-eslint/eslint-plugin": "~14.1.1", diff --git a/templates/module/angular/projects/dev-app/src/app/app.module.ts b/templates/module/angular/projects/dev-app/src/app/app.module.ts index d80eb58d6e..e71793c2f8 100644 --- a/templates/module/angular/projects/dev-app/src/app/app.module.ts +++ b/templates/module/angular/projects/dev-app/src/app/app.module.ts @@ -14,6 +14,7 @@ import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { APP_ROUTE_PROVIDER } from './route.provider'; +import { FeatureManagementModule } from '@abp/ng.feature-management'; @NgModule({ imports: [ @@ -33,6 +34,7 @@ import { APP_ROUTE_PROVIDER } from './route.provider'; SettingManagementConfigModule.forRoot(), MyProjectNameConfigModule.forRoot(), ThemeBasicModule.forRoot(), + FeatureManagementModule.forRoot(), ], providers: [APP_ROUTE_PROVIDER], declarations: [AppComponent], diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 74b417b870..5facd9d380 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=14", "@angular/core": ">=14", - "@abp/ng.core": ">=6.0.0-rc.5", - "@abp/ng.theme.shared": ">=6.0.0-rc.5" + "@abp/ng.core": ">=6.0.0", + "@abp/ng.theme.shared": ">=6.0.0" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index d1052473bb..518553bf62 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-c2d31439-b723-48e2-b061-5ebd7aeb6010 @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index 02acd4170c..08b908a6d0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj index c79aef1f7d..f01300f863 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj @@ -3,15 +3,15 @@ - net6.0 + net7.0 true - - + + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj index 9026f879b4..55e5423785 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true true true @@ -16,7 +16,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 3c6ff4a79c..a53e9dd6c6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5", - "@abp/aspnetcore.components.server.basictheme": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0", + "@abp/aspnetcore.components.server.basictheme": "^6.0.0" } } 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 b48c14ab1e..419f11f3ad 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 @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-c2d31439-b723-48e2-b061-5ebd7aeb6010 @@ -13,9 +13,9 @@ - - - + + + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 416fb8d818..1c872dd655 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-c2d31439-b723-48e2-b061-5ebd7aeb6010 @@ -12,7 +12,7 @@ - + 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 f6139d1eb8..a76d628ecb 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 @@ -187,7 +187,7 @@ public class MyProjectNameWebHostModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); + //options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index ff2b518df8..13ca021ace 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj index c807ce3049..cd23d32481 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-c2d31439-b723-48e2-b061-5ebd7aeb6010 @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index ff2b518df8..13ca021ace 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0" } } diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index f97a38e9bf..82e5ec1a94 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index f4b05fda0a..fb7721dabc 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj index 0baa9305ff..7a47626fc9 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 0385b5be02..c5bf783de3 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index d468b62c59..ee6a6ecb8a 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index 64bf004cb2..5c50aed0f2 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj index e7739550be..411049eb72 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj index a78ab4542f..5dcb0e44df 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 true MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index c6b9ea8d03..f8684a8086 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -21,7 +21,7 @@ - + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 0dc4ddd733..ae01d6eff1 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index b2a8dbed03..5edd4ddc4f 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 0d577f1e96..f4f493d053 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -3,13 +3,13 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName - + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj index bca4086c54..49441438d2 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 MyCompanyName.MyProjectName @@ -22,7 +22,7 @@ - + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 31efe22b92..1dffc4d80f 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index 9af92ffc88..8c422a46e3 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 MyCompanyName.MyProjectName diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index cead3f8c94..49acbb5c1d 100644 --- a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -4,7 +4,7 @@ WinExe - net5.0-windows + net7.0-windows true @@ -13,7 +13,7 @@ - + diff --git a/test/AbpPerfTest/AbpPerfTest.WithAbp/AbpPerfTest.WithAbp.csproj b/test/AbpPerfTest/AbpPerfTest.WithAbp/AbpPerfTest.WithAbp.csproj index 4f8cdd8bbd..36469eae3e 100644 --- a/test/AbpPerfTest/AbpPerfTest.WithAbp/AbpPerfTest.WithAbp.csproj +++ b/test/AbpPerfTest/AbpPerfTest.WithAbp/AbpPerfTest.WithAbp.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/AbpPerfTest/AbpPerfTest.WithoutAbp/AbpPerfTest.WithoutAbp.csproj b/test/AbpPerfTest/AbpPerfTest.WithoutAbp/AbpPerfTest.WithoutAbp.csproj index 858401c9bf..9b603886c8 100644 --- a/test/AbpPerfTest/AbpPerfTest.WithoutAbp/AbpPerfTest.WithoutAbp.csproj +++ b/test/AbpPerfTest/AbpPerfTest.WithoutAbp/AbpPerfTest.WithoutAbp.csproj @@ -1,15 +1,15 @@ - net6.0 + net7.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj index 60168258f0..53fb4732bf 100644 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj +++ b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 DistDemoApp diff --git a/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj b/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj index dbb980b427..4e7aa25eb3 100644 --- a/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj +++ b/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 DistDemoApp diff --git a/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj b/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj index 5698855ebb..f37868a36e 100644 --- a/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj +++ b/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 DistDemoApp diff --git a/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj b/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj index f43d82dd19..ff46489662 100644 --- a/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj +++ b/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj @@ -1,13 +1,13 @@ - net6.0 + net7.0 DistDemoApp - +