Revert tuple types

Chris Martinez · commonsensesoftware · commit 88c307a781e1 · 2018-09-18T21:45:57.000-07:00
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ActionApiVersionConventionBuilderBase.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ActionApiVersionConventionBuilderBase.cs
@@ -25,10 +25,10 @@ from version in provider.Versions
                                      select version );
 
             var (supportedVersions, deprecatedVersions, advertisedVersions, deprecatedAdvertisedVersions) =
-                actionModel.GetProperty<(IEnumerable<ApiVersion>,
-                                         IEnumerable<ApiVersion>,
-                                         IEnumerable<ApiVersion>,
-                                         IEnumerable<ApiVersion>)>();
+                actionModel.GetProperty<Tuple<IEnumerable<ApiVersion>,
+                                              IEnumerable<ApiVersion>,
+                                              IEnumerable<ApiVersion>,
+                                              IEnumerable<ApiVersion>>>();
 
             var versionModel = new ApiVersionModel(
                 declaredVersions: MappedVersions,
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ControllerApiVersionConventionBuilderBase.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/Conventions/ControllerApiVersionConventionBuilderBase.cs
@@ -42,7 +42,7 @@ static void ApplyNeutralModelToActions( ControllerModel controller )
             }
         }
 
-        (IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>) ApplyControllerConventions( ControllerModel controllerModel )
+        Tuple<IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>> ApplyControllerConventions( ControllerModel controllerModel )
         {
             Contract.Requires( controllerModel != null );
 
@@ -57,7 +57,7 @@ static void ApplyNeutralModelToActions( ControllerModel controller )
                 controllerModel.SetProperty( new ApiVersionModel( VersionNeutral, supportedVersions, deprecatedVersions, advertisedVersions, deprecatedAdvertisedVersions ) );
             }
 
-            return (supportedVersions, deprecatedVersions, advertisedVersions, deprecatedAdvertisedVersions);
+            return Tuple.Create( supportedVersions.AsEnumerable(), deprecatedVersions.AsEnumerable(), advertisedVersions.AsEnumerable(), deprecatedAdvertisedVersions.AsEnumerable() );
         }
 
         void MergeControllerAttributesWithConventions( ControllerModel controllerModel )
@@ -97,7 +97,7 @@ from version in provider.Versions
                                                     select version );
         }
 
