Skip to content

Commit 9e4709f

Browse files
authored
Fix some semantic color issues (#78)
2 parents ae88eef + c69812a commit 9e4709f

17 files changed

+151
-166
lines changed

.globalconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# CA2025: Do not pass 'IDisposable' instances into unawaited tasks
2+
dotnet_diagnostic.CA2025.severity = suggestion

Directory.Packages.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
<!-- We are not using package source mapping. -->
66
<NoWarn>$(NoWarn);NU1507</NoWarn>
7-
<NetCoreVersion>10.0.0-preview.4.25258.110</NetCoreVersion>
7+
<NetCoreVersion>10.0.0-preview.5.25277.114</NetCoreVersion>
88
<AspNetCoreVersion>$(NetCoreVersion)</AspNetCoreVersion>
9-
<RoslynVersion>5.0.0-1.25252.6</RoslynVersion>
10-
<FluentUIVersion>4.11.8</FluentUIVersion>
11-
<NuGetVersion>6.13.1</NuGetVersion>
9+
<RoslynVersion>5.0.0-1.25321.102</RoslynVersion>
10+
<FluentUIVersion>4.12.0</FluentUIVersion>
11+
<NuGetVersion>6.14.0</NuGetVersion>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageVersion Include="AwesomeAssertions" Version="8.0.1" />
14+
<PackageVersion Include="AwesomeAssertions" Version="9.0.0" />
1515
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
1616
<!-- When upating BlazorMonaco, check that VIM mode works. See https://github.com/jjonescz/DotNetLab/pull/57. -->
1717
<PackageVersion Include="BlazorMonaco" Version="3.2.0" />
1818
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
19-
<PackageVersion Include="ICSharpCode.Decompiler" Version="9.0.0.7889" />
19+
<PackageVersion Include="ICSharpCode.Decompiler" Version="9.1.0.7988" />
2020
<PackageVersion Include="MetadataReferenceService.BlazorWasm" Version="0.0.1" />
2121
<PackageVersion Include="Microsoft.AspNetCore.App.Ref" Version="$(AspNetCoreVersion)" />
2222
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
@@ -29,17 +29,17 @@
2929
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(NetCoreVersion)" />
3030
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="$(FluentUIVersion)" />
3131
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="$(FluentUIVersion)" />
32-
<PackageVersion Include="Microsoft.Net.Compilers.Razor.Toolset" Version="10.0.0-preview.25252.1" />
32+
<PackageVersion Include="Microsoft.Net.Compilers.Razor.Toolset" Version="10.0.0-preview.25321.102" />
3333
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="$(RoslynVersion)" />
34-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
34+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3535
<PackageVersion Include="Microsoft.NETCore.App.Ref" Version="$(NetCoreVersion)" />
3636
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
3737
<PackageVersion Include="NuGet.Protocol" Version="$(NuGetVersion)" />
3838
<PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersion)" />
39-
<PackageVersion Include="protobuf-net" Version="3.2.46" />
39+
<PackageVersion Include="protobuf-net" Version="3.2.52" />
4040
<PackageVersion Include="System.IO.Hashing" Version="$(NetCoreVersion)" />
41-
<PackageVersion Include="xunit.v3" Version="1.1.0" />
42-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
41+
<PackageVersion Include="xunit.v3" Version="2.0.3" />
42+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
4343
<!-- Pinned transitive dependencies -->
4444
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
4545
</ItemGroup>

DotNetLab.sln

Lines changed: 0 additions & 111 deletions
This file was deleted.

DotNetLab.slnx

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Solution>
2+
<Folder Name="/eng/">
3+
<File Path="eng/build.sh" />
4+
<File Path="eng/CopyDotNetDTs.targets" />
5+
</Folder>
6+
<Folder Name="/src/">
7+
<Project Path="src/App/App.csproj" />
8+
<Project Path="src/Compiler/Compiler.csproj" />
9+
<Project Path="src/RazorAccess/RazorAccess.csproj" />
10+
<Project Path="src/RoslynAccess/RoslynAccess.csproj" />
11+
<Project Path="src/RoslynWorkspaceAccess/RoslynWorkspaceAccess.csproj" />
12+
<Project Path="src/Server/Server.csproj" />
13+
<Project Path="src/Shared/Shared.csproj" />
14+
<Project Path="src/Worker/Worker.csproj" />
15+
<Project Path="src/WorkerApi/WorkerApi.csproj" />
16+
</Folder>
17+
<Folder Name="/test/">
18+
<Project Path="test/UnitTests/UnitTests.csproj" />
19+
</Folder>
20+
<Folder Name="/_/">
21+
<File Path=".gitignore" />
22+
<File Path=".globalconfig" />
23+
<File Path="Directory.Build.props" />
24+
<File Path="Directory.Packages.props" />
25+
<File Path="global.json" />
26+
<File Path="nuget.config" />
27+
<File Path="README.md" />
28+
</Folder>
29+
</Solution>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.4.25258.110",
4-
"workloadVersion": "10.0.100-preview.4.25263.1"
3+
"version": "10.0.100-preview.5.25277.114",
4+
"workloadVersion": "10.0.100-preview.5.25306.3"
55
}
66
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
namespace DotNetLab.Lab;
77

88
[SupportedOSPlatform("browser")]
9-
internal sealed class LanguageServices(
9+
internal sealed class LanguageServicesClient(
1010
ILoggerFactory loggerFactory,
11-
ILogger<LanguageServices> logger,
11+
ILogger<LanguageServicesClient> logger,
1212
IJSRuntime jsRuntime,
1313
WorkerController worker,
1414
BlazorMonacoInterop blazorMonacoInterop)

src/App/Lab/Page.razor

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@inject IJSRuntime JSRuntime
44
@inject NavigationManager NavigationManager
55
@inject WorkerController Worker
6-
@inject LanguageServices LanguageServices
6+
@inject LanguageServicesClient LanguageServices
77
@inject InputOutputCache Cache
88
@inject TemplateCache TemplateCache
99
@inject BlazorMonacoInterop BlazorMonacoInterop
@@ -772,7 +772,11 @@
772772
{
773773
if (!outputStates.TryGetValue(outputType, out var state))
774774
{
775-
state = new(await BlazorMonaco.Editor.Global.CreateModel(JSRuntime, value: text, language: language));
775+
state = new(await BlazorMonaco.Editor.Global.CreateModel(
776+
JSRuntime,
777+
value: text,
778+
language: language,
779+
uri: $"out/{Guid.CreateVersion7()}/{outputType}"));
776780
outputStates[outputType] = state;
777781
}
778782
else

src/App/Lab/Settings.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@inject IJSRuntime JSRuntime
44
@inject ILocalStorageService LocalStorage
55
@inject WorkerController Worker
6-
@inject LanguageServices LanguageServices
6+
@inject LanguageServicesClient LanguageServices
77
@inject HttpClient Client
88

99
<FluentDesignTheme StorageName="theme" @bind-Mode="theme" CustomColor="@AppColors.CustomDark"

src/App/Lab/TemplateCache.cs

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

src/App/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
builder.Services.AddScoped<WorkerController>();
1818
builder.Services.AddScoped<BlazorMonacoInterop>();
19-
builder.Services.AddScoped<LanguageServices>();
19+
builder.Services.AddScoped<LanguageServicesClient>();
2020
builder.Services.AddScoped<InputOutputCache>();
2121
builder.Services.AddScoped<TemplateCache>();
2222

0 commit comments

Comments
 (0)