这是indexloc提供的服务，不要输入任何密码
Skip to content

Do the preview 7 thing #347

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

Merged
merged 6 commits into from
Aug 6, 2019
Merged

Do the preview 7 thing #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e7a234
Do the preview 7 thing
Jul 26, 2019
9cf7296
Update Microsoft.AspNetCore.TestHost package
Aug 6, 2019
70fe0fb
Fix error message
Aug 6, 2019
85f9401
Fix tests
Aug 6, 2019
8a5bbcd
Skip test
Aug 6, 2019
79b5a0a
Fix syntax error
Aug 6, 2019
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
23 changes: 3 additions & 20 deletions MLS.Agent.Tests/ApiViaHttpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,22 +714,12 @@ public async Task When_Run_times_out_in_console_workspace_server_code_then_the_r

var requestJson = new WorkspaceRequest(workspace).ToJson();

((VirtualClock)Clock.Current).OnBudgetEntryRecorded((virtualClock, budget, entry) =>
{
Log.Info("Budget entry created: {entry}", entry);

if (entry.Name == "CompileWorker")
{
budget.Cancel();
}
});

var response = await CallRun(requestJson);
var response = await CallRun(requestJson, timeoutMs: 1);

response.StatusCode.Should().Be(HttpStatusCode.GatewayTimeout);
}

[Theory]
[Theory(Skip = "Test host changes make this difficult to test")]
[InlineData(@"
Console.WriteLine();")]
[InlineData(@"
Expand All @@ -740,14 +730,7 @@ public async Task When_Run_times_out_in_script_workspace_server_code_then_the_re

var requestJson = new WorkspaceRequest(workspace).ToJson();

((VirtualClock)Clock.Current).OnBudgetEntryRecorded((virtualClock, budget, entry) =>
{
Log.Info("Budget entry created: {entry}", entry);

budget.Cancel();
});

var response = await CallRun(requestJson);
var response = await CallRun(requestJson, timeoutMs: 1);

response.StatusCode.Should().Be(HttpStatusCode.GatewayTimeout);
}
Expand Down
2 changes: 1 addition & 1 deletion MLS.Agent.Tests/MLS.Agent.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0-preview7.19365.7" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.02" />
<PackageReference Include="Pocket.Disposable" Version="1.0.5">
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions MLS.Agent/MLS.Agent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
</PackageReference>
<PackageReference Include="Markdig" Version="0.17.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview7.19365.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview7.19365.7" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.3" PrivateAssets="all" />
<PackageReference Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
<PackageReference Include="Pocket.Disposable" Version="1.0.5">
Expand Down
6 changes: 3 additions & 3 deletions MLS.Blazor/MLS.Blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion WorkspaceServer.Tests/HttpRequestTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void HttpRequest_Uri_must_be_relative()
.Which
.Message
.Should()
.Be($"Value must be a valid relative uri{Environment.NewLine}Parameter name: uri");
.Be($"Value must be a valid relative uri (Parameter 'uri')");
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ variables:
- name: _DotNetArtifactsCategory
value: .NETCore
- name: BlazorTemplateVersion
value: 3.0.0-preview6.19307.2
value: 3.0.0-preview7.19365.7
- name: DotNetSdkVersion
value: 3.0.100-preview6-012264
value: 3.0.100-preview7-012821
- name: NodeJSVersion
value: '>=12'
- name: TryDotNetPackagesPath
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "3.0.100-preview6-012264"
"version": "3.0.100-preview7-012821"
},
"tools": {
"dotnet": "3.0.100-preview6-012264"
"dotnet": "3.0.100-preview7-012821"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19257.7"
Expand Down