Skip to content

Commit b18320d

Browse files
authored
Merge branch 'dev' into po/TermsOfUseFix
2 parents 6607c07 + 712bbb2 commit b18320d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/Authentication/Authentication/Helpers/ContentHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private static bool CheckIsText(string contentType)
135135
|| CheckIsJson(contentType);
136136

137137
// Further content type analysis is available on Windows
138-
if (Platform.IsWindows && !isText)
138+
if (OperatingSystem.IsWindows() && !isText)
139139
{
140140
// Media types registered with Windows as having a perceived type of text, are text
141141
using (var contentTypeKey = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type\" + contentType))

src/Authentication/Authentication/Helpers/InvokeGraphRequestUserAgent.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ internal string PlatformName
5555
{
5656
get
5757
{
58-
if (Platform.IsWindows)
58+
if (OperatingSystem.IsWindows())
5959
{
6060
// only generate the windows user agent once
6161
if (_windowsUserAgent == null)
@@ -69,11 +69,11 @@ internal string PlatformName
6969

7070
return _windowsUserAgent;
7171
}
72-
else if (Platform.IsMacOS)
72+
else if (OperatingSystem.IsMacOS())
7373
{
7474
return "Macintosh";
7575
}
76-
else if (Platform.IsLinux)
76+
else if (OperatingSystem.IsLinux())
7777
{
7878
return "Linux";
7979
}

src/Authentication/Authentication/Microsoft.Graph.Authentication.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="5.6.0" />
2828
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="5.6.0" />
2929
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0" />
30-
<PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="6.0.4" />
3130
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
3231
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
3332
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />

0 commit comments

Comments
 (0)