Skip to content

Commit a82d3d1

Browse files
Chris Martinezcommonsensesoftware
Chris Martinez
authored and
commonsensesoftware
committed
Update to .NET Core 3.1
1 parent 1136d82 commit a82d3d1

File tree

27 files changed

+56
-59
lines changed

27 files changed

+56
-59
lines changed

‎samples/aspnetcore/BasicSample/BasicSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>Microsoft.Examples</RootNamespace>
66
</PropertyGroup>
77

‎samples/aspnetcore/ByNamespaceSample/ByNamespaceSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>Microsoft.Examples</RootNamespace>
66
</PropertyGroup>
77

‎samples/aspnetcore/ConventionsSample/ConventionsSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>Microsoft.Examples</RootNamespace>
66
</PropertyGroup>
77

‎samples/aspnetcore/SwaggerSample/SwaggerSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>Microsoft.Examples</RootNamespace>
66
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildThisFileName).xml</DocumentationFile>
77
</PropertyGroup>

‎src/Common.OData.ApiExplorer/AspNet.OData/Builder/ODataActionQueryOptionsConventionBuilderCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected internal virtual ODataActionQueryOptionsConventionBuilder GetOrAdd( Me
5555
/// <param name="actionMethod">The controller action method to get the convention builder for.</param>
5656
/// <param name="actionBuilder">The <see cref="ODataActionQueryOptionsConventionBuilder">controller action convention builder</see> or <c>null</c>.</param>
5757
/// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
58-
#if NETCOREAPP3_0
58+
#if NETCOREAPP3_1
5959
public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ODataActionQueryOptionsConventionBuilder? actionBuilder )
6060
#else
6161
public virtual bool TryGetValue( MethodInfo? actionMethod, out ODataActionQueryOptionsConventionBuilder? actionBuilder )

‎src/Common.OData.ApiExplorer/AspNet.OData/Builder/ODataActionQueryOptionsConventionBuilderCollection{T}.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected internal virtual ODataActionQueryOptionsConventionBuilder<T> GetOrAdd(
5454
/// <param name="actionMethod">The controller action method to get the convention builder for.</param>
5555
/// <param name="actionBuilder">The <see cref="ODataActionQueryOptionsConventionBuilder{T}">controller action convention builder</see> or <c>null</c>.</param>
5656
/// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
57-
#if NETCOREAPP3_0
57+
#if NETCOREAPP3_1
5858
public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ODataActionQueryOptionsConventionBuilder<T>? actionBuilder )
5959
#else
6060
public virtual bool TryGetValue( MethodInfo? actionMethod, out ODataActionQueryOptionsConventionBuilder<T>? actionBuilder )

‎src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected internal virtual ActionApiVersionConventionBuilder GetOrAdd( MethodInf
5959
/// <param name="actionMethod">The controller action method to get the convention builder for.</param>
6060
/// <param name="actionBuilder">The <see cref="ActionApiVersionConventionBuilder">controller action convention builder</see> or <c>null</c>.</param>
6161
/// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
62-
#if NETCOREAPP3_0
62+
#if NETCOREAPP3_1
6363
public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ActionApiVersionConventionBuilder? actionBuilder )
6464
#else
6565
public virtual bool TryGetValue( MethodInfo? actionMethod, out ActionApiVersionConventionBuilder? actionBuilder )

