rename project

.github/workflows/publish-nuget.yml

@@ -17,12 +17,14 @@ jobs:
       with:
         dotnet-version: 8.0.x
     - name: Restore dependencies
-      run: dotnet restore ./src/Abp.RadzenUI.Blazor.Server/Abp.RadzenUI.Blazor.Server.csproj
+      run: dotnet restore ./src/Abp.Blazor.Server.RadzenUI/Abp.Blazor.Server.RadzenUI.csproj
     - name: Build
-      run: dotnet build --no-restore -c Release ./src/Abp.RadzenUI.Blazor.Server/Abp.RadzenUI.Blazor.Server.csproj
+      run: dotnet build --no-restore -c Release ./src/Abp.Blazor.Server.RadzenUI/Abp.Blazor.Server.RadzenUI.csproj
     - name: Create the package
-      run: dotnet pack -c Release ./src/Abp.RadzenUI.Blazor.Server/Abp.RadzenUI.Blazor.Server.csproj
+      run: dotnet pack -c Release ./src/Abp.Blazor.Server.RadzenUI/Abp.Blazor.Server.RadzenUI.csproj
     - name: Add nuget source
       run: dotnet nuget add source --username ShaoHans --password ${{ secrets.NUGET_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/ShaoHans/index.json"
     - name: Publish the package to Github Packages
-      run: dotnet nuget push ./src/Abp.RadzenUI.Blazor.Server/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_TOKEN }} --source github --skip-duplicate
+      run: dotnet nuget push ./src/Abp.Blazor.Server.RadzenUI/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_TOKEN }} --source github --skip-duplicate
+    - name: Publish the package to Nuget Gallery
+      run: dotnet nuget push ./src/Abp.Blazor.Server.RadzenUI/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_GALLERY_TOKEN }}  --source nuget.org --skip-duplicate

Abp.RadzenUI.sln

@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{10EF6EF4-D99
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.RadzenUI.Blazor.Server", "src\Abp.RadzenUI.Blazor.Server\Abp.RadzenUI.Blazor.Server.csproj", "{58DA4FEA-1ED6-462A-AF80-6EE572ED1109}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CRM.Blazor.Web", "samples\CRM.Blazor.Web\CRM.Blazor.Web.csproj", "{319BE42C-0F1A-4943-8FD8-1A72F8EE0932}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CRM.Application", "samples\CRM.Application\CRM.Application.csproj", "{5DA78621-4CBC-4A95-8209-3E716DFF3A58}"
@@ -27,16 +25,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CRM.HttpApi.Client", "sampl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CRM.EntityFrameworkCore", "samples\CRM.EntityFrameworkCore\CRM.EntityFrameworkCore.csproj", "{190A6C4C-FEF7-4952-8CEC-5B3B4E3454D0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.Blazor.Server.RadzenUI", "src\Abp.Blazor.Server.RadzenUI\Abp.Blazor.Server.RadzenUI.csproj", "{FE78CA9C-B638-4A81-B1EB-A32C9DB79104}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{58DA4FEA-1ED6-462A-AF80-6EE572ED1109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58DA4FEA-1ED6-462A-AF80-6EE572ED1109}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58DA4FEA-1ED6-462A-AF80-6EE572ED1109}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58DA4FEA-1ED6-462A-AF80-6EE572ED1109}.Release|Any CPU.Build.0 = Release|Any CPU
 		{319BE42C-0F1A-4943-8FD8-1A72F8EE0932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{319BE42C-0F1A-4943-8FD8-1A72F8EE0932}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{319BE42C-0F1A-4943-8FD8-1A72F8EE0932}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -73,12 +69,15 @@ Global
 		{190A6C4C-FEF7-4952-8CEC-5B3B4E3454D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{190A6C4C-FEF7-4952-8CEC-5B3B4E3454D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{190A6C4C-FEF7-4952-8CEC-5B3B4E3454D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE78CA9C-B638-4A81-B1EB-A32C9DB79104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE78CA9C-B638-4A81-B1EB-A32C9DB79104}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE78CA9C-B638-4A81-B1EB-A32C9DB79104}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE78CA9C-B638-4A81-B1EB-A32C9DB79104}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{58DA4FEA-1ED6-462A-AF80-6EE572ED1109} = {10EF6EF4-D998-402D-A7E6-40C8308EED8C}
 		{319BE42C-0F1A-4943-8FD8-1A72F8EE0932} = {1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}
 		{5DA78621-4CBC-4A95-8209-3E716DFF3A58} = {1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}
 		{E88695B2-9B44-4E6B-AC37-FDD7161A7142} = {1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}
@@ -88,6 +87,7 @@ Global
 		{ADE7627B-4104-401B-841A-A0E915222E57} = {1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}
 		{D1EBFCD4-EAC7-41F9-A295-A3086D3F47A9} = {1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}
 		{190A6C4C-FEF7-4952-8CEC-5B3B4E3454D0} = {1CDAD202-ED9B-4B3A-A0B6-9075F7885F4C}
+		{FE78CA9C-B638-4A81-B1EB-A32C9DB79104} = {10EF6EF4-D998-402D-A7E6-40C8308EED8C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {440DDE31-5D3A-4D00-934D-7A6E1F23132F}

samples/CRM.Blazor.Web/CRM.Blazor.Web.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\src\Abp.RadzenUI.Blazor.Server\Abp.RadzenUI.Blazor.Server.csproj" />
+		<ProjectReference Include="..\..\src\Abp.Blazor.Server.RadzenUI\Abp.Blazor.Server.RadzenUI.csproj" />
 		<ProjectReference Include="..\CRM.Application.Contracts\CRM.Application.Contracts.csproj" />
 		<ProjectReference Include="..\CRM.Application\CRM.Application.csproj" />
 		<ProjectReference Include="..\CRM.HttpApi\CRM.HttpApi.csproj" />

src/Abp.RadzenUI.Blazor.Server/Abp.RadzenUI.Blazor.Server.csproj → src/Abp.Blazor.Server.RadzenUI/Abp.Blazor.Server.RadzenUI.csproj

@@ -1,19 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
 		<RootNamespace>Abp.RadzenUI</RootNamespace>
-		<PackageId>Abp.RadzenUI.Blazor.Server</PackageId>
-		<Version>1.0.0</Version>
+		<PackageId>AbpRadzen.Blazor.Server.UI</PackageId>
+		<Version>0.0.2</Version>
 		<Authors>ShaoHans</Authors>
+		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<!--<PackageDescription>PACKAGE_DESCRIPTION</PackageDescription>
 		<RepositoryUrl>https://github.com/OWNER/REPOSITORY</RepositoryUrl>-->
 	</PropertyGroup>  
 
   <ItemGroup>
     <None Include="wwwroot\bootstrap\bootstrap.min.css.map" />
+		<None Include="..\..\README.md" Pack="true" PackagePath="."/>
   </ItemGroup>
 
 	<ItemGroup>

src/Abp.RadzenUI.Blazor.Server/AbpRadzenUIOptions.cs → src/Abp.Blazor.Server.RadzenUI/AbpRadzenUIOptions.cs

@@ -13,7 +13,7 @@ public class AbpRadzenUIOptions
 
 public class LoginPageSettings
 {
-    public string LogoPath { get; set; } = "_content/Abp.RadzenUI.Blazor.Server/images/radzen.webp";
+    public string LogoPath { get; set; } = "_content/Abp.Blazor.Server.RadzenUI/images/radzen.webp";
 }
 
 public class TitleBarSettings

src/Abp.RadzenUI.Blazor.Server/Bundling/BlazorGlobalScriptContributor.cs → src/Abp.Blazor.Server.RadzenUI/Bundling/BlazorGlobalScriptContributor.cs

@@ -14,6 +14,6 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         {
             context.Files.AddIfNotContains("/_framework/blazor.server.js");
         }
-        context.Files.AddIfNotContains("/_content/Abp.RadzenUI.Blazor.Server/js/highlight.pack.js");
+        context.Files.AddIfNotContains("/_content/Abp.Blazor.Server.RadzenUI/js/highlight.pack.js");
     }
 }

