Skip to content

[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk #31748

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.

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 18 commits into from
Apr 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c48b4b6
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Apr 13, 2021
decbca9
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Apr 13, 2021
c65315d
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Apr 14, 2021
131cfb0
Update to a newer SDK
pranavkm Apr 14, 2021
c7c525d
Skip uninstall step
pranavkm Apr 14, 2021
0025671
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Apr 14, 2021
7efd7ae
Update NuGet version to keep up with the SDK
pranavkm Apr 14, 2021
6e42173
Fixup test
pranavkm Apr 15, 2021
5c62bcd
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Apr 15, 2021
9b6d2a2
Update dependencies from https://github.com/dotnet/emsdk build 202104…
dotnet-maestro[bot] Apr 15, 2021
815475a
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Apr 15, 2021
745bd90
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Apr 16, 2021
9dd1046
Bumping SDK in attempt to fix `dotnet new` issues
DavidKarlas Apr 16, 2021
0c5bf98
Try only 3 platforms
jkotalik Apr 16, 2021
5dc01f6
Update dependencies from https://github.com/dotnet/emsdk build 202104…
dotnet-maestro[bot] Apr 16, 2021
bebc0b5
Try assembly info
jkotalik Apr 16, 2021
1fe221b
using
jkotalik Apr 16, 2021
598e4aa
Quarantine test
jkotalik Apr 16, 2021
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
292 changes: 146 additions & 146 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

150 changes: 75 additions & 75 deletions eng/Versions.props

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.100-preview.3.21168.19"
"version": "6.0.100-preview.4.21216.8"
},
"tools": {
"dotnet": "6.0.100-preview.3.21168.19",
"dotnet": "6.0.100-preview.4.21216.8",
"runtimes": {
"dotnet/x64": [
"2.1.25",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<UseMonoRuntime>true</UseMonoRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Metadata" />
Expand Down
2 changes: 2 additions & 0 deletions src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public async Task CompilationFailuresAreListedByErrorPageMiddleware()

static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options)
{
options.AdditionalReferencePaths.Add(typeof(string).Assembly.Location);

// Workaround for incorrectly generated deps file. The build output has all of the binaries required to compile. We'll grab these and
// add it to the list of assemblies runtime compilation uses.
foreach (var path in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll"))
Expand Down
28 changes: 17 additions & 11 deletions src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,23 @@ NUnit 3 Test Item (nunit-test) VB

* We don't want to construct this path so we'll rely on dotnet new --uninstall --help to construct the uninstall command.
*/
// Workaround for https://github.com/dotnet/sdk/issues/16906
// await UninstallExistingTemplatesAsync(output);

foreach (var packagePath in builtPackages)
{
output.WriteLine($"Installing templates package {packagePath}...");
var result = await RunDotNetNew(output, $"--install \"{packagePath}\"");
Assert.True(result.ExitCode == 0, result.GetFormattedOutput());
}

await VerifyCanFindTemplate(output, "webapp");
await VerifyCanFindTemplate(output, "web");
await VerifyCanFindTemplate(output, "react");
}

private static async Task UninstallExistingTemplatesAsync(ITestOutputHelper output)
{
var proc = await RunDotNetNew(output, "--uninstall --help");
var lines = proc.Output.Split(Environment.NewLine);

Expand All @@ -145,17 +162,6 @@ NUnit 3 Test Item (nunit-test) VB
await VerifyCannotFindTemplateAsync(output, "react");
await VerifyCannotFindTemplateAsync(output, "reactredux");
await VerifyCannotFindTemplateAsync(output, "angular");

foreach (var packagePath in builtPackages)
{
output.WriteLine($"Installing templates package {packagePath}...");
var result = await RunDotNetNew(output, $"--install \"{packagePath}\"");
Assert.True(result.ExitCode == 0, result.GetFormattedOutput());
}

await VerifyCanFindTemplate(output, "webapp");
await VerifyCanFindTemplate(output, "web");
await VerifyCanFindTemplate(output, "react");
}

private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependencies
}

[ConditionalFact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/31893")]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
public async Task RemoveInProcessReference_FailedToFindRequestHandler()
{
Expand Down
4 changes: 4 additions & 0 deletions src/Servers/Kestrel/Transport.Quic/src/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Runtime.CompilerServices;
using System.Runtime.Versioning;

[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: SupportedOSPlatform("windows")]
[assembly: SupportedOSPlatform("macos")]
[assembly: SupportedOSPlatform("linux")]