-        void ApplyActionConventions( ControllerModel controller, (IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>) controllerVersionInfo )
+        void ApplyActionConventions( ControllerModel controller, Tuple<IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>> controllerVersionInfo )
         {
             Contract.Requires( controller != null );
 
@@ -111,7 +111,7 @@ void ApplyActionConventions( ControllerModel controller, (IEnumerable<ApiVersion
             }
         }
 
-        void MergeActionAttributesWithConventions( ControllerModel controller, (IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>) controllerVersionInfo )
+        void MergeActionAttributesWithConventions( ControllerModel controller, Tuple<IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>> controllerVersionInfo )
         {
             Contract.Requires( controller != null );
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Versioning/Conventions/ActionApiVersionConventionBuilderTTest.cs b/test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Versioning/Conventions/ActionApiVersionConventionBuilderTTest.cs
@@ -3,6 +3,7 @@
     using ApplicationModels;
     using FluentAssertions;
     using Moq;
+    using System;
     using System.Linq;
     using System.Reflection;
     using Xunit;
@@ -19,7 +20,7 @@ public void apply_to_should_assign_empty_model_without_api_versions_from_mapped_
             var method = typeof( UndecoratedController ).GetMethod( nameof( UndecoratedController.Get ) );
             var actionModel = new ActionModel( method, new object[0] );
             var empty = Enumerable.Empty<ApiVersion>();
-            var controllerVersionInfo = (empty, empty, empty, empty);
+            var controllerVersionInfo = Tuple.Create( empty, empty, empty, empty );
 
             actionModel.SetProperty( controllerVersionInfo );
 
@@ -48,7 +49,7 @@ public void apply_to_should_assign_model_with_declared_api_versions_from_mapped_
             var attributes = new object[] { new MapToApiVersionAttribute( "2.0" ) };
             var actionModel = new ActionModel( method, attributes );
             var empty = Enumerable.Empty<ApiVersion>();
-            var controllerVersionInfo = (empty, empty, empty, empty);
+            var controllerVersionInfo = Tuple.Create( empty, empty, empty, empty );
 
             actionModel.SetProperty( controllerVersionInfo );
             actionBuilder.MapToApiVersion( new ApiVersion( 2, 0 ) );
@@ -78,7 +79,7 @@ public void apply_to_should_assign_model_with_declared_api_versions_from_mapped_
             var attributes = method.GetCustomAttributes().Cast<object>().ToArray();
             var actionModel = new ActionModel( method, attributes );
             var empty = Enumerable.Empty<ApiVersion>();
-            var controllerVersionInfo = (empty, empty, empty, empty);
+            var controllerVersionInfo = Tuple.Create( empty, empty, empty, empty );
 
             actionModel.SetProperty( controllerVersionInfo );
             actionBuilder.MapToApiVersion( new ApiVersion( 2, 0 ) )
diff --git a/test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Versioning/Conventions/ActionApiVersionConventionBuilderTest.cs b/test/Microsoft.AspNetCore.Mvc.Versioning.Tests/Versioning/Conventions/ActionApiVersionConventionBuilderTest.cs
@@ -3,6 +3,7 @@
     using ApplicationModels;
     using FluentAssertions;
     using Moq;
+    using System;
     using System.Linq;
     using System.Reflection;
     using Xunit;
@@ -19,7 +20,7 @@ public void apply_to_should_assign_empty_model_without_api_versions_from_mapped_
             var method = typeof( UndecoratedController ).GetMethod( nameof( UndecoratedController.Get ) );
             var actionModel = new ActionModel( method, new object[0] );
             var empty = Enumerable.Empty<ApiVersion>();
-            var controllerVersionInfo = (empty, empty, empty, empty);
+            var controllerVersionInfo = Tuple.Create( empty, empty, empty, empty );
 
             actionModel.SetProperty( controllerVersionInfo );
 
@@ -48,7 +49,7 @@ public void apply_to_should_assign_model_with_declared_api_versions_from_mapped_
             var attributes = new object[] { new MapToApiVersionAttribute( "2.0" ) };
             var actionModel = new ActionModel( method, attributes );
             var empty = Enumerable.Empty<ApiVersion>();
-            var controllerVersionInfo = (empty, empty, empty, empty);
+            var controllerVersionInfo = Tuple.Create( empty, empty, empty, empty );
 
             actionModel.SetProperty( controllerVersionInfo );
             actionBuilder.MapToApiVersion( new ApiVersion( 2, 0 ) );
@@ -78,7 +79,7 @@ public void apply_to_should_assign_model_with_declared_api_versions_from_mapped_
             var attributes = method.GetCustomAttributes().Cast<object>().ToArray();
             var actionModel = new ActionModel( method, attributes );
             var empty = Enumerable.Empty<ApiVersion>();
-            var controllerVersionInfo = (empty, empty, empty, empty);
+            var controllerVersionInfo = Tuple.Create( empty, empty, empty, empty );
 
             actionModel.SetProperty( controllerVersionInfo );
             actionBuilder.MapToApiVersion( new ApiVersion( 2, 0 ) )

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static void ApplyNeutralModelToActions( ControllerModel controller )`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- (IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>) ApplyControllerConventions( ControllerModel controllerModel )`
	`45`	`+ Tuple<IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>> ApplyControllerConventions( ControllerModel controllerModel )`
`46`	`46`	`{`
`47`	`47`	`Contract.Requires( controllerModel != null );`
`48`	`48`
`@@ -57,7 +57,7 @@ static void ApplyNeutralModelToActions( ControllerModel controller )`
`57`	`57`	`controllerModel.SetProperty( new ApiVersionModel( VersionNeutral, supportedVersions, deprecatedVersions, advertisedVersions, deprecatedAdvertisedVersions ) );`
`58`	`58`	`}`
`59`	`59`
`60`		`- return (supportedVersions, deprecatedVersions, advertisedVersions, deprecatedAdvertisedVersions);`
	`60`	`+ return Tuple.Create( supportedVersions.AsEnumerable(), deprecatedVersions.AsEnumerable(), advertisedVersions.AsEnumerable(), deprecatedAdvertisedVersions.AsEnumerable() );`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`void MergeControllerAttributesWithConventions( ControllerModel controllerModel )`
`@@ -97,7 +97,7 @@ from version in provider.Versions`
`97`	`97`	`select version );`
`98`	`98`	`}`
`99`	`99`
`100`		`- void ApplyActionConventions( ControllerModel controller, (IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>) controllerVersionInfo )`
	`100`	`+ void ApplyActionConventions( ControllerModel controller, Tuple<IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>> controllerVersionInfo )`
`101`	`101`	`{`
`102`	`102`	`Contract.Requires( controller != null );`
`103`	`103`
`@@ -111,7 +111,7 @@ void ApplyActionConventions( ControllerModel controller, (IEnumerable<ApiVersion`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- void MergeActionAttributesWithConventions( ControllerModel controller, (IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>) controllerVersionInfo )`
	`114`	`+ void MergeActionAttributesWithConventions( ControllerModel controller, Tuple<IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>, IEnumerable<ApiVersion>> controllerVersionInfo )`
`115`	`115`	`{`
`116`	`116`	`Contract.Requires( controller != null );`
`117`	`117`