solution improvements

schwaerz · Apr 23, 2016 · 8c28c47 · 8c28c47
1 parent d723da8
commit 8c28c47
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -158,4 +158,3 @@ $RECYCLE.BIN/
 
 *.gta_testdurations
 OpenCover/
-/GoogleTestAdapter/VsPackage.Tests/TestErrors
diff --git a/GoogleTestAdapter/GoogleTestAdapter.sln b/GoogleTestAdapter/GoogleTestAdapter.sln
@@ -50,6 +50,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsPackage.Tests.Unit", "VsPackage.Tests.Unit\VsPackage.Tests.Unit.csproj", "{87F26371-0005-4301-9C49-A6DF4F06B81C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -104,4 +106,12 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B06C696E-E458-490A-AC44-9E4F460DBAFE} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
+		{A3ADB538-F3DF-4C5F-960D-11B6DF66A1A3} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
+		{941BA1B7-2CF4-4D5C-8680-5C73CD6FE197} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
+		{B9C827B5-DC90-4A78-B477-852EAE1196AF} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
+		{032BEBF7-2D2B-4CFD-B53D-E3D21B3AC9D6} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
+		{87F26371-0005-4301-9C49-A6DF4F06B81C} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
+	EndGlobalSection
 EndGlobal
diff --git a/GoogleTestAdapter/VsPackage.Tests/.gitignore b/GoogleTestAdapter/VsPackage.Tests/.gitignore
@@ -0,0 +1 @@
+TestErrors
diff --git a/GoogleTestAdapter/VsPackage/VsPackage.csproj b/GoogleTestAdapter/VsPackage/VsPackage.csproj
@@ -234,7 +234,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="LICENSE.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Resources\gtest-logo.ico" />
@@ -247,7 +247,7 @@
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>
     <Content Include="Resources\gtest-logo.gif">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Resources\Screenshot.png" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -158,4 +158,3 @@ $RECYCLE.BIN/

		*.gta_testdurations
		OpenCover/
		/GoogleTestAdapter/VsPackage.Tests/TestErrors