Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade #637

Merged
merged 1 commit into from
Jul 12, 2024
Merged

chore: Upgrade #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 6 additions & 6 deletions src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Overview.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public async Task NavigateToConfigAsync(ConfigComponentModel model)
public new void Dispose()
{
NavigationManager.LocationChanged -= HandleLocationChanged;
base.Dispose();
base.DisposeAsyncCore();
}
}
}
2 changes: 1 addition & 1 deletion src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Team.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private async Task AppPinAsync(Model.AppModel app)
public new void Dispose()
{
GlobalConfig.OnCurrentTeamChanged -= HandleCurrentTeamChanged;
base.Dispose();
base.DisposeAsyncCore();
}
}
}
16 changes: 3 additions & 13 deletions src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Shared/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 0 additions & 2 deletions src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Pages/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down