Skip to content

Commit ac903f9

Browse files
dotnet-maestro[bot]pranavkm
authored andcommitted
[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk (#31748)
[main] Update dependencies from dotnet/efcore dotnet/runtime dotnet/emsdk - Update to a newer SDK - Skip uninstall step - Update NuGet version to keep up with the SDK - Fixup test - Bumping SDK in attempt to fix `dotnet new` issues - Try only 3 platforms - Try assembly info - using - Quarantine test
1 parent ed0af15 commit ac903f9

File tree

8 files changed

+248
-234
lines changed

8 files changed

+248
-234
lines changed

eng/Version.Details.xml

+146-146
Large diffs are not rendered by default.

eng/Versions.props

+75-75
Large diffs are not rendered by default.

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.3.21168.19"
3+
"version": "6.0.100-preview.4.21216.8"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-preview.3.21168.19",
6+
"dotnet": "6.0.100-preview.4.21216.8",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.25",

src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
44
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
55
<SelfContained>true</SelfContained>
6+
<UseMonoRuntime>true</UseMonoRuntime>
67
</PropertyGroup>
78
<ItemGroup>
89
<Reference Include="Microsoft.AspNetCore.Metadata" />

src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ public async Task CompilationFailuresAreListedByErrorPageMiddleware()
8080

8181
static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options)
8282
{
83+
options.AdditionalReferencePaths.Add(typeof(string).Assembly.Location);
84+
8385
// Workaround for incorrectly generated deps file. The build output has all of the binaries required to compile. We'll grab these and
8486
// add it to the list of assemblies runtime compilation uses.
8587
foreach (var path in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll"))

src/ProjectTemplates/Shared/TemplatePackageInstaller.cs

+17-11
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,23 @@ NUnit 3 Test Item (nunit-test) VB
120120
121121
* We don't want to construct this path so we'll rely on dotnet new --uninstall --help to construct the uninstall command.
122122
*/
123+
// Workaround for https://github.com/dotnet/sdk/issues/16906
124+
// await UninstallExistingTemplatesAsync(output);
125+
126+
foreach (var packagePath in builtPackages)
127+
{
128+
output.WriteLine($"Installing templates package {packagePath}...");
129+
var result = await RunDotNetNew(output, $"--install \"{packagePath}\"");
130+
Assert.True(result.ExitCode == 0, result.GetFormattedOutput());
131+
}
132+
133+
await VerifyCanFindTemplate(output, "webapp");
134+
await VerifyCanFindTemplate(output, "web");
135+
await VerifyCanFindTemplate(output, "react");
136+
}
137+
138+
private static async Task UninstallExistingTemplatesAsync(ITestOutputHelper output)
139+
{
123140
var proc = await RunDotNetNew(output, "--uninstall --help");
124141
var lines = proc.Output.Split(Environment.NewLine);
125142

@@ -145,17 +162,6 @@ NUnit 3 Test Item (nunit-test) VB
145162
await VerifyCannotFindTemplateAsync(output, "react");
146163
await VerifyCannotFindTemplateAsync(output, "reactredux");
147164
await VerifyCannotFindTemplateAsync(output, "angular");
148-
149-
foreach (var packagePath in builtPackages)
150-
{
151-
output.WriteLine($"Installing templates package {packagePath}...");
152-
var result = await RunDotNetNew(output, $"--install \"{packagePath}\"");
153-
Assert.True(result.ExitCode == 0, result.GetFormattedOutput());
154-
}
155-
156-
await VerifyCanFindTemplate(output, "webapp");
157-
await VerifyCanFindTemplate(output, "web");
158-
await VerifyCanFindTemplate(output, "react");
159165
}
160166

161167
private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName)

src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependencies
422422
}
423423

424424
[ConditionalFact]
425+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/31893")]
425426
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
426427
public async Task RemoveInProcessReference_FailedToFindRequestHandler()
427428
{

src/Servers/Kestrel/Transport.Quic/src/AssemblyInfo.cs

+4
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Runtime.CompilerServices;
5+
using System.Runtime.Versioning;
56

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

0 commit comments

Comments
 (0)