‎src/Common/Versioning/Conventions/ActionApiVersionConventionBuilderCollection{T}.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected internal virtual ActionApiVersionConventionBuilder<T> GetOrAdd( Method
5858
/// <param name="actionMethod">The controller action method to get the convention builder for.</param>
5959
/// <param name="actionBuilder">The <see cref="ActionApiVersionConventionBuilder{T}">controller action convention builder</see> or <c>null</c>.</param>
6060
/// <returns>True if the <paramref name="actionBuilder">action builder</paramref> is successfully retrieved; otherwise, false.</returns>
61-
#if NETCOREAPP3_0
61+
#if NETCOREAPP3_1
6262
public virtual bool TryGetValue( MethodInfo? actionMethod, [NotNullWhen( true )] out ActionApiVersionConventionBuilder<T>? actionBuilder )
6363
#else
6464
public virtual bool TryGetValue( MethodInfo? actionMethod, out ActionApiVersionConventionBuilder<T>? actionBuilder )

‎src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>4.0.0</VersionPrefix>
5-
<AssemblyVersion>4.0.0.0</AssemblyVersion>
6-
<TargetFrameworks>netcoreapp3.0;netstandard2.0</TargetFrameworks>
4+
<VersionPrefix>4.1.0</VersionPrefix>
5+
<AssemblyVersion>4.1.0.0</AssemblyVersion>
6+
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
77
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
88
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
99
<AssemblyTitle>Microsoft ASP.NET Core API Versioning</AssemblyTitle>

‎src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ReleaseNotes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-

1+
Add support for .NET Core 3.1

‎src/Microsoft.AspNetCore.Mvc.Versioning/ApplicationModels/ModelExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class ModelExtensions
1616
/// <typeparam name="T">The <see cref="Type">type</see> and key of the property.</typeparam>
1717
/// <param name="controller">The <see cref="ControllerModel">model</see> to get the property from.</param>
1818
/// <returns>The property value of <typeparamref name="T"/> or its default value.</returns>
19-
#if NETCOREAPP3_0
19+
#if NETCOREAPP3_1
2020
[return: MaybeNull]
2121
public static T GetProperty<T>( this ControllerModel controller )
2222
#else
@@ -37,7 +37,7 @@ public static T GetProperty<T>( this ControllerModel controller )
3737
/// <typeparam name="T">The <see cref="Type">type</see> and key of the property.</typeparam>
3838
/// <param name="controller">The <see cref="ControllerModel">model</see> to set the property for.</param>
3939
/// <param name="value">The property value to set.</param>
40-
#if NETCOREAPP3_0
40+
#if NETCOREAPP3_1
4141
public static void SetProperty<T>( this ControllerModel controller, [AllowNull] T value )
4242
#else
4343
public static void SetProperty<T>( this ControllerModel controller, T value )
@@ -57,7 +57,7 @@ public static void SetProperty<T>( this ControllerModel controller, T value )
5757
/// <typeparam name="T">The <see cref="Type">type</see> and key of the property.</typeparam>
5858
/// <param name="action">The <see cref="ActionModel">model</see> to get the property from.</param>
5959
/// <returns>The property value of <typeparamref name="T"/> or its default value.</returns>
60-
#if NETCOREAPP3_0
60+
#if NETCOREAPP3_1
6161
[return: MaybeNull]
6262
public static T GetProperty<T>( this ActionModel action )
6363
#else

‎src/Microsoft.AspNetCore.Mvc.Versioning/CollectionExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66

77
static partial class CollectionExtensions
88
{
9-
#if NETCOREAPP3_0
9+
#if NETCOREAPP3_1
1010
[return: MaybeNull]
1111
internal static TValue GetOrDefault<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, [AllowNull] TValue defaultValue ) where TKey : notnull =>
1212
#else
1313
internal static TValue GetOrDefault<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, TValue defaultValue ) where TKey : notnull =>
1414
#endif
1515
dictionary.TryGetValue( key, out TValue value ) ? value : defaultValue;
1616

17-
#if NETCOREAPP3_0
17+
#if NETCOREAPP3_1
1818
[return: MaybeNull]
1919
#endif
2020
internal static TValue GetOrDefault<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, Func<TValue> defaultValue ) where TKey : notnull =>
2121
dictionary.TryGetValue( key, out TValue value ) ? value : defaultValue();
2222

23-
#if NETCOREAPP3_0
23+
#if NETCOREAPP3_1
2424
internal static void SetOrRemove<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, [AllowNull] TValue value ) where TKey : notnull
2525
#else
2626
internal static void SetOrRemove<TKey, TValue>( this IDictionary<TKey, object?> dictionary, TKey key, TValue value ) where TKey : notnull
2727
#endif
2828
{
29-
if ( value == default && !typeof( TValue ).IsValueType )
29+
if ( !typeof( TValue ).IsValueType && value is null )
3030
{
3131
dictionary.Remove( key );
3232
}

‎src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.AspNetCore.Mvc.Versioning.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>4.0.0</VersionPrefix>
5-
<AssemblyVersion>4.0.0.0</AssemblyVersion>
6-
<TargetFrameworks>netcoreapp3.0;netstandard2.0</TargetFrameworks>
4+
<VersionPrefix>4.1.0</VersionPrefix>
5+
<AssemblyVersion>4.1.0.0</AssemblyVersion>
6+
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
77
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
88
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
99
<AssemblyTitle>Microsoft ASP.NET Core API Versioning</AssemblyTitle>
@@ -12,7 +12,7 @@
1212
<PackageTags>Microsoft;AspNet;AspNetCore;Versioning</PackageTags>
1313
</PropertyGroup>
1414

15-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
15+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
1616
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1717
</ItemGroup>
1818

@@ -21,9 +21,9 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<Compile Update="Routing\ApiVersionMatcherPolicy.netcoreapp3.0.cs" DependentUpon="Routing\ApiVersionMatcherPolicy.cs" />
24+
<Compile Update="Routing\ApiVersionMatcherPolicy.netcoreapp3.1.cs" DependentUpon="Routing\ApiVersionMatcherPolicy.cs" />
2525
<Compile Update="Routing\ApiVersionMatcherPolicy.netstandard2.0.cs" DependentUpon="Routing\ApiVersionMatcherPolicy.cs" />
26-
<Compile Update="Versioning\ApiVersionActionSelector.netcoreapp3.0.cs" DependentUpon="Versioning\ApiVersionActionSelector.cs" />
26+
<Compile Update="Versioning\ApiVersionActionSelector.netcoreapp3.1.cs" DependentUpon="Versioning\ApiVersionActionSelector.cs" />
2727
<Compile Update="Versioning\ApiVersionActionSelector.netstandard2.0.cs" DependentUpon="Versioning\ApiVersionActionSelector.cs" />
2828
</ItemGroup>
2929

‎src/Microsoft.AspNetCore.Mvc.Versioning/ReleaseNotes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-

1+
Add support for .NET Core 3.1

‎src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public bool AppliesToEndpoints( IReadOnlyList<Endpoint> endpoints )
6868
return false;
6969
}
7070

