chore: Upgrade (#637)

masastack · Jul 12, 2024 · 26cd2ce · 26cd2ce
1 parent 2577f62
commit 26cd2ce
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 33 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
-    <MasaFrameworkPackageVersion>1.0.0</MasaFrameworkPackageVersion>
+    <MasaFrameworkPackageVersion>1.2.0-preview.2</MasaFrameworkPackageVersion>
+		<MasaStackSdksPackageVersion>1.1.0-preview.2</MasaStackSdksPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj b/src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Masa.Contrib.Service.Caller.HttpClient" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Caller" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaFrameworkPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Caller" Version="$(MasaStackSdksPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaStackSdksPackageVersion)" />
     <PackageReference Include="Masa.Utils.Configuration.Json" Version="$(MasaFrameworkPackageVersion)" />
   </ItemGroup>
 

diff --git a/src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj b/src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.BuildingBlocks.StackSdks.Dcc.Contracts" Version="$(MasaFrameworkPackageVersion)" />
+    <PackageReference Include="Masa.BuildingBlocks.StackSdks.Dcc.Contracts" Version="$(MasaStackSdksPackageVersion)" />
     <PackageReference Include="Masa.Utils.Data.DataAnnotations" Version="$(MasaFrameworkPackageVersion)" />
   </ItemGroup>
 

diff --git a/src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj b/src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj
@@ -21,12 +21,12 @@
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.7" />
     <PackageReference Include="Mapster" Version="7.3.0" />
     <PackageReference Include="Masa.BuildingBlocks.Dispatcher.Events" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.BuildingBlocks.StackSdks.Auth" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
+    <PackageReference Include="Masa.BuildingBlocks.StackSdks.Auth" Version="$(MasaStackSdksPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaStackSdksPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaStackSdksPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaStackSdksPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaStackSdksPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaStackSdksPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Authentication.Identity" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Caching.Distributed.StackExchangeRedis" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Caching.MultilevelCache" Version="$(MasaFrameworkPackageVersion)" />

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Stack.Components" Version="0.0.421" />
+    <PackageReference Include="Masa.Stack.Components" Version="0.0.466" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.3" />
   </ItemGroup>
 

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs
@@ -596,7 +596,7 @@ await ConfigObjectCaller.UpdateConfigObjectContentAsync(new UpdateConfigObjectCo
             {
                 configObject.IsEditing = true;
                 _tempContent = configObject.Content;
-                var configObjects = _configObjects.Except(new List<ConfigObjectModel> { configObject });
+                var configObjects = _configObjects.Except(new List<ConfigObjectModel> { configObject }).ToList();
                 configObjects.ForEach(config =>
                 {
                     config.IsEditing = false;
@@ -642,7 +642,7 @@ await ConfigObjectCaller.UpdateConfigObjectContentAsync(new UpdateConfigObjectCo
             {
                 configObject.IsEditing = true;
                 _tempContent = configObject.Content;
-                var configObjects = _configObjects.Except(new List<ConfigObjectModel> { configObject });
+                var configObjects = _configObjects.Except(new List<ConfigObjectModel> { configObject }).ToList();
                 configObjects.ForEach(config =>
                 {
                     config.IsEditing = false;

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Overview.razor.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Overview.razor.cs
@@ -136,7 +136,7 @@ public async Task NavigateToConfigAsync(ConfigComponentModel model)
         public new void Dispose()
         {
             NavigationManager.LocationChanged -= HandleLocationChanged;
-            base.Dispose();
+            base.DisposeAsyncCore();
         }
     }
 }
diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Team.razor.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Team.razor.cs
@@ -129,7 +129,7 @@ private async Task AppPinAsync(Model.AppModel app)
         public new void Dispose()
         {
             GlobalConfig.OnCurrentTeamChanged -= HandleCurrentTeamChanged;
-            base.Dispose();
+            base.DisposeAsyncCore();
         }
     }
 }
diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Shared/MainLayout.razor b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Shared/MainLayout.razor
@@ -2,19 +2,9 @@
 @inherits LayoutComponentBase
 @inject IMasaStackConfig MasaStackConfig
 
-<SLayout OnErrorAsync="OnError"
-         TeamRouteFormat="team"
+<SLayout TeamRouteFormat="team"
+         Class="fill-height"
          Logo="https://cdn.masastack.com/stack/images/logo/MASAStack/logo-h-en.png"
          MiniLogo="https://cdn.masastack.com/stack/images/logo/MASAStack/logo.png">
     @Body
-</SLayout>
-
-@code {
-    [Inject]
-    public IPopupService PopupService { get; set; } = default!;
-
-    async Task OnError(Exception exception)
-    {
-        await PopupService.EnqueueSnackbarAsync(exception.Message, AlertTypes.Error);
-    }
-}
+</SLayout>
diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.cs
@@ -5,8 +5,6 @@
 global using System.Text.Json;
 global using System.Text.RegularExpressions;
 global using System.Xml.Linq;
-global using BlazorComponent;
-global using BlazorComponent.I18n;
 global using FluentValidation;
 global using Mapster;
 global using Masa.Blazor;

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor
@@ -1,5 +1,4 @@
-@using BlazorComponent
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
 @using Masa.Blazor
 @using System.Diagnostics.CodeAnalysis
 @using Microsoft.AspNetCore.Components.Authorization

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Pages/_Layout.cshtml b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Pages/_Layout.cshtml
@@ -24,7 +24,7 @@
 <body>
     @RenderBody()
     <script src="_framework/blazor.server.js"></script>
-    <script src="_content/BlazorComponent/js/blazor-component.js"></script>
+    <script src="_content/Masa.Blazor/js/masa-blazor.js"></script>
     <script src="_content/Masa.Stack.Components/js/components.js"></script>
     <script src="https://cdn.masastack.com/npm/echarts/5.1.1/echarts.min.js"></script>
     <script src="https://cdn.masastack.com/npm/aliyun/aliyun-oss-sdk.min.js"></script>