Skip to content

Commit 453bb22

Browse files
dougbudougbu
authored
Merge branch 'release/3.1-preview1' => 'release/3.1' (#14720)
2 parents 79f04eb + a7b739b commit 453bb22

File tree

16 files changed

+329
-327
lines changed

16 files changed

+329
-327
lines changed

‎eng/Version.Details.xml

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

‎eng/Versions.props

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

‎eng/Workarounds.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<PropertyGroup>
2222
<!-- Working around https://github.com/NuGet/Home/issues/8467 -->
2323
<NoWarn>$(NoWarn);NU5131</NoWarn>
24+
<!-- Workaround until https://github.com/aspnet/AspNetCore-Internal/issues/3103 is resolved -->
25+
<NoWarn>$(NoWarn);NU5048</NoWarn>
2426
</PropertyGroup>
2527

2628
<!-- Workaround https://github.com/dotnet/roslyn/issues/27975 -->

‎eng/scripts/ci-source-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ set -euo pipefail
99
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1010
reporoot="$(dirname "$(dirname "$scriptroot")")"
1111

12-
export DotNetBuildFromSource='true'
13-
1412
# Build repo tasks
1513
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj
1614

15+
export DotNetBuildFromSource='true'
16+
1717
# Build projects
1818
"$reporoot/eng/common/build.sh" --restore --build --pack "$@"

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "3.1.100-preview1-014024"
3+
"version": "3.1.100-preview1-014400"
44
},
55
"tools": {
6-
"dotnet": "3.1.100-preview1-014024",
6+
"dotnet": "3.1.100-preview1-014400",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppRuntimeVersion)"

‎src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,7 @@ private void VaryByArchitecture(List<TestVariant> variants, ServerType server, s
237237
{
238238
VaryByAncmHostingModel(variants, server, tfm, type, arch, archSkip);
239239
}
240-
241-
// TODO: remove this workaround: https://github.com/aspnet/AspNetCore/issues/11301
242-
else if (string.IsNullOrEmpty(archSkip))
240+
else
243241
{
244242
variants.Add(new TestVariant()
245243
{
@@ -291,19 +289,15 @@ private void VaryByAncmHostingModel(IList<TestVariant> variants, ServerType serv
291289
}
292290
}
293291

294-
// TODO: remove this workaround: https://github.com/aspnet/AspNetCore/issues/11301
295-
if (string.IsNullOrEmpty(skipAncm))
292+
variants.Add(new TestVariant()
296293
{
297-
variants.Add(new TestVariant()
298-
{
299-
Server = server,
300-
Tfm = tfm,
301-
ApplicationType = type,
302-
Architecture = arch,
303-
HostingModel = hostingModel,
304-
Skip = skipAncm,
305-
});
306-
}
294+
Server = server,
295+
Tfm = tfm,
296+
ApplicationType = type,
297+
Architecture = arch,
298+
HostingModel = hostingModel,
299+
Skip = skipAncm,
300+
});
307301
}
308302
}
309303

‎src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<KnownFrameworkReference
2020
Update="Microsoft.AspNetCore.App"
21-
TargetFramework="${DefaultNetCoreTargetFramework}"
2221
DefaultRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
2322
LatestRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
2423
TargetingPackVersion="${MicrosoftAspNetCoreAppRefPackageVersion}"

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/FixtureLoggedTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Reflection;
5+
using Microsoft.AspNetCore.Testing;
56
using Microsoft.Extensions.Logging.Testing;
67
using Xunit.Abstractions;
78

@@ -16,9 +17,9 @@ public FixtureLoggedTest(IISTestSiteFixture fixture)
1617
_fixture = fixture;
1718
}
1819

19-
public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
20+
public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
2021
{
21-
base.Initialize(methodInfo, testMethodArguments, testOutputHelper);
22+
base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
2223
_fixture.Attach(this);
2324
}
2425

‎src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
5+
using Microsoft.AspNetCore.Testing;
56
using Microsoft.Extensions.Logging.Testing;
67
using Xunit;
78

‎src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
5+
using Microsoft.AspNetCore.Testing;
56
using Microsoft.Extensions.Logging.Testing;
67
using Xunit;
78

‎src/Servers/Kestrel/shared/test/TestApplicationErrorLoggerLoggedTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Reflection;
@@ -11,9 +11,9 @@ public class TestApplicationErrorLoggerLoggedTest : LoggedTest
1111
{
1212
public TestApplicationErrorLogger TestApplicationErrorLogger { get; private set; }
1313

14-
public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
14+
public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
1515
{
16-
base.Initialize(methodInfo, testMethodArguments, testOutputHelper);
16+
base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
1717

1818
TestApplicationErrorLogger = new TestApplicationErrorLogger();
1919
LoggerFactory.AddProvider(new KestrelTestLoggerProvider(TestApplicationErrorLogger));

‎src/Servers/Kestrel/test/BindTests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using Microsoft.AspNetCore.Testing;
45
using Microsoft.Extensions.Logging;
56
using Microsoft.Extensions.Logging.Testing;
67

‎src/Servers/Kestrel/test/FunctionalTests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using Microsoft.AspNetCore.Testing;
45
using Microsoft.Extensions.Logging;
56
using Microsoft.Extensions.Logging.Testing;
67
#if MACOS

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,9 @@ public Http2TestBase()
378378
};
379379
}
380380

381-
public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
381+
public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
382382
{
383-
base.Initialize(methodInfo, testMethodArguments, testOutputHelper);
383+
base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
384384

385385
_serviceContext = new TestServiceContext(LoggerFactory, _mockKestrelTrace.Object)
386386
{

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
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 Microsoft.AspNetCore.Testing;
56
using Microsoft.Extensions.Logging;
67
using Microsoft.Extensions.Logging.Testing;
78

‎src/Servers/Kestrel/test/Interop.FunctionalTests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using Microsoft.AspNetCore.Testing;
45
using Microsoft.Extensions.Logging;
56
using Microsoft.Extensions.Logging.Testing;
67

0 commit comments

Comments
 (0)