Update test packages

Author: commonsensesoftware

ApiVersioning.sln

@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0987757E-4
 		test\.editorconfig = test\.editorconfig
 		test\acceptance.xunit.runner.json = test\acceptance.xunit.runner.json
 		test\Directory.Build.props = test\Directory.Build.props
+		test\Directory.Build.targets = test\Directory.Build.targets
 		test\xunit.runner.json = test\xunit.runner.json
 	EndProjectSection
 EndProject

test/Directory.Build.props

@@ -14,16 +14,4 @@
   <None Include="$(MSBuildThisFileDirectory)$(AcceptanceTestPrefix)xunit.runner.json" Link="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Visible="false" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(MSBuildProjectExtension)' != '.shproj' ">
-  <PackageReference Include="FluentAssertions" Version="5.10.3" />
-  <PackageReference Include="Moq" Version="4.17.2" />
-  <PackageReference Include="xunit" Version="2.4.1" />
-  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
- </ItemGroup>
-
- <ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
-  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.23-*" />
- </ItemGroup>
-
 </Project>

test/Directory.Build.targets

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+  <FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
+  <MoqVersion>4.18.2</MoqVersion>
+  <XunitRunnerVersion>2.4.5</XunitRunnerVersion>
+  <TestHostVersion>5.0.17-*</TestHostVersion>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
+  <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
+  <MoqVersion>4.17.2</MoqVersion>
+  <XunitRunnerVersion>2.4.3</XunitRunnerVersion>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <TestHostVersion>3.1.28</TestHostVersion>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(MSBuildProjectExtension)' != '.shproj' ">
+  <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+  <PackageReference Include="Moq" Version="$(MoqVersion)" />
+  <PackageReference Include="xunit" Version="2.4.2" />
+  <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
+ </ItemGroup>
+
+ <ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
+  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(TestHostVersion)" />
+ </ItemGroup>
+
+</Project>

test/Microsoft.AspNetCore.Mvc.Acceptance.Tests/Mvc/Basic/given a versioned Controller/when two route templates overlap.cs

@@ -54,18 +54,18 @@ public async Task then_the_higher_precedence_route_should_result_in_ambiguous_ac
             var result1 = await response.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
 
             // act
-            Func<Task> act = async () => await GetAsync( "api/v1/values/42/ambiguous" );
+            Func<Task> act = () => GetAsync( "api/v1/values/42/ambiguous" );
 
             // assert
             result1.Should().Be( "{\"id\":42,\"childId\":\"abc\"}" );
 
             if ( UsingEndpointRouting )
             {
-                act.Should().Throw<Exception>().And.GetType().Name.Should().Be( "AmbiguousMatchException" );
+                ( await act.Should().ThrowAsync<Exception>() ).And.GetType().Name.Should().Be( "AmbiguousMatchException" );
             }
             else
             {
-                act.Should().Throw<AmbiguousActionException>();
+                await act.Should().ThrowAsync<AmbiguousActionException>();
             }
         }
 

test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs

@@ -447,7 +447,7 @@ public void substituted_type_should_have_renamed_with_attribute_properties_from_
             // assert
             substitutedType.Should().HaveProperty<string>( nameof( Contact.FirstName ) );
             substitutedType.GetRuntimeProperty( nameof( Contact.FirstName ) ).Should().NotBeNull();
-            substitutedType.GetRuntimeProperty( nameof( Contact.FirstName ) ).IsDecoratedWith<DataMemberAttribute>();
+            substitutedType.GetRuntimeProperty( nameof( Contact.FirstName ) ).GetCustomAttribute<DataMemberAttribute>().Should().NotBeNull();
         }
 
         [Fact]
@@ -465,7 +465,7 @@ public void substituted_type_should_keep_custom_attributes_on_dependency_propert
 
             // assert
             substitutedType.GetRuntimeProperty( nameof( Contact.Email ) ).Should().NotBeNull();
-            substitutedType.GetRuntimeProperty( nameof( Contact.Email ) ).IsDecoratedWith<DataMemberAttribute>();
+            substitutedType.GetRuntimeProperty( nameof( Contact.Email ) ).GetCustomAttribute<DataMemberAttribute>().Should().NotBeNull();
         }
 
         [Fact]
@@ -483,7 +483,7 @@ public void substituted_type_should_keep_custom_attributes_on_collection_depende
 
             // assert
             substitutedType.GetRuntimeProperty( nameof( Contact.Addresses ) ).Should().NotBeNull();
-            substitutedType.GetRuntimeProperty( nameof( Contact.Addresses ) ).IsDecoratedWith<DataMemberAttribute>();
+            substitutedType.GetRuntimeProperty( nameof( Contact.Addresses ) ).GetCustomAttribute<DataMemberAttribute>().Should().NotBeNull();
         }
 
         public static IEnumerable<object[]> SubstitutionNotRequiredData