Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
<Version>9.11.5-beta03</Version>
<Version>9.11.5-beta04</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<Version>10.0.0-rc.2.1.2</Version>
<Version>10.0.0-rc.2.1.3</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions src/BootstrapBlazor/Extensions/AssemblyExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ static class AssemblyExtensions
/// </summary>
/// <param name="assembly"></param>
/// <returns></returns>
public static string GetUniqueName(this Assembly assembly) => assembly.IsCollectible
? $"{assembly.GetName().Name}-{assembly.GetHashCode()}"
: $"{assembly.GetName().Name}";
public static string GetUniqueName(this Assembly assembly) => CacheManager.GetUniqueName(assembly);
}
19 changes: 19 additions & 0 deletions src/BootstrapBlazor/Services/CacheManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,25 @@ private List<ICacheEntry> GetAllValues(MemoryCache cache)
}
#endif

#region Assembly
/// <summary>
/// 获得唯一类型名称方法
/// </summary>
/// <param name="assembly"></param>
/// <returns></returns>
public static string GetUniqueName(Assembly assembly)
{
//key不拼接,作为当前静态实例唯一标识,因为GetUniqueName方法会被频繁调用
return Instance.GetOrCreate(assembly, _ =>
{
return assembly.IsCollectible
? $"{assembly.GetName().Name}-{assembly.GetHashCode()}"
: $"{assembly.GetName().Name}";
});
}

#endregion

#region Count
public static int ElementCount(object? value)
{
Expand Down
16 changes: 8 additions & 8 deletions test/UnitTest/Components/BootstrapModuleComponentBaseTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public void InvokeVoidAsync_Ok()
}

[Fact]
public void InvokeAsync_Ok()
public async Task InvokeAsync_Ok()
{
var cut = Context.RenderComponent<MockObjectReferenceComponent>();
cut.InvokeAsync(() => cut.Instance.InvokeAsyncTest());
await cut.InvokeAsync(() => cut.Instance.InvokeAsyncTest());
Assert.True(cut.Instance.InvokeRunner);
}

Expand All @@ -32,11 +32,11 @@ class MockComponent : BootstrapModuleComponentBase

public async Task InvokeVoidAsyncTest()
{
await base.InvokeVoidAsync(Id);
await base.InvokeVoidAsync(Id, TimeSpan.FromMinutes(1));
await InvokeVoidAsync(Id);
await InvokeVoidAsync(Id, TimeSpan.FromMinutes(1));

using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(1000);
await base.InvokeVoidAsync(Id, cancellationTokenSource.Token);
await InvokeVoidAsync(Id, cancellationTokenSource.Token);

InvokeVoidRunner = true;
}
Expand All @@ -49,11 +49,11 @@ class MockObjectReferenceComponent : Select<string>

public async Task InvokeAsyncTest()
{
await base.InvokeAsync<string>(Id);
await base.InvokeAsync<string>(Id, TimeSpan.FromMinutes(1));
await InvokeAsync<string>(Id);
await InvokeAsync<string>(Id, TimeSpan.FromMinutes(1));

using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(1000);
await base.InvokeAsync<string>(Id, cancellationTokenSource.Token);
await InvokeAsync<string>(Id, cancellationTokenSource.Token);

InvokeRunner = true;
}
Expand Down
7 changes: 7 additions & 0 deletions test/UnitTest/Extensions/AssemblyExtensionsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ public class AssemblyExtensionsTest
[Fact]
public void GetUniqueName_Ok()
{
var sc = new ServiceCollection();
sc.AddBootstrapBlazor();

var provider = sc.BuildServiceProvider();
var cacheManager = provider.GetRequiredService<ICacheManager>();
cacheManager.GetStartTime();

var type = Type.GetType("BootstrapBlazor.Components.AssemblyExtensions, BootstrapBlazor");
Assert.NotNull(type);

Expand Down
Loading