Update to .NET Core 3.1

Chris Martinez · commonsensesoftware · commit a82d3d16d04b · 2019-12-04T07:54:27.000-08:00
diff --git a/samples/aspnetcore/BasicSample/BasicSample.csproj b/samples/aspnetcore/BasicSample/BasicSample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-  <TargetFramework>netcoreapp3.0</TargetFramework>
+  <TargetFramework>netcoreapp3.1</TargetFramework>
   <RootNamespace>Microsoft.Examples</RootNamespace>
  </PropertyGroup>
 
diff --git a/samples/aspnetcore/ByNamespaceSample/ByNamespaceSample.csproj b/samples/aspnetcore/ByNamespaceSample/ByNamespaceSample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-  <TargetFramework>netcoreapp3.0</TargetFramework>
+  <TargetFramework>netcoreapp3.1</TargetFramework>
   <RootNamespace>Microsoft.Examples</RootNamespace>
  </PropertyGroup>
 
diff --git a/samples/aspnetcore/ConventionsSample/ConventionsSample.csproj b/samples/aspnetcore/ConventionsSample/ConventionsSample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-  <TargetFramework>netcoreapp3.0</TargetFramework>
+  <TargetFramework>netcoreapp3.1</TargetFramework>
   <RootNamespace>Microsoft.Examples</RootNamespace>
  </PropertyGroup>
  
diff --git a/samples/aspnetcore/SwaggerSample/SwaggerSample.csproj b/samples/aspnetcore/SwaggerSample/SwaggerSample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-  <TargetFramework>netcoreapp3.0</TargetFramework>
+  <TargetFramework>netcoreapp3.1</TargetFramework>
   <RootNamespace>Microsoft.Examples</RootNamespace>
   <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildThisFileName).xml</DocumentationFile>
  </PropertyGroup>
