Skip to content

[automated] Merge branch 'release/5.0.2xx' => 'master' #14871

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

Merged
Merged
Show file tree
Hide file tree
Changes from 90 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
a6e6be1
Pass Optimize to CoreGenerateSatelliteAssemblies
rainersigwald Sep 14, 2020
aef4bb9
add the fsharp.core xml docs to the set of files to be published
baronfel Sep 16, 2020
18f89e1
Merge pull request #13654 from baronfel/add-fsharp-core-docs
marcpopMSFT Nov 4, 2020
90de9e2
Require IsSdkProject to be set
dsplaisted Nov 5, 2020
b6213fe
Fix for #14021
marcpopMSFT Nov 7, 2020
8604ff7
Updated to OperationSystem.IsWindows and co (per #12825). I did not i…
marcpopMSFT Nov 9, 2020
dea15ae
[release/5.0.2xx] Update dependencies from dotnet/windowsdesktop (#14…
dotnet-maestro[bot] Nov 10, 2020
c5ff729
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 10, 2020
c510225
Update dependencies from https://github.com/dotnet/arcade build 20201…
dotnet-maestro[bot] Nov 10, 2020
fa6f472
Default TestProject.IsSdkProject to true
dsplaisted Nov 10, 2020
a9648cd
[release/5.0.2xx] Update dependencies from dotnet/windowsdesktop (#14…
dotnet-maestro[bot] Nov 10, 2020
b2dd88e
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 10, 2020
82bd726
[release/5.0.2xx] Update dependencies from nuget/nuget.client (#14433)
dotnet-maestro[bot] Nov 11, 2020
803abf7
[release/5.0.2xx] Update dependencies from dotnet/windowsdesktop (#14…
dotnet-maestro[bot] Nov 11, 2020
5ec46a1
Merge pull request #14434 from dsplaisted/testproject-default-sdkstyle
dsplaisted Nov 11, 2020
49cc28a
[release/5.0.2xx] Update dependencies from dotnet/windowsdesktop (#14…
dotnet-maestro[bot] Nov 11, 2020
1c409cd
Merge pull request #14449 from dotnet/marcpopMSFT-coreerrorstring
marcpopMSFT Nov 11, 2020
2a6c0eb
Merge pull request #13579 from rainersigwald/optimize-satellites
marcpopMSFT Nov 11, 2020
76a633d
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 12, 2020
b52fe23
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 13, 2020
604e026
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 14, 2020
a17af99
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 17, 2020
1f55266
Fixup 5.0.0 Package shas to be 5.0 RTM (#14585)
mmitche Nov 17, 2020
b3eebe8
[release/5.0.2xx] Update dependencies from dotnet/runtime (#14566)
dotnet-maestro[bot] Nov 18, 2020
13fceb6
[release/5.0.2xx] Update dependencies from dotnet/runtime (#14599)
dotnet-maestro[bot] Nov 18, 2020
d1efaca
Merge pull request #14459 from dotnet/marcpopMSFT-OSchecks
Nov 19, 2020
be6fe0f
[release/5.0.2xx] Update dependencies from dotnet/runtime (#14608)
dotnet-maestro[bot] Nov 19, 2020
8030b94
Update dependencies from https://github.com/NuGet/NuGet.Client build …
dotnet-maestro[bot] Nov 19, 2020
ef5595a
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 21, 2020
8ed1c57
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
48dfe7a
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
fe0b178
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
ebd9a54
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
2c4da91
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
e991b71
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
f9e3e8c
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
2f2f052
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
d222b19
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
f9f35a8
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
6846bc0
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
64cdb84
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
87524e1
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
fe59390
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
276b035
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
f19cfaa
[release/5.0.2xx] Update dependencies from dotnet/windowsdesktop (#14…
dotnet-maestro[bot] Nov 23, 2020
227d9b5
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 23, 2020
28188de
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 24, 2020
de8ccfd
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 24, 2020
a4b8cb9
Merge pull request #14670 from dotnet/darc-release/5.0.2xx-d4f6c3a2-b…
v-wuzhai Nov 24, 2020
a2a4cee
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 25, 2020
f20af47
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 25, 2020
d7ffd41
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 25, 2020
de36002
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 25, 2020
ca668ee
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 25, 2020
41fd0e4
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 25, 2020
5b180d9
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 25, 2020
bc80e63
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 26, 2020
f28579c
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Nov 26, 2020
8b6293b
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 26, 2020
37c8da3
[release/5.0.2xx] Update dependencies from dotnet/roslyn (#14680)
dotnet-maestro[bot] Nov 26, 2020
a767a91
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 26, 2020
517a015
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Nov 26, 2020
e9fe2ab
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 26, 2020
d754b7b
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 26, 2020
d39246b
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Nov 30, 2020
cc080f3
Default 'AnalysisLevel' if 'AnalysisMode' has been set
mavasani Nov 30, 2020
e5033ed
[release/5.0.2xx] Update dependencies from microsoft/vstest (#14764)
dotnet-maestro[bot] Nov 30, 2020
0059b6a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 30, 2020
dfc2b05
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 1, 2020
0bd26be
Add transitive framework reference attribute
nkolev92 Nov 21, 2020
98d062e
[release/5.0.2xx] Revert back to 5.0.0 versions (#14797)
mmitche Dec 2, 2020
e2669aa
Pin AssemblyVersion templatelocator (#14802)
Dec 2, 2020
c9c2c1a
Update dependencies from https://github.com/dotnet/roslyn build 20201…
dotnet-maestro[bot] Dec 2, 2020
c1f44b1
Adding OR_GREATER preprocessor symbols
sfoslund Dec 1, 2020
6cac00c
PR feedback
sfoslund Dec 2, 2020
8f6c7c1
Merge pull request #14647 from nkolev92/dev-nkolev92-addTransitiveFra…
dsplaisted Dec 2, 2020
ad3e461
Merge pull request #14767 from dotnet/mavasani-patch-1
mavasani Dec 2, 2020
3fbac9a
Update stage 0
dsplaisted Dec 3, 2020
26b1a0f
Read current runtime identifiers for workload resolver
dsplaisted Dec 3, 2020
89ef7df
Handle missing runtime identifier chain file in workload resolver
dsplaisted Dec 3, 2020
558946e
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Dec 3, 2020
ac4c63f
Merge pull request #14798 from sfoslund/PreprocessorSymbols
sfoslund Dec 3, 2020
202bdb9
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Dec 3, 2020
a7aa61a
Allow inferring ARM64 PlatformTarget from RID
AntonLapounov Nov 25, 2020
e42c825
Update the test
AntonLapounov Dec 4, 2020
43bb21d
Merge pull request #14820 from dsplaisted/workload-resolver-runtimeid…
dsplaisted Dec 4, 2020
4438039
Merge pull request #14726 from AntonLapounov/SupportArm64PlatformTarget
dsplaisted Dec 4, 2020
5fe72f1
Update dependencies from https://github.com/NuGet/NuGet.Client build …
dotnet-maestro[bot] Dec 7, 2020
9460e96
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 7, 2020
31b6d53
Merge branch 'release/5.0.2xx'
Dec 8, 2020
9ab9905
Removing unneeded line from merge
sfoslund Dec 8, 2020
2d10b7b
Update stage 0 and add deleted line back
dsplaisted Dec 14, 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
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ffd1dec60e045e3262061b3cc5974aa789eecb25</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.BlazorWebAssembly" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.NET.Sdk.BlazorWebAssembly" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.9.0-preview.2.6979">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
Expand Down Expand Up @@ -142,49 +142,49 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>a01646858786ed635874b44be08abd85c5993b21</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="dotnet-dev-certs" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="dotnet-user-secrets" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="dotnet-watch" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.0-alpha.1.20607.7">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.0-alpha.1.20607.8">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3017502573bafe48e07dfc658a9752deb0fc7e29</Sha>
<Sha>9cfb13398c3296f51114a4b9eb01d69b93b5195c</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="3.1.0" Pinned="true">
<Uri>https://github.com/aspnet/xdt</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETSdkBlazorWebAssemblyPackageVersion>6.0.0-alpha.1.20607.7</MicrosoftNETSdkBlazorWebAssemblyPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETSdkBlazorWebAssemblyPackageVersion>6.0.0-alpha.1.20607.8</MicrosoftNETSdkBlazorWebAssemblyPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static string WindowsNonExpandedToolsShimPath
public static string ToolsResolverCachePath => Path.Combine(DotnetUserProfileFolderPath, ToolsResolverCacheFolderName);

public static string PlatformHomeVariableName =>
RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "USERPROFILE" : "HOME";
OperatingSystem.IsWindows() ? "USERPROFILE" : "HOME";

public static string DotnetHomePath
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils;

Expand All @@ -20,7 +21,7 @@ public static CompositeCommandResolver Create()
var publishedPathCommandSpecFactory = new PublishPathCommandSpecFactory();

var platformCommandSpecFactory = default(IPlatformCommandSpecFactory);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
platformCommandSpecFactory = new WindowsExePreferredCommandSpecFactory();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils;

Expand All @@ -18,7 +19,7 @@ public static CompositeCommandResolver Create()
var environment = new EnvironmentProvider();

var platformCommandSpecFactory = default(IPlatformCommandSpecFactory);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
platformCommandSpecFactory = new WindowsExePreferredCommandSpecFactory();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils;

Expand All @@ -13,7 +14,7 @@ public static CompositeCommandResolver Create()
var environment = new EnvironmentProvider();

var platformCommandSpecFactory = default(IPlatformCommandSpecFactory);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
platformCommandSpecFactory = new WindowsExePreferredCommandSpecFactory();
}
Expand Down
3 changes: 2 additions & 1 deletion src/Cli/dotnet/FilePermissionSetter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils;

Expand All @@ -10,7 +11,7 @@ internal class FilePermissionSetter : IFilePermissionSetter
{
public void SetUserExecutionPermission(string path)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/MulticoreJitProfilePathCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private void CalculateProfileRootPath()

private string GetRuntimeDataRootPathString()
{
return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
return OperatingSystem.IsWindows()
? GetWindowsRuntimeDataRoot()
: GetNonWindowsRuntimeDataRoot();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ private static void ConfigureDotNetForFirstTimeUse(

dotnetConfigurer.Configure();

if (isDotnetBeingInvokedFromNativeInstaller && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (isDotnetBeingInvokedFromNativeInstaller && OperatingSystem.IsWindows())
{
DotDefaultPathCorrector.Correct();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/ShellShim/AppHostShimMaker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public AppHostShellShimMaker(string appHostSourceDirectory = null, IFilePermissi
public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)
{
string appHostSourcePath;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
appHostSourcePath = Path.Combine(_appHostSourceDirectory, ApphostNameWithoutExtension + ".exe");
}
Expand Down
10 changes: 5 additions & 5 deletions src/Cli/dotnet/ShellShim/EnvironmentPathFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static IEnvironmentPath CreateEnvironmentPath(
}

IEnvironmentPath environmentPath = new DoNothingEnvironmentPath();
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
if (isDotnetBeingInvokedFromNativeInstaller)
{
Expand All @@ -40,15 +40,15 @@ public static IEnvironmentPath CreateEnvironmentPath(
Reporter.Output);
}
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && isDotnetBeingInvokedFromNativeInstaller)
else if (OperatingSystem.IsLinux() && isDotnetBeingInvokedFromNativeInstaller)
{
environmentPath = new LinuxEnvironmentPath(
CliFolderPathCalculator.ToolsShimPathInUnix,
Reporter.Output,
environmentProvider,
new FileWrapper());
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && isDotnetBeingInvokedFromNativeInstaller)
else if (OperatingSystem.IsMacOS() && isDotnetBeingInvokedFromNativeInstaller)
{
environmentPath = new OsxBashEnvironmentPath(
executablePath: CliFolderPathCalculator.ToolsShimPathInUnix,
Expand All @@ -68,15 +68,15 @@ public static IEnvironmentPathInstruction CreateEnvironmentPathInstruction(
environmentProvider = new EnvironmentProvider();
}

if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && ZshDetector.IsZshTheUsersShell(environmentProvider))
if (OperatingSystem.IsMacOS() && ZshDetector.IsZshTheUsersShell(environmentProvider))
{
return new OsxZshEnvironmentPathInstruction(
executablePath: CliFolderPathCalculator.ToolsShimPathInUnix,
reporter: Reporter.Output,
environmentProvider: environmentProvider);
}

if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
return new WindowsEnvironmentPath(
CliFolderPathCalculator.ToolsShimPath,
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/ShellShim/ShellShimRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private IEnumerable<FilePath> GetShimFiles(ToolCommandName commandName)

private FilePath GetShimPath(ToolCommandName commandName)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
return _shimsDirectory.WithFile(commandName.Value + ".exe");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Security;
Expand All @@ -12,7 +13,7 @@ internal class DockerContainerDetectorForTelemetry : IDockerContainerDetector
{
public IsDockerContainer IsDockerContainer()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
try
{
Expand All @@ -29,13 +30,13 @@ public IsDockerContainer IsDockerContainer()
return Cli.Telemetry.IsDockerContainer.Unknown;
}
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
else if (OperatingSystem.IsLinux())
{
return ReadProcToDetectDockerInLinux()
? Cli.Telemetry.IsDockerContainer.True
: Cli.Telemetry.IsDockerContainer.False;
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
else if (OperatingSystem.IsMacOS())
{
return Cli.Telemetry.IsDockerContainer.False;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ internal static class ExternalTelemetryProperties
/// </summary>
internal static string GetInstallationType()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (!OperatingSystem.IsWindows())
{
return "";
}
Expand Down Expand Up @@ -52,7 +52,7 @@ internal static string GetInstallationType()
/// </summary>
internal static string GetProductType()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (!OperatingSystem.IsWindows())
{
return "";
}
Expand Down Expand Up @@ -86,7 +86,7 @@ internal static string GetProductType()
/// </summary>
internal static string GetLibcRelease()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
return "";
}
Expand All @@ -110,7 +110,7 @@ internal static string GetLibcRelease()
/// </summary>
internal static string GetLibcVersion()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
return "";
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/Telemetry/MacAddressGetter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private static string GetIpCommandOutput()

private static string GetShellOutMacAddressOutput()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
var result = new ProcessStartInfo
{
Expand Down
4 changes: 2 additions & 2 deletions src/Cli/dotnet/commands/dotnet-help/HelpCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ public static void PrintVersionHeader()
public static Process ConfigureProcess(string docUrl)
{
ProcessStartInfo psInfo;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
psInfo = new ProcessStartInfo
{
FileName = "cmd",
Arguments = $"/c start {docUrl}"
};
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
else if (OperatingSystem.IsMacOS())
{
psInfo = new ProcessStartInfo
{
Expand Down
1 change: 1 addition & 0 deletions src/Layout/redist/targets/OverlaySdkOnLKG.targets
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<OverlaySDK Include="$(_DotNetHiveRoot)/**/*" Exclude="$(_DotNetHiveRoot)sdk/**/*"/>
<OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledCliTools.props" />
<OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/RuntimeIdentifierGraph.json" />
<OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/NETCoreSdkRuntimeIdentifierChain.txt" />
<OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/DotnetTools/**/*" RelativeDestination="DotnetTools"/>
<OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/AppHostTemplate/**/*" RelativeDestination="AppHostTemplate"/>
<ToolsetToOverlay Include="$(OutputPath)/**/*" />
Expand Down
Loading