From 8140de391854d505a240ab9c167ffdf11ecf9f75 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Sun, 16 Apr 2023 22:40:47 +0800 Subject: [PATCH] Move custom extension methods under the system namespace to the EasyOC namespace --- pack.ps1 | 18 ------------------ .../Items/QueriesDeploymentStep.Summary.cshtml | 1 + .../Items/RolesDeploymentStep.Summary.cshtml | 1 + .../DictionaryExtensions.cs | 2 +- .../EnumerableExtensions.cs | 4 +--- .../ObjectExtensions.cs | 2 +- .../StringExtensions.cs | 2 +- 7 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 pack.ps1 diff --git a/pack.ps1 b/pack.ps1 deleted file mode 100644 index 4b1ebac..0000000 --- a/pack.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -$x = Split-Path -Parent $MyInvocation.MyCommand.Definition -cd $x - -dotnet build --configuration Release --framework net6.0 - -Get-ChildItem ./src/ -recurse *.nupkg | Remove-Item -dotnet pack -c Release --no-restore --no-build --include-symbols --include-source -$pkgs = Get-ChildItem ./src/ -recurse *.nupkg; - -foreach($pkg in $pkgs) -{ - dotnet nuget push $pkg.FullName -n true --skip-duplicate -} -$spkgs = Get-ChildItem ./src/ -recurse *.snupkg; -foreach($spkg in $spkgs) -{ - dotnet nuget push $spkg.FullName -n true --skip-duplicate -} diff --git a/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml b/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml index 861bf33..a626e36 100644 --- a/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml +++ b/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml @@ -1,4 +1,5 @@ @using EasyOC.Deployment.Deployment; +@using EasyOC; @using OrchardCore.DisplayManagement.Views; @using OrchardCore.Queries; @model ShapeViewModel diff --git a/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml b/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml index 432ee56..6c53bcb 100644 --- a/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml +++ b/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml @@ -1,4 +1,5 @@ @using EasyOC.Deployment.Deployment; +@using EasyOC; @using OrchardCore.DisplayManagement.Views; @using OrchardCore.Security.Services; @model ShapeViewModel diff --git a/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs index 17b5a74..21a1028 100644 --- a/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace System.Collections.Generic +namespace EasyOC { public static class DictionaryExtensions { diff --git a/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs index 6ceec64..6760fd5 100644 --- a/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs @@ -1,6 +1,4 @@ -using System.Linq; - -namespace System.Collections.Generic +namespace EasyOC { public static class EnumerableExtensions { diff --git a/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs index 707fc25..4f387e1 100644 --- a/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using Newtonsoft.Json.Linq; -namespace System +namespace EasyOC { /// /// Extension methods for all objects. diff --git a/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs index 41db4cd..29012ed 100644 --- a/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.RegularExpressions; -namespace System +namespace EasyOC { // // 摘要: