Added ValueTuple to RubberduckTests.csproj; updated MockVbeBuilder.BuildFromStdModules signature.

Author: retailcoder

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.sln.docstates
 *.csproj.user
+*.csproj.DotSettings
 
 # External NuGet Packages
 [Pp]ackages/

RetailCoder.VBE/Rubberduck.csproj.DotSettings

@@ -1,4 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui_005Crefactorings_005Cextractinterface/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=unittesting_005Cstubs/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

RubberduckTests/Inspections/IllegalAnnotationsInspectionTests.cs

@@ -68,7 +68,7 @@ End Sub
 Option Explicit
 '@Folder(""Legal"")
 ";
-            var vbe = MockVbeBuilder.BuildFromStdModules(Tuple.Create("Module1", inputCode1), Tuple.Create("Module2", inputCode2));
+            var vbe = MockVbeBuilder.BuildFromStdModules(("Module1", inputCode1), ("Module2", inputCode2));
             var state = MockParser.CreateAndParse(vbe.Object);
 
             var inspection = new IllegalAnnotationInspection(state);

RubberduckTests/Mocks/MockVbeBuilder.cs

@@ -151,16 +151,14 @@ public Mock<IVBE> Build()
         /// <summary>
         /// Builds a mock VBE containing multiple standard modules.
         /// </summary>
-        /// <param name="modules">Each tuple is [name, content].</param>
-        /// <returns></returns>
-        public static Mock<IVBE> BuildFromStdModules(params Tuple<string, string>[] modules)
+        public static Mock<IVBE> BuildFromStdModules(params (string name, string content)[] modules)
         {
             var vbeBuilder = new MockVbeBuilder();
 
             var builder = vbeBuilder.ProjectBuilder(TestProjectName, ProjectProtection.Unprotected);
             foreach (var module in modules)
             {
-                builder.AddComponent(module.Item1, ComponentType.StandardModule, module.Item2);
+                builder.AddComponent(module.name, ComponentType.StandardModule, module.content);
             }
 
             var project = builder.Build();

RubberduckTests/RubberduckTests.csproj

@@ -61,6 +61,9 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />

RubberduckTests/packages.config

@@ -4,4 +4,5 @@
   <package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net45" />
   <package id="NLog" version="4.0.1" targetFramework="net45" />
-</packages>
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net45" />
+</packages>