Skip to content

Annotate System.Net.Http for nullable #33268

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
merged 17 commits into from
Mar 17, 2020
Merged

Annotate System.Net.Http for nullable #33268

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d63ba3d
Annotate System.Net.Http for nullable
buyaa-n Mar 4, 2020
9f41541
Remainder annotations and ref assembly annotation
buyaa-n Mar 6, 2020
269d682
Merge conflict
buyaa-n Mar 6, 2020
53efe81
Adding some #nullable enable
buyaa-n Mar 6, 2020
0f45a9b
Apply feedback
buyaa-n Mar 6, 2020
03281b5
Linix OSX build fix, review udpate
buyaa-n Mar 9, 2020
859cd61
Ignore annotations for System.Net.Http.WinHttpHandler
buyaa-n Mar 9, 2020
f937c89
Merging conflict
buyaa-n Mar 9, 2020
b163a82
Ignore annotations for Common.Tests.csproj
buyaa-n Mar 9, 2020
a806d5d
Ignore annotations for System.Net.Http.WinHttpHandler.Unit.Tests.csproj
buyaa-n Mar 9, 2020
34288f5
Merge branch 'master' of https://github.com/dotnet/runtime into net_http
buyaa-n Mar 9, 2020
75177b8
Applying feedback
buyaa-n Mar 11, 2020
57f58e9
Merging conflict
buyaa-n Mar 12, 2020
ef0e8fb
Address review comment, fix unit test build
buyaa-n Mar 12, 2020
9209320
Address feedback
buyaa-n Mar 14, 2020
52c2205
Merge branch 'master' of https://github.com/dotnet/runtime into net_http
buyaa-n Mar 16, 2020
9f5416e
Add #nullable enable for files refeerenced from AspNetCore
buyaa-n Mar 16, 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
2 changes: 1 addition & 1 deletion src/libraries/Common/src/System/Net/Http/WinInetProxyHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public bool GetProxyForUrl(
{
_autoDetectionFailed = false;
if (Interop.WinHttp.WinHttpGetProxyForUrl(
sessionHandle,
sessionHandle!,
uri.AbsoluteUri,
ref autoProxyOptions,
out proxyInfo))
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/ref/System.Net.Http.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ public partial class TransferCodingHeaderValue : System.ICloneable
protected TransferCodingHeaderValue(System.Net.Http.Headers.TransferCodingHeaderValue source) { }
public TransferCodingHeaderValue(string value) { }
public System.Collections.Generic.ICollection<System.Net.Http.Headers.NameValueHeaderValue> Parameters { get { throw null; } }
public string? Value { get { throw null; } }
public string Value { get { throw null; } }
public override bool Equals(object? obj) { throw null; }
public override int GetHashCode() { throw null; }
public static System.Net.Http.Headers.TransferCodingHeaderValue Parse(string? input) { throw null; }
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/src/System.Net.Http.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NoWarn>$(NoWarn);0436;CS1573</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);HTTP_DLL</DefineConstants>
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' ">
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Net.Http/src/System/Net/Http/Headers/TransferCodingHeaderValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public class TransferCodingHeaderValue : ICloneable
{
// Use ObjectCollection<T> since we may have multiple parameters with the same name.
private ObjectCollection<NameValueHeaderValue>? _parameters;
private string? _value;
private string _value = null!; // empty constructor only used internally and value set with non null

public string? Value
public string Value
{
get { return _value; }
}
Expand Down Expand Up @@ -154,7 +154,7 @@ public override bool Equals(object? obj)
public override int GetHashCode()
{
// The value string is case-insensitive.
return StringComparer.OrdinalIgnoreCase.GetHashCode(_value!) ^ NameValueHeaderValue.GetHashCode(_parameters);
return StringComparer.OrdinalIgnoreCase.GetHashCode(_value) ^ NameValueHeaderValue.GetHashCode(_parameters);
}

// Implement ICloneable explicitly to allow derived types to "override" the implementation.
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS</TargetFrameworks>
<Nullable>annotations</Nullable>
</PropertyGroup>
<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
Expand Down