diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fbeca4468f5a..127470da05ee 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,13 +79,13 @@
https://github.com/dotnet/templating
1b50638acb1defc7d7ccaba5b2a0f4b0c50c0b3d
-
+
https://github.com/dotnet/sdk
- af10fe4cb05c7b90e2d0b0293dba769b54f396ad
+ 6fa49e835e87a89231e9193ec51fc7acbbb939af
-
+
https://github.com/dotnet/sdk
- af10fe4cb05c7b90e2d0b0293dba769b54f396ad
+ 6fa49e835e87a89231e9193ec51fc7acbbb939af
diff --git a/eng/Versions.props b/eng/Versions.props
index 116545617e52..11a2562422d0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,8 +49,8 @@
- 5.0.100-preview.4.20217.1
- 5.0.100-preview.4.20217.1
+ 5.0.100-preview.4.20223.5
+ 5.0.100-preview.4.20223.5
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
diff --git a/global.json b/global.json
index c15eb04d9531..db00fc486c8c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "5.0.100-preview.1.20154.9",
+ "dotnet": "5.0.100-preview.4.20217.10",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimePackageVersion)"
diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
index f90f0b410502..297dfd1d56bf 100644
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
+using System.Runtime.InteropServices;
using System.Xml.Linq;
using FluentAssertions;
using Microsoft.DotNet.TestFramework;
@@ -20,7 +21,7 @@ internal void ItRollsForwardToTheLatestVersion(string packageName, string minorV
PackageName = packageName,
MinorVersion = minorVersion,
// Set RuntimeIdentifier to opt in to roll-forward behavior
- RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier()
+ RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier
};
var testInstance = testProjectCreator.Create();
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 8a88bbc085e8..b17b90b73289 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
+using System.Runtime.InteropServices;
using System.Xml.Linq;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.TestFramework;
@@ -127,7 +128,7 @@ private void TestTemplateBuild(string templateName, bool selfContained = false)
.Execute(newArgs)
.Should().Pass();
- var buildArgs = selfContained ? "" :$"-r {RuntimeEnvironment.GetRuntimeIdentifier()}";
+ var buildArgs = selfContained ? "" :$"-r {RuntimeInformation.RuntimeIdentifier}";
var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
new BuildCommand()
.WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs
index 78be9c8569f1..843d0668d87f 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs
@@ -1,7 +1,8 @@
// 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 Microsoft.DotNet.PlatformAbstractions;
+
+using System.Runtime.InteropServices;
using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities
@@ -10,7 +11,7 @@ public class UnixOnlyFactAttribute : FactAttribute
{
public UnixOnlyFactAttribute()
{
- if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Unix to run";
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs
index fe0557b88c8b..461ea7b36b6a 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs
@@ -1,7 +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 Microsoft.DotNet.PlatformAbstractions;
+using System.Runtime.InteropServices;
using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities
@@ -10,7 +10,7 @@ public class UnixOnlyTheoryAttribute : TheoryAttribute
{
public UnixOnlyTheoryAttribute()
{
- if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Unix to run";
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs
index 7f9abcccba91..079a1af90dd3 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs
@@ -1,7 +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 Microsoft.DotNet.PlatformAbstractions;
+using System.Runtime.InteropServices;
using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities
@@ -10,7 +10,7 @@ public class WindowsOnlyFactAttribute : FactAttribute
{
public WindowsOnlyFactAttribute()
{
- if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows)
+ if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Windows to run";
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs
index 8a663433f77c..98a0267b06d7 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs
@@ -1,7 +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 Microsoft.DotNet.PlatformAbstractions;
+using System.Runtime.InteropServices;
using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities
@@ -10,7 +10,7 @@ public class WindowsOnlyTheoryAttribute : TheoryAttribute
{
public WindowsOnlyTheoryAttribute()
{
- if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows)
+ if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Windows to run";
}