Ci updates (#1202)

* Azure: Try 3.1 sdk

* Update azure-pipelines.yml

* Target netcoreapp3.1

* Migrate to UseDotNet step

* Update azure-pipelines.yml

picky, picky

* Fix tests

Author: dustinsoftware

azure-pipelines.yml

@@ -1,5 +1,6 @@
 trigger:
     - main
+    - ci-updates
 
 pool:
     vmImage: 'windows-2019'
@@ -16,7 +17,8 @@ steps:
 
     - script: npm install --global npm
 
-    - task: DotNetCoreInstaller@0
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core sdk'
       inputs:
         packageType: 'sdk'
         version: '3.1.x'

tests/React.Tests.Benchmarks/React.Tests.Benchmarks.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

tests/React.Tests.Common/MemoryFileCacheCore.cs

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#if NETCOREAPP2_0
+#if NETCOREAPP
 
 using System;
 using System.Collections.Generic;

tests/React.Tests.Common/React.Tests.Common.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\React.Core\React.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
   </ItemGroup>
 

tests/React.Tests.Integration/React.Tests.Integration.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

tests/React.Tests/Core/MiddlewareTests.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP2_0
+#if NETCOREAPP
 
 using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Hosting;
@@ -13,7 +13,7 @@ public class MiddlewareTests
 		[Fact]
 		public void ForwardSlashesAreTransformed()
 		{
-			var environment = new Mock<IHostingEnvironment>();
+			var environment = new Mock<IWebHostEnvironment>();
 			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 			{
 				environment.Setup(x => x.WebRootPath).Returns("c:\\temp");

tests/React.Tests/Core/ReactEnvironmentTest.cs

@@ -48,7 +48,7 @@ public void ExecuteWithBabelWithNoNewThread()
 			environment.ExecuteWithBabel<int>("foo");
 			mocks.Engine.Verify(x => x.CallFunction<int>("foo"), Times.Exactly(1));
 		}
-#if NET452 || NETCOREAPP2_0
+#if NET452 || NETCOREAPP
 
 		[Fact]
 		public void ExecuteWithBabelWithNewThread()

tests/React.Tests/React.Tests.csproj

@@ -4,7 +4,7 @@
     <Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
     <AssemblyTitle>ReactJS.NET Unit Tests</AssemblyTitle>
     <Authors>Daniel Lo Nigro</Authors>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>React.Tests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../src/key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -25,11 +25,11 @@
     <ProjectReference Include="..\..\src\React.Web.Mvc4\React.Web.Mvc4.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <ProjectReference Include="..\..\src\React.Router\React.Router.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
   </ItemGroup>
 

tests/React.Tests/Router/ReactEnvironmentExtensionsTest.cs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-#if NET452 || NETCOREAPP2_0
+#if NET452 || NETCOREAPP
 
 using Moq;
 using Xunit;

tests/React.Tests/Router/ReactRouterComponentTest.cs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-#if NET452 || NETCOREAPP2_0
+#if NET452 || NETCOREAPP
 
 using Moq;
 using Xunit;
@@ -39,15 +39,15 @@ public void RenderJavaScriptShouldNotIncludeContextOrPath(bool clientOnly, bool
 					@"ReactDOM.render(React.createElement(Foo, {""hello"":""World""}), document.getElementById(""container""))",
 					result
 				);
-			} 
-			else 
+			}
+			else
 			{
 				Assert.Equal(
 					@"ReactDOM.hydrate(React.createElement(Foo, {""hello"":""World""}), document.getElementById(""container""))",
 					result
 				);
 			}
-			
+
 		}
 
 		[Theory]
@@ -76,7 +76,7 @@ public void RenderJavaScriptShouldHandleWaitForContentLoad(bool clientOnly, bool
 					result
 				);
 			}
-			else 
+			else
 			{
 				Assert.Equal(
 					@"window.addEventListener('DOMContentLoaded', function() {ReactDOM.hydrate(React.createElement(Foo, {""hello"":""World""}), document.getElementById(""container""))});",