src/Abp.Blazor.Server.RadzenUI/Bundling/BlazorGlobalStyleContributor.cs

@@ -0,0 +1,15 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Abp.RadzenUI.Bundling;
+
+public class BlazorGlobalStyleContributor : BundleContributor
+{
+    public override void ConfigureBundle(BundleConfigurationContext context)
+    {
+        context.Files.AddIfNotContains("/_content/Abp.Blazor.Server.RadzenUI/bootstrap/bootstrap.min.css");
+        context.Files.AddIfNotContains("/_content/Abp.Blazor.Server.RadzenUI/css/site.css");
+        context.Files.AddIfNotContains("/_content/Abp.Blazor.Server.RadzenUI/app.css");
+
+        context.Files.AddIfNotContains("/_content/Abp.Blazor.Server.RadzenUI/fonts/MaterialSymbolsOutlined.woff2");
+    }
+}

src/Abp.RadzenUI.Blazor.Server/Components/App.razor → src/Abp.Blazor.Server.RadzenUI/Components/App.razor

@@ -8,9 +8,9 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link href="_content/Abp.RadzenUI.Blazor.Server/css/site.css" rel="stylesheet" />
+    <link href="_content/Abp.Blazor.Server.RadzenUI/css/site.css" rel="stylesheet" />
     <HeadOutlet @rendermode="InteractiveServer" />
-    <link rel="preload" href="_content/Abp.RadzenUI.Blazor.Server/fonts/MaterialSymbolsOutlined.woff2" as="font" type="font/woff2">
+    <link rel="preload" href="_content/Abp.Blazor.Server.RadzenUI/fonts/MaterialSymbolsOutlined.woff2" as="font" type="font/woff2">
     <RadzenTheme Theme="material3-dark" @rendermode="InteractiveServer" />
 </head>
 <body class="rz-scrollbars">
@@ -33,7 +33,7 @@
     </div>
 
     <script src="_framework/blazor.web.js"></script>
-    <script async src="_content/Abp.RadzenUI.Blazor.Server/js/highlight.pack.js"></script>
+    <script async src="_content/Abp.Blazor.Server.RadzenUI/js/highlight.pack.js"></script>
     <script src="_content/Radzen.Blazor/Radzen.Blazor.js?v=@(typeof(Radzen.Colors).Assembly.GetName().Version)"></script>
 </body>
 </html>