diff --git a/src/Common.OData.ApiExplorer/AspNet.OData/Builder/ODataActionQueryOptionsConventionBuilderCollection.cs b/src/Common.OData.ApiExplorer/AspNet.OData/Builder/ODataActionQueryOptionsConventionBuilderCollection.cs
@@ -55,7 +55,7 @@ protected internal virtual ODataActionQueryOptionsConventionBuilder GetOrAdd( Me
         /// <param name="actionMethod">The controller action method to get the convention builder for.</param>
         /// <param name="actionBuilder">The <see cref="ODataActionQueryOptionsConventionBuilder">controller action convention builder</see> or <c>null</c>.</param>
         /// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ODataActionQueryOptionsConventionBuilder? actionBuilder )
 #else
         public virtual bool TryGetValue( MethodInfo? actionMethod, out ODataActionQueryOptionsConventionBuilder? actionBuilder )
diff --git a/src/Common.OData.ApiExplorer/AspNet.OData/Builder/ODataActionQueryOptionsConventionBuilderCollection{T}.cs b/src/Common.OData.ApiExplorer/AspNet.OData/Builder/ODataActionQueryOptionsConventionBuilderCollection{T}.cs
@@ -54,7 +54,7 @@ protected internal virtual ODataActionQueryOptionsConventionBuilder<T> GetOrAdd(
         /// <param name="actionMethod">The controller action method to get the convention builder for.</param>
         /// <param name="actionBuilder">The <see cref="ODataActionQueryOptionsConventionBuilder{T}">controller action convention builder</see> or <c>null</c>.</param>
         /// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ODataActionQueryOptionsConventionBuilder<T>? actionBuilder )
 #else
         public virtual bool TryGetValue( MethodInfo? actionMethod, out ODataActionQueryOptionsConventionBuilder<T>? actionBuilder )
diff --git a/src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderCollection.cs b/src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderCollection.cs
@@ -59,7 +59,7 @@ protected internal virtual ActionApiVersionConventionBuilder GetOrAdd( MethodInf
         /// <param name="actionMethod">The controller action method to get the convention builder for.</param>
         /// <param name="actionBuilder">The <see cref="ActionApiVersionConventionBuilder">controller action convention builder</see> or <c>null</c>.</param>
         /// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ActionApiVersionConventionBuilder? actionBuilder )
 #else
         public virtual bool TryGetValue( MethodInfo? actionMethod, out ActionApiVersionConventionBuilder? actionBuilder )
diff --git a/src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderCollection{T}.cs b/src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderCollection{T}.cs
@@ -58,7 +58,7 @@ protected internal virtual ActionApiVersionConventionBuilder<T> GetOrAdd( Method
         /// <param name="actionMethod">The controller action method to get the convention builder for.</param>
         /// <param name="actionBuilder">The <see cref="ActionApiVersionConventionBuilder{T}">controller action convention builder</see> or <c>null</c>.</param>
         /// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ActionApiVersionConventionBuilder<T>? actionBuilder )
 #else
         public virtual bool TryGetValue( MethodInfo? actionMethod, out ActionApiVersionConventionBuilder<T>? actionBuilder )
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.csproj b/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>4.0.0</VersionPrefix>
-  <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  <TargetFrameworks>netcoreapp3.0;netstandard2.0</TargetFrameworks>
+  <VersionPrefix>4.1.0</VersionPrefix>
+  <AssemblyVersion>4.1.0.0</AssemblyVersion>
+  <TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
   <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
   <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
   <AssemblyTitle>Microsoft ASP.NET Core API Versioning</AssemblyTitle>
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ReleaseNotes.txt b/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ReleaseNotes.txt
@@ -1 +1 @@
-﻿
+﻿Add support for .NET Core 3.1
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/ApplicationModels/ModelExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/ApplicationModels/ModelExtensions.cs
@@ -16,7 +16,7 @@ public static class ModelExtensions
         /// <typeparam name="T">The <see cref="Type">type</see> and key of the property.</typeparam>
         /// <param name="controller">The <see cref="ControllerModel">model</see> to get the property from.</param>
         /// <returns>The property value of <typeparamref name="T"/> or its default value.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         [return: MaybeNull]
         public static T GetProperty<T>( this ControllerModel controller )
 #else
@@ -37,7 +37,7 @@ public static T GetProperty<T>( this ControllerModel controller )
         /// <typeparam name="T">The <see cref="Type">type</see> and key of the property.</typeparam>
         /// <param name="controller">The <see cref="ControllerModel">model</see> to set the property for.</param>
         /// <param name="value">The property value to set.</param>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         public static void SetProperty<T>( this ControllerModel controller, [AllowNull] T value )
 #else
         public static void SetProperty<T>( this ControllerModel controller, T value )
@@ -57,7 +57,7 @@ public static void SetProperty<T>( this ControllerModel controller, T value )
         /// <typeparam name="T">The <see cref="Type">type</see> and key of the property.</typeparam>
         /// <param name="action">The <see cref="ActionModel">model</see> to get the property from.</param>
         /// <returns>The property value of <typeparamref name="T"/> or its default value.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         [return: MaybeNull]
         public static T GetProperty<T>( this ActionModel action )
 #else
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/CollectionExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/CollectionExtensions.cs
@@ -6,27 +6,27 @@
 
     static partial class CollectionExtensions
     {
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         [return: MaybeNull]
         internal static TValue GetOrDefault<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, [AllowNull] TValue defaultValue ) where TKey : notnull =>
 #else
         internal static TValue GetOrDefault<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, TValue defaultValue ) where TKey : notnull =>
 #endif
             dictionary.TryGetValue( key, out TValue value ) ? value : defaultValue;
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         [return: MaybeNull]
 #endif
         internal static TValue GetOrDefault<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, Func<TValue> defaultValue ) where TKey : notnull =>
             dictionary.TryGetValue( key, out TValue value ) ? value : defaultValue();
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         internal static void SetOrRemove<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, [AllowNull] TValue value ) where TKey : notnull
 #else
         internal static void SetOrRemove<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, TValue value ) where TKey : notnull
 #endif
         {
-            if ( value == default && !typeof( TValue ).IsValueType )
+            if ( !typeof( TValue ).IsValueType && value is null )
             {
                 dictionary.Remove( key );
             }
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.AspNetCore.Mvc.Versioning.csproj b/src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.AspNetCore.Mvc.Versioning.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>4.0.0</VersionPrefix>
-  <AssemblyVersion>4.0.0.0</AssemblyVersion>
-  <TargetFrameworks>netcoreapp3.0;netstandard2.0</TargetFrameworks>
+  <VersionPrefix>4.1.0</VersionPrefix>
+  <AssemblyVersion>4.1.0.0</AssemblyVersion>
+  <TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
   <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
   <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
   <AssemblyTitle>Microsoft ASP.NET Core API Versioning</AssemblyTitle>
@@ -12,7 +12,7 @@
   <PackageTags>Microsoft;AspNet;AspNetCore;Versioning</PackageTags>
  </PropertyGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
   <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>
 
@@ -21,9 +21,9 @@
  </ItemGroup>
 
  <ItemGroup>
-  <Compile Update="Routing\ApiVersionMatcherPolicy.netcoreapp3.0.cs" DependentUpon="Routing\ApiVersionMatcherPolicy.cs" />
+  <Compile Update="Routing\ApiVersionMatcherPolicy.netcoreapp3.1.cs" DependentUpon="Routing\ApiVersionMatcherPolicy.cs" />
   <Compile Update="Routing\ApiVersionMatcherPolicy.netstandard2.0.cs" DependentUpon="Routing\ApiVersionMatcherPolicy.cs" />
-  <Compile Update="Versioning\ApiVersionActionSelector.netcoreapp3.0.cs" DependentUpon="Versioning\ApiVersionActionSelector.cs" />
+  <Compile Update="Versioning\ApiVersionActionSelector.netcoreapp3.1.cs" DependentUpon="Versioning\ApiVersionActionSelector.cs" />
   <Compile Update="Versioning\ApiVersionActionSelector.netstandard2.0.cs" DependentUpon="Versioning\ApiVersionActionSelector.cs" />
  </ItemGroup>
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/ReleaseNotes.txt b/src/Microsoft.AspNetCore.Mvc.Versioning/ReleaseNotes.txt
@@ -1 +1 @@
-﻿
+﻿Add support for .NET Core 3.1
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.cs
@@ -68,9 +68,9 @@ public bool AppliesToEndpoints( IReadOnlyList<Endpoint> endpoints )
             return false;
         }
 
