Fix failing build due to dependencies with severe vulnerabilities (#2824)

Author: gathogojr

pipelines/common.yml

@@ -13,9 +13,9 @@ steps:
     version: 3.x
 
 - task: UseDotNet@2
-  displayName: Use .NET Core sdk 2.0.x
+  displayName: Use .NET Core sdk 2.1.x
   inputs:
-    version: 2.0.x
+    version: 2.1.x
 
 - task: UseDotNet@2
   displayName: Use .NET Core sdk 5.x

samples/AspNetCoreODataSample.Web/AspNetCoreODataSample.Web.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.1.30" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.30" />
   </ItemGroup>
 
   <ItemGroup>

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Formatter/ODataFormatterTests.cs

@@ -522,7 +522,7 @@ public async Task UnauthorizedResponseFromODataControllerIsSerializedAsODataErro
             }
         }
 
-#if !NETCOREAPP2_0 && NETCORE
+#if !NETCOREAPP2_1 && NETCORE
         [Fact]
         public async Task ConflictResponseFromODataControllerIsSerializedAsODataError()
         {
@@ -930,7 +930,7 @@ public IActionResult Get()
             {
                 return Unauthorized("Not authorized to access this resource.");
             }
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_1
             public IActionResult Patch([FromODataUri] int key, [FromBody] Customer customer)
             {
                 return Conflict("Conflict during update.");

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Formatter/ODataMediaTypeFormattersTests.cs

@@ -18,9 +18,11 @@
 using Microsoft.AspNet.OData.Test.Common;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
 #if NETCOREAPP3_1
 #else
-    using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.WebUtilities;

test/UnitTest/Microsoft.AspNetCore.OData.Test/Abstraction/Endpoint/EndpointRouteBuilderFactory.cs

@@ -5,7 +5,7 @@
 // </copyright>
 //------------------------------------------------------------------------------
 
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_1
 using System;
 using Microsoft.AspNet.OData.Common;
 using Microsoft.AspNet.OData.Extensions;

test/UnitTest/Microsoft.AspNetCore.OData.Test/Abstraction/Endpoint/MockEndpointRouteBuilder.cs

@@ -5,7 +5,7 @@
 // </copyright>
 //------------------------------------------------------------------------------
 
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_1
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Builder;

test/UnitTest/Microsoft.AspNetCore.OData.Test/Abstraction/FormatterTestHelper.cs

@@ -16,7 +16,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Formatters;
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
     using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;

test/UnitTest/Microsoft.AspNetCore.OData.Test/Abstraction/ODataActionSelectorTestHelper.cs

@@ -17,7 +17,7 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.Linq;
 using System.Text;
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.OData;
@@ -87,7 +87,7 @@ public static void SetupActionSelector(System.Type controllerType,
                 as IReadOnlyList<ControllerActionDescriptor>;
             actionDescriptors = actionDescriptors.Where(a => a.ActionName == actionName).ToList();
             var serviceProvider = routeBuilder.ServiceProvider;
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
             var actionsProvider = serviceProvider.GetRequiredService<IActionDescriptorCollectionProvider>();
             var actionConstraintsProvider = serviceProvider.GetRequiredService<ActionConstraintCache>();
             var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();

test/UnitTest/Microsoft.AspNetCore.OData.Test/Abstraction/RoutingConfigurationFactory.cs

@@ -17,7 +17,7 @@
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
 using Microsoft.AspNetCore.Builder.Internal;
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
@@ -81,7 +81,7 @@ public static IRouteBuilder Create()
             // Create a route build with a default path handler.
             IRouteBuilder routeBuilder = new RouteBuilder(appBuilder);
 
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
             routeBuilder.DefaultHandler = new MvcRouteHandler(
                 mockInvokerFactory.Object,
                 mockActionSelector.Object,
@@ -207,7 +207,7 @@ public static IRouteBuilder CreateWithDisabledCaseInsensitiveRequestPropertyBind
             // Create a route build with a default path handler.
             IRouteBuilder routeBuilder = new RouteBuilder(appBuilder);
 
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
             routeBuilder.DefaultHandler = new MvcRouteHandler(
                 mockInvokerFactory.Object,
                 mockActionSelector.Object,

test/UnitTest/Microsoft.AspNetCore.OData.Test/Abstraction/ServerFactory.cs

@@ -15,7 +15,7 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_1
     using Microsoft.AspNetCore.Http.Features;
 #endif
 using Microsoft.AspNetCore.Mvc;
@@ -44,7 +44,7 @@ public static TestServer Create(Type[] controllers, Action<IRouteBuilder> config
             IWebHostBuilder builder = WebHost.CreateDefaultBuilder();
             builder.ConfigureServices(services =>
             {
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
                 services.AddMvc();
 #else
                 services.AddMvc(options => options.EnableEndpointRouting = false)
@@ -57,7 +57,7 @@ public static TestServer Create(Type[] controllers, Action<IRouteBuilder> config
 
             builder.Configure(app =>
             {
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_1
                 app.Use(next => context =>
                 {
                     var body = context.Features.Get<IHttpBodyControlFeature>();