Skip to content
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

[master] Update dependencies from dotnet/efcore dotnet/runtime #25399

Merged
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e6cb396
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 29, 2020
65d164a
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 29, 2020
708ed48
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 30, 2020
401c978
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 30, 2020
41d3f32
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 31, 2020
9789610
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 31, 2020
87f097d
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 31, 2020
2c10e88
Updating usage of IgnoreNullValues
sebastienros Sep 1, 2020
15921b3
Updating usage of IgnoreNullValues
sebastienros Sep 1, 2020
523dd46
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 1, 2020
44854da
Disabling WebRequest.Create warnings
sebastienros Sep 1, 2020
74eefc3
Disabling WebRequest.Create warnings
sebastienros Sep 1, 2020
139b328
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 1, 2020
cefbc62
Merge branch 'master' into darc-master-3b4656f0-1eb1-4628-b310-b71a2b…
sebastienros Sep 1, 2020
f0a89ed
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 2, 2020
520b9e2
System.IO.Pipelines Fix
TanayParikh Sep 2, 2020
19c29d4
CS0618 Disable
TanayParikh Sep 2, 2020
fb37d9b
SYSLIB0014 Disable
TanayParikh Sep 2, 2020
acdd994
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 3, 2020
20f4a9b
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 3, 2020
c3994ea
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 4, 2020
3a908e6
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 4, 2020
181c7fc
Skip reference check of System.IO.Pipelines ref/ assembly
dougbu Sep 5, 2020
39b3762
Merge branch 'master' into darc-master-3b4656f0-1eb1-4628-b310-b71a2b…
dougbu Sep 5, 2020
ba24e69
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 5, 2020
12898ec
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 7, 2020
3c0cfcf
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 7, 2020
86a328e
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 8, 2020
3f947e1
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 8, 2020
846e18b
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 9, 2020
d7a6730
Add incremental build and project references to java projects (#25707)
BrennanConroy Sep 8, 2020
73c1617
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 9, 2020
d60868b
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 10, 2020
7779bbb
Merge remote-tracking branch 'origin/master' into darc-master-3b4656f…
captainsafia Sep 10, 2020
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
1 change: 1 addition & 0 deletions eng/SharedFramework.External.props
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
<ExternalAspNetCoreAppReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
<ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />

<!--
Expand Down
296 changes: 148 additions & 148 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions eng/Versions.props

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<Reference Include="Microsoft.AspNetCore.Components.Forms" />
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.JSInterop" />
<Reference Include="System.IO.Pipelines" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Components/WebAssembly/Server/src/TargetPickerUi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Net.Http;
using System.Runtime.InteropServices;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;

Expand All @@ -20,7 +21,7 @@ public class TargetPickerUi
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
PropertyNameCaseInsensitive = true,
IgnoreNullValues = true
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
};

private string _browserHost;
Expand Down
2 changes: 2 additions & 0 deletions src/Framework/test/TestData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ static TestData()
"Microsoft.Win32.SystemEvents",
"System.Diagnostics.EventLog",
"System.Drawing.Common",
"System.IO.Pipelines",
"System.Security.Cryptography.Pkcs",
"System.Security.Cryptography.Xml",
"System.Security.Permissions",
Expand Down Expand Up @@ -274,6 +275,7 @@ static TestData()
{ "Microsoft.Net.Http.Headers", "5.0.0.0" },
{ "Microsoft.Win32.Registry", "5.0.0.0" },
{ "System.Diagnostics.EventLog", "5.0.0.0" },
{ "System.IO.Pipelines", "5.0.0.0" },
{ "System.Security.AccessControl", "5.0.0.0" },
{ "System.Security.Cryptography.Cng", "5.0.0.0" },
{ "System.Security.Cryptography.Xml", "5.0.0.0" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
</ItemGroup>

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
<!-- Dependency (now in shared Fx) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
<SuppressBaselineReference Include="System.IO.Pipelines" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,7 @@

<ItemGroup>
<Reference Include="Microsoft.Extensions.Primitives" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'">
<Reference Include="System.IO.Pipelines" />
</ItemGroup>

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">
<!-- Dependency (now in shared Fx) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
<SuppressBaselineReference Include="System.IO.Pipelines" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<ItemGroup>
<Reference Include="Microsoft.Net.Http.Headers" />
<Reference Include="System.IO.Pipelines" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '5.0' ">
<!--
Dependency (now in shared Fx and a transitive ref for netstandard2.x) was removed in 5.0. Suppression can be
Dependency (a transitive reference) was removed in 5.0. Suppression can be
removed after 5.0 RTM is released.
-->
<SuppressBaselineReference Include="System.IO.Pipelines" />
Expand Down
10 changes: 7 additions & 3 deletions src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ public async Task ResponseHeaders_ServerSendsSingleValueKnownHeaders_Success()
return Task.FromResult(0);
}))
{
// HttpClient would merge the headers no matter what

#pragma warning disable SYSLIB0014 // HttpClient would merge the headers no matter what
WebRequest request = WebRequest.Create(address);
#pragma warning restore SYSLIB0014
HttpWebResponse response = (HttpWebResponse)await request.GetResponseAsync();
Assert.Equal(4, response.Headers.Count);
Assert.Null(response.Headers["Transfer-Encoding"]);
Expand All @@ -73,8 +75,9 @@ public async Task ResponseHeaders_ServerSendsMultiValueKnownHeaders_Success()
return Task.FromResult(0);
}))
{
// HttpClient would merge the headers no matter what
#pragma warning disable SYSLIB0014 // HttpClient would merge the headers no matter what
WebRequest request = WebRequest.Create(address);
#pragma warning restore SYSLIB0014
HttpWebResponse response = (HttpWebResponse)await request.GetResponseAsync();
Assert.Equal(4, response.Headers.Count);
Assert.Null(response.Headers["Transfer-Encoding"]);
Expand All @@ -97,8 +100,9 @@ public async Task ResponseHeaders_ServerSendsCustomHeaders_Success()
return Task.FromResult(0);
}))
{
// HttpClient would merge the headers no matter what
#pragma warning disable SYSLIB0014 // HttpClient would merge the headers no matter what
WebRequest request = WebRequest.Create(address);
#pragma warning restore SYSLIB0014
HttpWebResponse response = (HttpWebResponse)await request.GetResponseAsync();
Assert.Equal(4, response.Headers.Count);
Assert.Null(response.Headers["Transfer-Encoding"]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<Reference Include="Microsoft.AspNetCore.HttpOverrides" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace Microsoft.AspNetCore.Components
{
Expand All @@ -15,7 +16,7 @@ internal static class ServerComponentSerializationSettings
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
PropertyNameCaseInsensitive = true,
IgnoreNullValues = true
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
};

// This setting is not configurable, but realistically we don't expect an app to take more than 30 seconds from when
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace Microsoft.AspNetCore.Components
{
Expand All @@ -13,7 +14,7 @@ internal static class WebAssemblyComponentSerializationSettings
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
PropertyNameCaseInsensitive = true,
IgnoreNullValues = true
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

<ItemGroup>
<Reference Include="FSharp.Core" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Reflection.Metadata" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
<Reference Include="System.Security.Cryptography.Cng" />
Expand Down