-        static IReadOnlyList<(int index, ActionDescriptor action, bool valid)> EvaluateApiVersion( CandidateSet candidates, ApiVersion? apiVersion )
+        static IReadOnlyList<(int Index, ActionDescriptor Action, bool Valid)> EvaluateApiVersion( CandidateSet candidates, ApiVersion? apiVersion )
         {
-            var bestMatches = new List<(int index, ActionDescriptor action, bool)>();
+            var bestMatches = new List<(int Index, ActionDescriptor Action, bool)>();
             var implicitMatches = new List<(int, ActionDescriptor, bool)>();
 
             for ( var i = 0; i < candidates.Count; i++ )
@@ -107,7 +107,7 @@ public bool AppliesToEndpoints( IReadOnlyList<Endpoint> endpoints )
                     bestMatches.AddRange( implicitMatches );
                     break;
                 case 1:
-                    var model = bestMatches[0].action.GetApiVersionModel();
+                    var model = bestMatches[0].Action.GetApiVersionModel();
 
                     if ( model.IsApiVersionNeutral )
                     {
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.netcoreapp3.1.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.netcoreapp3.1.cs
@@ -1,4 +1,4 @@
-﻿#if NETCOREAPP3_0
+﻿#if NETCOREAPP3_1
 namespace Microsoft.AspNetCore.Mvc.Routing
 {
     using Microsoft.AspNetCore.Http;
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ApiVersionActionSelector.netcoreapp3.1.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ApiVersionActionSelector.netcoreapp3.1.cs
@@ -1,4 +1,4 @@
-﻿#if NETCOREAPP3_0
+﻿#if NETCOREAPP3_1
 namespace Microsoft.AspNetCore.Mvc.Versioning
 {
     using Microsoft.AspNetCore.Http;
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ControllerApiVersionConventionBuilder.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ControllerApiVersionConventionBuilder.cs
@@ -17,7 +17,7 @@ public partial class ControllerApiVersionConventionBuilder
         /// <param name="method">The <see cref="MethodInfo">method</see> representing the action to retrieve the convention for.</param>
         /// <param name="convention">The retrieved <see cref="IApiVersionConvention{T}">convention</see> or <c>null</c>.</param>
         /// <returns>True if the convention was successfully retrieved; otherwise, false.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         protected override bool TryGetConvention( MethodInfo method, [NotNullWhen( true )] out IApiVersionConvention<ActionModel>? convention )
 #else
         protected override bool TryGetConvention( MethodInfo method, out IApiVersionConvention<ActionModel>? convention )
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/DefaultErrorResponseProvider.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/DefaultErrorResponseProvider.cs
@@ -55,7 +55,7 @@ protected virtual object CreateErrorContent( ErrorResponseContext context )
 
         static string? NullIfEmpty( string value ) => IsNullOrEmpty( value ) ? null : value;
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         [return: MaybeNull]
 #endif
         static TError NewInnerError<TError>( ErrorResponseContext context, Func<ErrorResponseContext, TError> create )
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/IODataRouteCollection.cs b/src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/IODataRouteCollection.cs
@@ -39,7 +39,7 @@ public interface IODataRouteCollection : IReadOnlyList<ODataRouteMapping>
         /// <param name="key">The <see cref="ApiVersion">API version</see> to evaluate.</param>
         /// <param name="value">A <see cref="IReadOnlyList{T}">read-only list</see> of <see cref="ODataRouteMapping">mapped OData routes</see>.</param>
         /// <returns>True if the value was successfully retrieved; otherwise, false.</returns>
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         bool TryGetValue( ApiVersion key, [NotNullWhen( true )] out IReadOnlyList<ODataRouteMapping>? value );
 #else
         bool TryGetValue( ApiVersion key, out IReadOnlyList<ODataRouteMapping>? value );
diff --git a/src/Microsoft.AspNetCore.OData.Versioning/AspNetCore.Mvc/ODataActionDescriptorChangeProvider.cs b/src/Microsoft.AspNetCore.OData.Versioning/AspNetCore.Mvc/ODataActionDescriptorChangeProvider.cs
@@ -79,7 +79,7 @@ public void NotifyChanged()
         sealed class ChangeToken : IChangeToken
         {
             readonly ODataActionDescriptorChangeProvider provider;
-            readonly HashSet<(Action<object> callback, object state)> callbacks = new HashSet<(Action<object> callback, object state)>();
+            readonly HashSet<(Action<object> Callback, object State)> callbacks = new HashSet<(Action<object> Callback, object State)>();
             readonly object syncRoot = new object();
 
             internal ChangeToken( ODataActionDescriptorChangeProvider provider ) => this.provider = provider;
@@ -100,7 +100,7 @@ public IDisposable RegisterChangeCallback( Action<object> callback, object state
                 return new ChangeSubscription( this, item );
             }
 
-            internal void Remove( (Action<object> callback, object state) item )
+            internal void Remove( (Action<object> Callback, object State) item )
             {
                 lock ( syncRoot )
                 {
@@ -110,7 +110,7 @@ internal void Remove( (Action<object> callback, object state) item )
 
             internal void Callback()
             {
-                var items = default( (Action<object> callback, object state)[] );
+                var items = default( (Action<object> Callback, object State)[] );
 
                 lock ( syncRoot )
                 {
@@ -121,7 +121,7 @@ internal void Callback()
                 for ( var i = 0; i < items.Length; i++ )
                 {
                     var item = items[i];
-                    item.callback( item.state );
+                    item.Callback( item.State );
                 }
             }
         }
@@ -132,7 +132,7 @@ sealed class ChangeSubscription : IDisposable
             readonly (Action<object>, object) callback;
             bool disposed;
 
-            internal ChangeSubscription( ChangeToken changeToken, (Action<object> func, object state) callback )
+            internal ChangeSubscription( ChangeToken changeToken, (Action<object> Func, object State) callback )
             {
                 this.changeToken = changeToken;
                 this.callback = callback;
diff --git a/src/Shared/TypeExtensions.cs b/src/Shared/TypeExtensions.cs
@@ -112,7 +112,7 @@ static void ProcessGenericType( StringBuilder builder, Type type, Type[] generic
                 }
             }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
             var genericPartIndex = type.Name.IndexOf( '`', StringComparison.Ordinal );
 #else
             var genericPartIndex = type.Name.IndexOf( '`' );
diff --git a/test/Microsoft.AspNetCore.Mvc.Acceptance.Tests/Microsoft.AspNetCore.Mvc.Acceptance.Tests.csproj b/test/Microsoft.AspNetCore.Mvc.Acceptance.Tests/Microsoft.AspNetCore.Mvc.Acceptance.Tests.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
-  <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
+  <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+  <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Microsoft.AspNetCore</RootNamespace>
   <AssetTargetFallback>$(AssetTargetFallback);portable-net451+win8</AssetTargetFallback>
   <PreserveCompilationContext>true</PreserveCompilationContext>
@@ -22,22 +22,19 @@
   <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
   <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0-*" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
   <Compile Remove="OData\**\*.cs" />
  </ItemGroup>
 
  <Import Project="..\Acceptance.Test.Shared\Acceptance.Test.Shared.projitems" Condition=" '$(TargetFramework)' == 'net461' " />
 
- <!-- TEMP: cannot use the shared project until odata supports netcoreapp3.0 so just link the relevant files instead for now -->
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
-  <Compile Include="..\Acceptance.Test.Shared\**\*.cs"
-           Exclude="..\Acceptance.Test.Shared\**\*OData*.cs"
-           Link="%(RecursiveDir)%(Filename)%(Extension)"
-           Visible="false" />
+ <!-- TEMP: cannot use the shared project until odata supports netcoreapp3.1 so just link the relevant files instead for now -->
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <Compile Include="..\Acceptance.Test.Shared\**\*.cs" Exclude="..\Acceptance.Test.Shared\**\*OData*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" Visible="false" />
  </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.Tests/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.Tests.csproj b/test/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.Tests/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.Tests.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
-  <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
+  <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+  <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Microsoft.AspNetCore.Mvc.ApiExplorer</RootNamespace>
   <PreserveCompilationContext>true</PreserveCompilationContext>
  </PropertyGroup>
diff --git a/test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Microsoft.AspNetCore.Mvc.Versioning.Tests.csproj b/test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Microsoft.AspNetCore.Mvc.Versioning.Tests.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
-  <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
+  <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+  <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Microsoft.AspNetCore.Mvc</RootNamespace>
   <PreserveCompilationContext>true</PreserveCompilationContext>
  </PropertyGroup>
@@ -16,7 +16,7 @@
  </ItemGroup>
 
  <ItemGroup>
-  <Compile Update="Routing\ApiVersionMatcherPolicyTest.netcoreapp3.0.cs" DependentUpon="Routing\ApiVersionMatcherPolicyTest.cs" />
+  <Compile Update="Routing\ApiVersionMatcherPolicyTest.netcoreapp3.1.cs" DependentUpon="Routing\ApiVersionMatcherPolicyTest.cs" />
   <Compile Update="Routing\ApiVersionMatcherPolicyTest.net461.cs" DependentUpon="Routing\ApiVersionMatcherPolicyTest.cs" />
  </ItemGroup>
 
diff --git a/test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs b/test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs
diff --git a/test/directory.build.props b/test/directory.build.props
