Skip to content

[release/3.1-preview1] Update dependencies from 3 repositories #14670

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
wtgodbe merged 14 commits into from
Oct 4, 2019
Merged

[release/3.1-preview1] Update dependencies from 3 repositories #14670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
668475c
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 2, 2019
90790ca
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 2, 2019
b480a09
Update to newer SDK
wtgodbe Oct 2, 2019
f18dfad
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 3, 2019
93a25f8
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 3, 2019
fbfdf13
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Oct 3, 2019
1881255
Update dependencies from https://github.com/aspnet/Blazor build 20191…
dotnet-maestro[bot] Oct 3, 2019
ac48cea
React to change in logging testing
rynowak Sep 24, 2019
5409bd7
Fix #11301 - revert workaround for test matrix
rynowak Sep 25, 2019
8aaf577
Unrevert else clause in TestMatrix
Tratcher Sep 28, 2019
a4f2b92
Install the runtime during source build
wtgodbe Oct 3, 2019
784f4d5
Apply workaround for template tests
wtgodbe Oct 3, 2019
db82927
Fix workaround
wtgodbe Oct 3, 2019
3b1fda7
remove TargetingPack metadata from workaround
wtgodbe Oct 4, 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
400 changes: 200 additions & 200 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

200 changes: 100 additions & 100 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions eng/Workarounds.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<PropertyGroup>
<!-- Working around https://github.com/NuGet/Home/issues/8467 -->
<NoWarn>$(NoWarn);NU5131</NoWarn>
<!-- Workaround until https://github.com/aspnet/AspNetCore-Internal/issues/3103 is resolved -->
<NoWarn>$(NoWarn);NU5048</NoWarn>
</PropertyGroup>

<!-- Workaround https://github.com/dotnet/roslyn/issues/27975 -->
Expand Down
4 changes: 2 additions & 2 deletions eng/scripts/ci-source-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ set -euo pipefail
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
reporoot="$(dirname "$(dirname "$scriptroot")")"

export DotNetBuildFromSource='true'

# Build repo tasks
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj

export DotNetBuildFromSource='true'

# Build projects
"$reporoot/eng/common/build.sh" --restore --build --pack "$@"
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.1.100-preview1-014024"
"version": "3.1.100-preview1-014400"
},
"tools": {
"dotnet": "3.1.100-preview1-014024",
"dotnet": "3.1.100-preview1-014400",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCoreAppRuntimeVersion)"
Expand Down
24 changes: 9 additions & 15 deletions src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,7 @@ private void VaryByArchitecture(List<TestVariant> variants, ServerType server, s
{
VaryByAncmHostingModel(variants, server, tfm, type, arch, archSkip);
}

// TODO: remove this workaround: https://github.com/aspnet/AspNetCore/issues/11301
else if (string.IsNullOrEmpty(archSkip))
else
{
variants.Add(new TestVariant()
{
Expand Down Expand Up @@ -291,19 +289,15 @@ private void VaryByAncmHostingModel(IList<TestVariant> variants, ServerType serv
}
}

// TODO: remove this workaround: https://github.com/aspnet/AspNetCore/issues/11301
if (string.IsNullOrEmpty(skipAncm))
variants.Add(new TestVariant()
{
variants.Add(new TestVariant()
{
Server = server,
Tfm = tfm,
ApplicationType = type,
Architecture = arch,
HostingModel = hostingModel,
Skip = skipAncm,
});
}
Server = server,
Tfm = tfm,
ApplicationType = type,
Architecture = arch,
HostingModel = hostingModel,
Skip = skipAncm,
});
}
}

Expand Down
1 change: 0 additions & 1 deletion src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<KnownFrameworkReference
Update="Microsoft.AspNetCore.App"
TargetFramework="${DefaultNetCoreTargetFramework}"
Copy link
Member

@wtgodbe wtgodbe Oct 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC @dougbu @JunTaoLuo - I'd like to find a better workaround than this once the preview1 builds are done - adding a condition like the following:

Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'"

Gave the following msbuild error:

error MSB4191: The reference to custom metadata "TargetFramework" at position 1 is not allowed in this condition "'%(TargetFramework)' == 'netcoreapp3.1'".

Whereas keeping the TFM update caused an error due to duplicate entires for Microsoft.AspNetCore.App in KnownFrameworkReference

Copy link
Contributor

@dougbu dougbu Oct 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably needed to be %(KnownFrameworkReference.TargetFramework). Try that when you have a chance.

Copy link
Member

@wtgodbe wtgodbe Oct 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had that in an earlier commit with the same result: 784f4d5

DefaultRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
LatestRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
TargetingPackVersion="${MicrosoftAspNetCoreAppRefPackageVersion}"
Expand Down
5 changes: 3 additions & 2 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/FixtureLoggedTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Reflection;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging.Testing;
using Xunit.Abstractions;

Expand All @@ -16,9 +17,9 @@ public FixtureLoggedTest(IISTestSiteFixture fixture)
_fixture = fixture;
}

public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
{
base.Initialize(methodInfo, testMethodArguments, testOutputHelper);
base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
_fixture.Attach(this);
}

Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging.Testing;
using Xunit;

Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging.Testing;
using Xunit;

Expand Down
6 changes: 3 additions & 3 deletions src/Servers/Kestrel/shared/test/TestApplicationErrorLoggerLoggedTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Reflection;
Expand All @@ -11,9 +11,9 @@ public class TestApplicationErrorLoggerLoggedTest : LoggedTest
{
public TestApplicationErrorLogger TestApplicationErrorLogger { get; private set; }

public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
{
base.Initialize(methodInfo, testMethodArguments, testOutputHelper);
base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);

TestApplicationErrorLogger = new TestApplicationErrorLogger();
LoggerFactory.AddProvider(new KestrelTestLoggerProvider(TestApplicationErrorLogger));
Expand Down
1 change: 1 addition & 0 deletions src/Servers/Kestrel/test/BindTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing;

Expand Down
1 change: 1 addition & 0 deletions src/Servers/Kestrel/test/FunctionalTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing;
#if MACOS
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ public Http2TestBase()
};
}

public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
{
base.Initialize(methodInfo, testMethodArguments, testOutputHelper);
base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);

_serviceContext = new TestServiceContext(LoggerFactory, _mockKestrelTrace.Object)
{
Expand Down
1 change: 1 addition & 0 deletions src/Servers/Kestrel/test/InMemory.FunctionalTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Runtime.CompilerServices;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing;

Expand Down
1 change: 1 addition & 0 deletions src/Servers/Kestrel/test/Interop.FunctionalTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing;

Expand Down