71-
static IReadOnlyList<(int index, ActionDescriptor action, bool valid)> EvaluateApiVersion( CandidateSet candidates, ApiVersion? apiVersion )
71+
static IReadOnlyList<(int Index, ActionDescriptor Action, bool Valid)> EvaluateApiVersion( CandidateSet candidates, ApiVersion? apiVersion )
7272
{
73-
var bestMatches = new List<(int index, ActionDescriptor action, bool)>();
73+
var bestMatches = new List<(int Index, ActionDescriptor Action, bool)>();
7474
var implicitMatches = new List<(int, ActionDescriptor, bool)>();
7575

7676
for ( var i = 0; i < candidates.Count; i++ )
@@ -107,7 +107,7 @@ public bool AppliesToEndpoints( IReadOnlyList<Endpoint> endpoints )
107107
bestMatches.AddRange( implicitMatches );
108108
break;
109109
case 1:
110-
var model = bestMatches[0].action.GetApiVersionModel();
110+
var model = bestMatches[0].Action.GetApiVersionModel();
111111

112112
if ( model.IsApiVersionNeutral )
113113
{

‎src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.netcoreapp3.1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP3_0
1+
#if NETCOREAPP3_1
22
namespace Microsoft.AspNetCore.Mvc.Routing
33
{
44
using Microsoft.AspNetCore.Http;

‎src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ApiVersionActionSelector.netcoreapp3.1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP3_0
1+
#if NETCOREAPP3_1
22
namespace Microsoft.AspNetCore.Mvc.Versioning
33
{
44
using Microsoft.AspNetCore.Http;

‎src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ControllerApiVersionConventionBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class ControllerApiVersionConventionBuilder
1717
/// <param name="method">The <see cref="MethodInfo">method</see> representing the action to retrieve the convention for.</param>
1818
/// <param name="convention">The retrieved <see cref="IApiVersionConvention{T}">convention</see> or <c>null</c>.</param>
1919
/// <returns>True if the convention was successfully retrieved; otherwise, false.</returns>
20-
#if NETCOREAPP3_0
20+
#if NETCOREAPP3_1
2121
protected override bool TryGetConvention( MethodInfo method, [NotNullWhen( true )] out IApiVersionConvention<ActionModel>? convention )
2222
#else
2323
protected override bool TryGetConvention( MethodInfo method, out IApiVersionConvention<ActionModel>? convention )

‎src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/DefaultErrorResponseProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected virtual object CreateErrorContent( ErrorResponseContext context )
5555

5656
static string? NullIfEmpty( string value ) => IsNullOrEmpty( value ) ? null : value;
5757

58-
#if NETCOREAPP3_0
58+
#if NETCOREAPP3_1
5959
[return: MaybeNull]
6060
#endif
6161
static TError NewInnerError<TError>( ErrorResponseContext context, Func<ErrorResponseContext, TError> create )

‎src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/IODataRouteCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public interface IODataRouteCollection : IReadOnlyList<ODataRouteMapping>
3939
/// <param name="key">The <see cref="ApiVersion">API version</see> to evaluate.</param>
4040
/// <param name="value">A <see cref="IReadOnlyList{T}">read-only list</see> of <see cref="ODataRouteMapping">mapped OData routes</see>.</param>
4141
/// <returns>True if the value was successfully retrieved; otherwise, false.</returns>
42-
#if NETCOREAPP3_0
42+
#if NETCOREAPP3_1
4343
bool TryGetValue( ApiVersion key, [NotNullWhen( true )] out IReadOnlyList<ODataRouteMapping>? value );
4444
#else
4545
bool TryGetValue( ApiVersion key, out IReadOnlyList<ODataRouteMapping>? value );

‎src/Microsoft.AspNetCore.OData.Versioning/AspNetCore.Mvc/ODataActionDescriptorChangeProvider.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void NotifyChanged()
7979
sealed class ChangeToken : IChangeToken
8080
{
8181
readonly ODataActionDescriptorChangeProvider provider;
82-
readonly HashSet<(Action<object> callback, object state)> callbacks = new HashSet<(Action<object> callback, object state)>();
82+
readonly HashSet<(Action<object> Callback, object State)> callbacks = new HashSet<(Action<object> Callback, object State)>();
8383
readonly object syncRoot = new object();
8484

8585
internal ChangeToken( ODataActionDescriptorChangeProvider provider ) => this.provider = provider;
@@ -100,7 +100,7 @@ public IDisposable RegisterChangeCallback( Action<object> callback, object state
100100
return new ChangeSubscription( this, item );
101101
}
102102

103-
internal void Remove( (Action<object> callback, object state) item )
103+
internal void Remove( (Action<object> Callback, object State) item )
104104
{
105105
lock ( syncRoot )
106106
{
@@ -110,7 +110,7 @@ internal void Remove( (Action<object> callback, object state) item )
110110

111111
internal void Callback()
112112
{
113-
var items = default( (Action<object> callback, object state)[] );
113+
var items = default( (Action<object> Callback, object State)[] );
114114

115115
lock ( syncRoot )
116116
{
@@ -121,7 +121,7 @@ internal void Callback()
121121
for ( var i = 0; i < items.Length; i++ )
122122
{
123123
var item = items[i];
124-
item.callback( item.state );
124+
item.Callback( item.State );
125125
}
126126
}
127127
}
@@ -132,7 +132,7 @@ sealed class ChangeSubscription : IDisposable
132132
readonly (Action<object>, object) callback;
133133
bool disposed;
134134

135-
internal ChangeSubscription( ChangeToken changeToken, (Action<object> func, object state) callback )
135+
internal ChangeSubscription( ChangeToken changeToken, (Action<object> Func, object State) callback )
136136
{
137137
this.changeToken = changeToken;
138138
this.callback = callback;

‎src/Shared/TypeExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void ProcessGenericType( StringBuilder builder, Type type, Type[] generic
112112
}
113113
}
114114

115-
#if NETCOREAPP3_0
115+
#if NETCOREAPP3_1
116116
var genericPartIndex = type.Name.IndexOf( '`', StringComparison.Ordinal );
117117
#else
118118
var genericPartIndex = type.Name.IndexOf( '`' );

‎test/Microsoft.AspNetCore.Mvc.Acceptance.Tests/Microsoft.AspNetCore.Mvc.Acceptance.Tests.csproj

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
66
<RootNamespace>Microsoft.AspNetCore</RootNamespace>
77
<AssetTargetFallback>$(AssetTargetFallback);portable-net451+win8</AssetTargetFallback>
88
<PreserveCompilationContext>true</PreserveCompilationContext>
@@ -22,22 +22,19 @@
2222
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
2323
</ItemGroup>
2424

25-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
2626
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0-*" />
2727
</ItemGroup>
2828

29-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
3030
<Compile Remove="OData\**\*.cs" />
3131
</ItemGroup>
3232

3333
<Import Project="..\Acceptance.Test.Shared\Acceptance.Test.Shared.projitems" Condition=" '$(TargetFramework)' == 'net461' " />
3434

35-
<!-- TEMP: cannot use the shared project until odata supports netcoreapp3.0 so just link the relevant files instead for now -->
36-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
37-
<Compile Include="..\Acceptance.Test.Shared\**\*.cs"
38-
Exclude="..\Acceptance.Test.Shared\**\*OData*.cs"
39-
Link="%(RecursiveDir)%(Filename)%(Extension)"
40-
Visible="false" />
35+
<!-- TEMP: cannot use the shared project until odata supports netcoreapp3.1 so just link the relevant files instead for now -->
36+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
37+
<Compile Include="..\Acceptance.Test.Shared\**\*.cs" Exclude="..\Acceptance.Test.Shared\**\*OData*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" Visible="false" />
4138
</ItemGroup>
4239

4340
</Project>

‎test/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.Tests/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
66
<RootNamespace>Microsoft.AspNetCore.Mvc.ApiExplorer</RootNamespace>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
</PropertyGroup>

‎test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Microsoft.AspNetCore.Mvc.Versioning.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
66
<RootNamespace>Microsoft.AspNetCore.Mvc</RootNamespace>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<Compile Update="Routing\ApiVersionMatcherPolicyTest.netcoreapp3.0.cs" DependentUpon="Routing\ApiVersionMatcherPolicyTest.cs" />
19+
<Compile Update="Routing\ApiVersionMatcherPolicyTest.netcoreapp3.1.cs" DependentUpon="Routing\ApiVersionMatcherPolicyTest.cs" />
2020
<Compile Update="Routing\ApiVersionMatcherPolicyTest.net461.cs" DependentUpon="Routing\ApiVersionMatcherPolicyTest.cs" />
2121
</ItemGroup>
2222

0 commit comments

Comments
 (0)