Skip to content

Add nullable annotations in WebRequestSession.cs #19291

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
iSazonov merged 1 commit into from
Mar 16, 2023
Merged

Add nullable annotations in WebRequestSession.cs #19291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

#nullable enable

using System;
using System.Collections.Generic;
using System.Net;
Expand All @@ -16,12 +18,14 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
public class WebRequestSession : IDisposable
{
private HttpClient _client;
#region Fields

private HttpClient? _client;
private CookieContainer _cookies;
private bool _useDefaultCredentials;
private ICredentials _credentials;
private X509CertificateCollection _certificates;
private IWebProxy _proxy;
private ICredentials? _credentials;
private X509CertificateCollection? _certificates;
private IWebProxy? _proxy;
private int _maximumRedirection;
private WebSslProtocol _sslProtocol;
private bool _allowAutoRedirect;
Expand All @@ -35,6 +39,8 @@ public class WebRequestSession : IDisposable
/// </summary>
private bool _disposedClient;

#endregion Fields

/// <summary>
/// Gets or sets the Header property.
/// </summary>
Expand All @@ -61,15 +67,15 @@ public class WebRequestSession : IDisposable
/// <summary>
/// Gets or sets the Credentials property.
/// </summary>
public ICredentials Credentials { get => _credentials; set => SetClassVar(ref _credentials, value); }
public ICredentials? Credentials { get => _credentials; set => SetClassVar(ref _credentials, value); }

/// <summary>
/// Gets or sets the Certificates property.
/// </summary>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public X509CertificateCollection Certificates { get => _certificates; set => SetClassVar(ref _certificates, value); }
public X509CertificateCollection? Certificates { get => _certificates; set => SetClassVar(ref _certificates, value); }

#endregion
#endregion Credentials

/// <summary>
/// Gets or sets the UserAgent property.
Expand All @@ -79,7 +85,7 @@ public class WebRequestSession : IDisposable
/// <summary>
/// Gets or sets the Proxy property.
/// </summary>
public IWebProxy Proxy
public IWebProxy? Proxy
{
get => _proxy;
set
Expand Down Expand Up @@ -238,7 +244,7 @@ private HttpClient CreateHttpClient()
};
}

private void SetClassVar<T>(ref T oldValue, T newValue) where T : class
private void SetClassVar<T>(ref T oldValue, T newValue) where T : class?
{
if (oldValue != newValue)
{
Expand Down