[release/5.0.1xx-preview4] Update dependencies from dotnet/sdk (#7266)

* Update dependencies from https://github.com/dotnet/sdk build 20200423.3 - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.3 - Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.3 * Update dependencies from https://github.com/dotnet/sdk build 20200423.5 - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.5 - Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.5 * Switch to using RuntimeInformation APIs instead of deprecated PlatformAbstractions See dotnet/sdk#11076 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
dotnet · Apr 23, 2020 · 97c6ec0 · 97c6ec0
1 parent b139e17
commit 97c6ec0
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 17 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -79,13 +79,13 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>bb2aad9a623680ecefd731784c97fcbf9e908730</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.4.20217.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.4.20223.5">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>af10fe4cb05c7b90e2d0b0293dba769b54f396ad</Sha>
+      <Sha>6fa49e835e87a89231e9193ec51fc7acbbb939af</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.4.20217.1">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.4.20223.5">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>af10fe4cb05c7b90e2d0b0293dba769b54f396ad</Sha>
+      <Sha>6fa49e835e87a89231e9193ec51fc7acbbb939af</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.4.20222.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -49,8 +49,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.100-preview.4.20217.1</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.4.20217.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.100-preview.4.20223.5</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.4.20223.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";
             }