chore : upgrade (#330)

masastack · Jul 28, 2023 · f69da49 · f69da49
1 parent 98908e3
commit f69da49
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 74 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<MasaFrameworkPackageVersion>1.0.0-rc.4.4</MasaFrameworkPackageVersion>
+		<MasaFrameworkPackageVersion>1.0.0</MasaFrameworkPackageVersion>
 	</PropertyGroup>
 </Project>
diff --git a/...t.Infrastructure.EntityFrameworkCore/Masa.Alert.Infrastructure.EntityFrameworkCore.csproj b/...t.Infrastructure.EntityFrameworkCore/Masa.Alert.Infrastructure.EntityFrameworkCore.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
 	<PackageReference Include="Masa.BuildingBlocks.Ddd.Domain" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.Data.EFCore" Version="$(MasaFrameworkPackageVersion)" />
   </ItemGroup>

diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.Middleware/ValidatorMiddleware.cs b/src/Infrastructure/Masa.Alert.Infrastructure.Middleware/ValidatorMiddleware.cs
@@ -1,4 +1,4 @@
-namespace Lonsid.Fusion.Infrastructure.Middleware;
+namespace Masa.Alert.Infrastructure.Middleware;
 
 public class ValidatorMiddleware<TEvent> : IEventMiddleware<TEvent>
     where TEvent : notnull, IEvent

diff --git a/src/Services/Masa.Alert.Service/Infrastructure/Extensions/MultilevelCacheClientExtensions.cs b/src/Services/Masa.Alert.Service/Infrastructure/Extensions/MultilevelCacheClientExtensions.cs
diff --git a/src/Services/Masa.Alert.Service/Infrastructure/Middleware/CurrentUserCheckMiddleware.cs b/src/Services/Masa.Alert.Service/Infrastructure/Middleware/CurrentUserCheckMiddleware.cs
diff --git a/src/Services/Masa.Alert.Service/_Imports.cs b/src/Services/Masa.Alert.Service/_Imports.cs
@@ -4,8 +4,6 @@
 global using System.Linq;
 global using System.Text.RegularExpressions;
 global using FluentValidation;
-global using HealthChecks.UI.Client;
-global using Lonsid.Fusion.Infrastructure.Middleware;
 global using Mapster;
 global using Masa.Alert.Application.AlarmHistories.Commands;
 global using Masa.Alert.Application.AlarmHistories.Queries;
@@ -18,45 +16,27 @@
 global using Masa.Alert.Application.WebHooks.Commands;
 global using Masa.Alert.Application.WebHooks.Queries;
 global using Masa.Alert.Domain.NotificationService;
-global using Masa.Alert.Domain.Shared.AlarmHistory;
-global using Masa.Alert.Domain.Shared.AlarmRules;
 global using Masa.Alert.EntityFrameworkCore;
 global using Masa.Alert.Infrastructure.Common.Extensions;
 global using Masa.Alert.Infrastructure.Ddd.Application.Contracts.Dtos;
 global using Masa.Alert.NotificationService.Provider.Mc;
-global using Masa.Alert.Service.Admin.Infrastructure.Middleware;
 global using Masa.Alert.Service.Admin.Internal;
-global using Masa.BuildingBlocks.Authentication.Identity;
 global using Masa.BuildingBlocks.Ddd.Domain.Repositories;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents;
-global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands;
 global using Masa.BuildingBlocks.RulesEngine;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
-global using Masa.BuildingBlocks.StackSdks.Config;
 global using Masa.Contrib.Caching.Distributed.StackExchangeRedis;
 global using Masa.Contrib.Configuration.ConfigurationApi.Dcc;
 global using Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore;
 global using Masa.Contrib.StackSdks.Config;
 global using Masa.Contrib.StackSdks.Tsc;
 global using Microsoft.AspNetCore.Authentication.JwtBearer;
-global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.EntityFrameworkCore;
-global using Microsoft.Extensions.DependencyInjection;
-global using Microsoft.Extensions.Diagnostics.HealthChecks;
 global using Microsoft.OpenApi.Models;
-global using Masa.Utils.Configuration.Json;
-global using Masa.BuildingBlocks.Caching;
-global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
-global using Masa.Alert.Infrastructure.Constants;
-global using Masa.Alert.Service.Admin.Infrastructure.Extensions;
-global using Masa.Contrib.StackSdks.Auth.Model;
 global using Masa.Contrib.StackSdks.Middleware;
-global using Google.Api;
-global using Microsoft.AspNetCore.SignalR;
-global using Masa.Contrib.StackSdks.Caller;
 global using Masa.BuildingBlocks.Data.UoW;
-global using Masa.Contrib.StackSdks.Isolation;
+global using Masa.Contrib.StackSdks.Isolation;
+global using Masa.Alert.Infrastructure.Middleware;
diff --git a/src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj b/src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Masa.Contrib.Development.DaprStarter.AspNetCore" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
     <PackageReference Include="Masa.Contrib.Data.Mapping.Mapster" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />

diff --git a/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj b/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Mapster" Version="7.3.0" />
     <PackageReference Include="Masa.BuildingBlocks.Authentication.Identity" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Stack.Components" Version="0.0.413" />
+    <PackageReference Include="Masa.Stack.Components" Version="0.0.421" />
     <PackageReference Include="Masa.Utils.Data.Elasticsearch" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.3" />