Skip to content

Commit

Permalink
Address PR changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@bgavrilMS
bgavrilMS committed Dec 10, 2024
1 parent 3f67d73 commit 1bbbc83
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/Microsoft.Identity.Web.Diagnostics/IdHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Reflection;
using System.Text.RegularExpressions;

namespace Microsoft.Identity.Web.Diagnostics
namespace Microsoft.Identity.Web
{
internal static class IdHelper

Check failure on line 11 in src/Microsoft.Identity.Web.Diagnostics/IdHelper.cs

View workflow job for this annotation

GitHub Actions / Build and run unit tests

{
Expand Down Expand Up @@ -36,14 +36,14 @@ internal static class IdHelper
return version[1];
});

public static string GetIdWebVersion()
internal static string GetIdWebVersion()

Check failure on line 39 in src/Microsoft.Identity.Web.Diagnostics/IdHelper.cs

View workflow job for this annotation

GitHub Actions / Build and run unit tests

{
return s_idWebVersion.Value;
}

public static string CreateTelemetryInfo()
internal static string CreateTelemetryInfo()

Check failure on line 44 in src/Microsoft.Identity.Web.Diagnostics/IdHelper.cs

View workflow job for this annotation

GitHub Actions / Build and run unit tests

{
return string.Format(CultureInfo.InvariantCulture, IDWebSku + GetIdWebVersion());
return string.Format(CultureInfo.InvariantCulture, IDWebSku + s_idWebVersion.Value);
}
}
}
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net462/InternalAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Microsoft.Identity.Web.Diagnostics.OsHelper
Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
Microsoft.Identity.Web.Throws
Microsoft.Identity.Web.Diagnostics.IdHelper
Microsoft.Identity.Web.IdHelper
static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net472/InternalAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Microsoft.Identity.Web.Diagnostics.OsHelper
Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
Microsoft.Identity.Web.Throws
Microsoft.Identity.Web.Diagnostics.IdHelper
Microsoft.Identity.Web.IdHelper
static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net6.0/InternalAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Microsoft.Identity.Web.Diagnostics.OsHelper
Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
Microsoft.Identity.Web.Throws
Microsoft.Identity.Web.Diagnostics.IdHelper
Microsoft.Identity.Web.IdHelper
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
Expand All @@ -23,3 +25,7 @@ static Microsoft.Identity.Web.Throws.IfNullOrWhitespace(string? argument, string
static Microsoft.Identity.Web.Throws.IfOutOfRange<T>(T argument, string! paramName = "") -> T
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message, System.Exception? innerException) -> void
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message) -> void
static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net7.0/InternalAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Microsoft.Identity.Web.Diagnostics.OsHelper
Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
Microsoft.Identity.Web.Throws
Microsoft.Identity.Web.Diagnostics.IdHelper
Microsoft.Identity.Web.IdHelper
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
Expand All @@ -23,3 +25,7 @@ static Microsoft.Identity.Web.Throws.IfNullOrWhitespace(string? argument, string
static Microsoft.Identity.Web.Throws.IfOutOfRange<T>(T argument, string! paramName = "") -> T
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message, System.Exception? innerException) -> void
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message) -> void
static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net8.0/InternalAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Microsoft.Identity.Web.Diagnostics.OsHelper
Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
Microsoft.Identity.Web.Throws
Microsoft.Identity.Web.Diagnostics.IdHelper
Microsoft.Identity.Web.IdHelper
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
Expand All @@ -23,3 +25,7 @@ static Microsoft.Identity.Web.Throws.IfNullOrWhitespace(string? argument, string
static Microsoft.Identity.Web.Throws.IfOutOfRange<T>(T argument, string! paramName = "") -> T
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message, System.Exception? innerException) -> void
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message) -> void
static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Web.Diagnostics/PublicAPI/net9.0/InternalAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Microsoft.Identity.Web.Diagnostics.OsHelper
Microsoft.Identity.Web.Diagnostics.OsHelper.OsHelper() -> void
Microsoft.Identity.Web.Throws
Microsoft.Identity.Web.Diagnostics.IdHelper
Microsoft.Identity.Web.IdHelper
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsLinuxPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsMacPlatform() -> bool
static Microsoft.Identity.Web.Diagnostics.OsHelper.IsWindowsPlatform() -> bool
Expand All @@ -23,3 +25,7 @@ static Microsoft.Identity.Web.Throws.IfNullOrWhitespace(string? argument, string
static Microsoft.Identity.Web.Throws.IfOutOfRange<T>(T argument, string! paramName = "") -> T
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message, System.Exception? innerException) -> void
static Microsoft.Identity.Web.Throws.InvalidOperationException(string! message) -> void
static Microsoft.Identity.Web.Diagnostics.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.Diagnostics.IdHelper.GetIdWebVersion() -> string!
static Microsoft.Identity.Web.IdHelper.CreateTelemetryInfo() -> string!
static Microsoft.Identity.Web.IdHelper.GetIdWebVersion() -> string!
2 changes: 1 addition & 1 deletion src/Microsoft.Identity.Web.DownstreamApi/DownstreamApi.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ public Task<HttpResponseMessage> CallApiForAppAsync(

internal /* for test */ static Dictionary<string, string> CallerSDKDetails { get; } = new()
{
{ "caller-sdk-id", "1" }, // 1 = Downstream API SDK ID
{ "caller-sdk-id", "IdWeb_1" },
{ "caller-sdk-ver", IdHelper.GetIdWebVersion() }
};

Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Identity.Web.OWIN/AppBuilderExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
using Microsoft.Owin.Security.Jwt;
using Microsoft.Owin.Security.OAuth;
using Microsoft.Owin.Security.OpenIdConnect;
using Microsoft.Identity.Web.Diagnostics;
using Owin;

namespace Microsoft.Identity.Web
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Identity.Web.TokenAcquisition/MsalAspNetCoreHttpClientFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Net.Http;
using Microsoft.Identity.Client;
using Microsoft.Identity.Web.Diagnostics;

namespace Microsoft.Identity.Web
{
Expand Down
1 change: 0 additions & 1 deletion ...t.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using System.Linq;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Identity.Web.Diagnostics;

namespace Microsoft.Identity.Web
{
Expand Down

0 comments on commit 1bbbc83

Please sign in to comment.