Fixes in the generated projects: now all test projects build, though …

…not all tests are passing, only net45 is passing all tests
masbicudo · Dec 15, 2017 · 65aaa14 · 65aaa14
1 parent 831e25e
commit 65aaa14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ProjectGenerator/Program.cs b/ProjectGenerator/Program.cs
@@ -39,6 +39,8 @@ static void Main(string[] args)
                             { $"TestProjectName", TestProjectName },
                             { $"TestProjectGuid", "{6F8C92C5-38F6-460E-9DDA-6334A1575B31}" },
                             { $"TestProjectRefGuid", "{2FDD0DD1-E278-4AEE-9FD1-69702458519C}" },
+                            { $"ProjectRefGuid", "{82EDA29D-A16E-43D9-8A9A-14E34410B9DB}" },
+                            { $"ProjectName", ProjectName },
                             { $"CurrentYear", DateTime.Now.Year },
                         };
 

diff --git a/ProjectGenerator/Templates/net45/%TestProjectName%.net45/%TestProjectName%.net45.csproj b/ProjectGenerator/Templates/net45/%TestProjectName%.net45/%TestProjectName%.net45.csproj
@@ -44,17 +44,25 @@
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     %Begin:FileInclude%<Compile Include="%CurrentValue%" />
-    %End:FileInclude%
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    %End:FileInclude%<Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\%ProjectName%\%ProjectName%.csproj">
+      <Project>%ProjectRefGuid%</Project>
+      <Name>%ProjectName%</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">