Fixes from merge prior merges.

staxmanade · Dec 16, 2011 · b7433e0 · b7433e0
1 parent fba1ee0
commit b7433e0
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 211 deletions.
diff --git a/default.ps1 b/default.ps1
@@ -32,6 +32,7 @@ properties {
 	#  - 3. Add the version to the MicrosoftTestingFrameworkVersion enum in the project
 	$microsoft_silverlight_testing_versions = @(
 			'MSTest2011December'
+			'MSTest2011October'
 			'MSTest2011June'
 			'MSTest2011Feb'
 			'MSTest2010March'
@@ -808,7 +809,7 @@ Task test-multiple-one-xap-one-dll {
 
 Task test-multiple-two-dlls {
 	$scriptFile = GetTemporaryXmlFile;
-	execStatLight "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.MSTest\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.MSTest-SL5.dll" "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.OtherTestAssembly\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.OtherTestAssembly.dll" "-o=MSTest" "-v=April2010" "-r=$scriptFile" 
+	execStatLight "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.MSTest\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.MSTest-SL5.dll" "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.OtherTestAssembly\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.OtherTestAssembly.dll" "-o=MSTest" "-v=MSTest2010April" "-r=$scriptFile" 
 
 	if(Is-Release-Build){
 		Assert-statlight-xml-report-results -message "test-multiple-two-dlls" -resultsXmlTextFilePath $scriptFile -expectedPassedCount 12 -expectedFailedCount 4 -expectedIgnoredCount 2 -expectedSystemGeneratedfailedCount 1
@@ -898,9 +899,9 @@ function Assert-statlight-xml-report-results
 }
 
 Task test-all-mstest-version-acceptance-tests {
-#	@( 'October2011' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
-	@( 'October2011' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
-#	$microsoft_silverlight_testing_versions | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
+##	@( 'MSTest2011October' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
+#	@( 'MSTest2011October' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
+	$microsoft_silverlight_testing_versions | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
 }
 
 Task test-custom-test-provider {
@@ -993,18 +994,11 @@ Task package-release -depends clean-release {
 	$versionNumber = $versionNumber + "-" + $commit
 
 	$versionBuildPath = "$release_dir\$versionNumber"
-
-	$expectedFilesToInclude = @(
+
+	$expectedFilesToInclude = ($microsoft_silverlight_testing_versions | select { "StatLight.Client.For.$_.xap"})
+	$expectedFilesToInclude += @(
 			'Ionic.Zip.Reduced.dll'
 			'Microsoft.Silverlight.Testing.License.txt'
-			'StatLight.Client.For.July2009.xap'
-			'StatLight.Client.For.March2010.xap'
-			'StatLight.Client.For.April2010.xap'
-			'StatLight.Client.For.May2010.xap'
-			'StatLight.Client.For.November2009.xap'
-			'StatLight.Client.For.October2009.xap'
-			'StatLight.Client.For.June2011.xap'
-			'StatLight.Client.For.October2011.xap'
 			'StatLight.Client.For.UnitDrivenDecember2009.xap'
 			'StatLight.Client.For.XUnitContribApril2011.xap'
 			'StatLight.Core.dll'

diff --git a/default.ps1.orig b/default.ps1.orig
@@ -32,6 +32,10 @@ properties {
 	#  - 3. Add the version to the MicrosoftTestingFrameworkVersion enum in the project
 	$microsoft_silverlight_testing_versions = @(
 <<<<<<< HEAD
+			'MSTest2011December'
+=======
+			'MSTest2011October'
+>>>>>>> Fixes from merge prior merges.
 			'MSTest2011June'
 			'MSTest2011Feb'
 			'MSTest2010March'
@@ -43,20 +47,6 @@ properties {
 			'MSTest2009July'
 			'MSTest2009October'
 			'MSTest2009November'
-=======
-			'October2011'
-			'June2011'
-			'Feb2011'
-			'March2010'
-			'April2010'
-			'May2010'
-
-#			'December2008'
-#			'March2009'
-			'July2009'
-			'October2009'
-			'November2009'
->>>>>>> Added October 2011 version of Microsoft.Silverlight.Testing
 		)
 }
 
@@ -822,7 +812,7 @@ Task test-multiple-one-xap-one-dll {
 
 Task test-multiple-two-dlls {
 	$scriptFile = GetTemporaryXmlFile;
-	execStatLight "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.MSTest\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.MSTest-SL5.dll" "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.OtherTestAssembly\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.OtherTestAssembly.dll" "-o=MSTest" "-v=April2010" "-r=$scriptFile" 
+	execStatLight "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.MSTest\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.MSTest-SL5.dll" "-d=.\src\IntegrationTests\StatLight.IntegrationTests.Silverlight.OtherTestAssembly\Bin\$build_configuration\StatLight.IntegrationTests.Silverlight.OtherTestAssembly.dll" "-o=MSTest" "-v=MSTest2010April" "-r=$scriptFile" 
 
 	if(Is-Release-Build){
 		Assert-statlight-xml-report-results -message "test-multiple-two-dlls" -resultsXmlTextFilePath $scriptFile -expectedPassedCount 12 -expectedFailedCount 4 -expectedIgnoredCount 2 -expectedSystemGeneratedfailedCount 1
@@ -912,9 +902,9 @@ function Assert-statlight-xml-report-results
 }
 
 Task test-all-mstest-version-acceptance-tests {
-#	@( 'October2011' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
-	@( 'October2011' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
-#	$microsoft_silverlight_testing_versions | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
+##	@( 'MSTest2011October' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
+#	@( 'MSTest2011October' ) | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
+	$microsoft_silverlight_testing_versions | foreach { Execute-MSTest-Version-Acceptance-Tests-AllSL $_ }
 }
 
 Task test-custom-test-provider {
@@ -1007,32 +997,13 @@ Task package-release -depends clean-release {
 	$versionNumber = $versionNumber + "-" + $commit
 
 	$versionBuildPath = "$release_dir\$versionNumber"
-
-	$expectedFilesToInclude = @(
+
+	$expectedFilesToInclude = ($microsoft_silverlight_testing_versions | select { "StatLight.Client.For.$_.xap"})
+	$expectedFilesToInclude += @(
 			'Ionic.Zip.Reduced.dll'
 			'Microsoft.Silverlight.Testing.License.txt'
-<<<<<<< HEAD
-			'StatLight.Client.For.MSTest2009July.xap'
-			'StatLight.Client.For.MSTest2010March.xap'
-			'StatLight.Client.For.MSTest2010April.xap'
-			'StatLight.Client.For.MSTest2010May.xap'
-			'StatLight.Client.For.MSTest2009November.xap'
-			'StatLight.Client.For.MSTest2009October.xap'
-			'StatLight.Client.For.MSTest2011June.xap'
-			'StatLight.Client.For.UnitDriven2009December.xap'
-			'StatLight.Client.For.XUnitContrib2011April.xap'
-=======
-			'StatLight.Client.For.July2009.xap'
-			'StatLight.Client.For.March2010.xap'
-			'StatLight.Client.For.April2010.xap'
-			'StatLight.Client.For.May2010.xap'
-			'StatLight.Client.For.November2009.xap'
-			'StatLight.Client.For.October2009.xap'
-			'StatLight.Client.For.June2011.xap'
-			'StatLight.Client.For.October2011.xap'
 			'StatLight.Client.For.UnitDrivenDecember2009.xap'
 			'StatLight.Client.For.XUnitContribApril2011.xap'
->>>>>>> Added October 2011 version of Microsoft.Silverlight.Testing
 			'StatLight.Core.dll'
 			'StatLight.EULA.txt'
 			'StatLight.exe'

diff --git a/...ber2011/Microsoft.Silverlight.Testing.dll → ...October/Microsoft.Silverlight.Testing.dll b/...ber2011/Microsoft.Silverlight.Testing.dll → ...October/Microsoft.Silverlight.Testing.dll
diff --git a/....QualityTools.UnitTesting.Silverlight.dll → ....QualityTools.UnitTesting.Silverlight.dll b/....QualityTools.UnitTesting.Silverlight.dll → ....QualityTools.UnitTesting.Silverlight.dll
diff --git a/...egrationTests.Silverlight.MSTest/StatLight.IntegrationTests.Silverlight.MSTest-SL5.csproj b/...egrationTests.Silverlight.MSTest/StatLight.IntegrationTests.Silverlight.MSTest-SL5.csproj
@@ -95,12 +95,12 @@
     <None Include="Properties\AppManifest.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
   <ProjectExtensions>
     <VisualStudio>

diff --git a/...erlight.OtherTestAssembly/StatLight.IntegrationTests.Silverlight.OtherTestAssembly.csproj b/...erlight.OtherTestAssembly/StatLight.IntegrationTests.Silverlight.OtherTestAssembly.csproj
@@ -59,7 +59,7 @@
       <HintPath>..\..\lib\Silverlight\Microsoft\May2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
     </Reference>
     <Reference Include="Raven.Tests.Silverlight.UnitTestProvider">
-      <HintPath>..\..\lib\Silverlight\RavenCustomSilverlightUnitTestProvider\Raven.Tests.Silverlight.UnitTestProvider.dll</HintPath>
+      <HintPath>..\..\..\lib\Silverlight\RavenCustomSilverlightUnitTestProvider\Raven.Tests.Silverlight.UnitTestProvider.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="mscorlib" />

diff --git a/...iderTests/MSTest/when_testing_the_runner_with_MSTest_tests_filtered_by_certain_methods.cs b/...iderTests/MSTest/when_testing_the_runner_with_MSTest_tests_filtered_by_certain_methods.cs
@@ -37,7 +37,7 @@ protected override ClientTestRunConfiguration ClientTestRunConfiguration
 
         protected override string GetTestXapPath()
         {
-            return TestXapFileLocations.MSTest;
+            return TestXapFileLocations.MSTestSL4;
         }
     }
 

diff --git a/src/IntegrationTests/StatLight.IntegrationTests/ProviderTests/TestXapFileLocations.cs b/src/IntegrationTests/StatLight.IntegrationTests/ProviderTests/TestXapFileLocations.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.IO;
+using System.IO;
 
 namespace StatLight.IntegrationTests.ProviderTests
 {
@@ -13,8 +11,9 @@ private static string GetBaseDirectory()
         }
 
         private static readonly string CurrentDirectory = GetBaseDirectory();
-        public static string MSTest = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.MSTest.xap";
         public static string MSTestSL3 = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.MSTest-SL3.xap";
+        public static string MSTestSL4 = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.MSTest-SL4.xap";
+        public static string MSTestSL5 = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.MSTest-SL5.xap";
         public static string NUnit = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.NUnit.xap";
         public static string UnitDriven = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.UnitDriven.xap";
         public static string UnitDrivenSl3 = CurrentDirectory + "StatLight.IntegrationTests.Silverlight.UnitDriven-SL3.xap";

diff --git a/src/StatLight.Core/WebServer/XapHost/XapHostType.cs b/src/StatLight.Core/WebServer/XapHost/XapHostType.cs
@@ -14,7 +14,8 @@ public enum XapHostType
 
         MSTest2011Feb,
         MSTest2011June,
-        MSTestDecember2011,
+        MSTest2011October,
+        MSTest2011December,
 
         UnitDriven2009December,
         XunitContrib2011April
@@ -37,7 +38,8 @@ public enum MicrosoftTestingFrameworkVersion
 
         MSTest2011Feb = 9,
         MSTest2011June = 10,
-        MSTest2011December = 11,
+        MSTest2011October = 11,
+        MSTest2011December = 12,
 
         //FYI: go update StatLightClientXapNames.Default value when changing the default runner...
     }

diff --git a/src/StatLight.Core/WebServer/XapInspection/TestFileCollection.cs b/src/StatLight.Core/WebServer/XapInspection/TestFileCollection.cs
@@ -86,7 +86,7 @@ public void DebugWrite(ILogger logger)
                 // http://www.jeff.wilcox.name/2011/06/updated-ut-mango-bits/
                 new { Version = MicrosoftTestingFrameworkVersion.MSTest2011June, MicrosoftSilverlightTestingHash = "b43f74adec6e911ce0e01d882fd2958a33f8c5fd", Supported = true, VisualStudioQualityHash = "303e7eb91b26dd6aad394dd4727351485068c8be", },
 
-                new { Version = MicrosoftTestingFrameworkVersion.October2011, MicrosoftSilverlightTestingHash = "86ea4ad64113131926dad8b08a623f282df8e649", Supported = true, VisualStudioQualityHash = "14b756f21e7f94ed6201732ccf6fdd97a7fdfe9f", },
+                new { Version = MicrosoftTestingFrameworkVersion.MSTest2011October, MicrosoftSilverlightTestingHash = "86ea4ad64113131926dad8b08a623f282df8e649", Supported = true, VisualStudioQualityHash = "14b756f21e7f94ed6201732ccf6fdd97a7fdfe9f", },
             };
 
 

diff --git a/...egrationTests.Silverlight.MSTest/StatLight.IntegrationTests.Silverlight.MSTest-SL5.csproj b/...egrationTests.Silverlight.MSTest/StatLight.IntegrationTests.Silverlight.MSTest-SL5.csproj
diff --git a/src/StatLight.sln b/src/StatLight.sln
@@ -95,7 +95,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatLight.IntegrationTests.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatLight.IntegrationTests.Silverlight.NoRefToMicrosoftSLTesting", "IntegrationTests\StatLight.IntegrationTests.Silverlight.NoRefToMicrosoftSLTesting\StatLight.IntegrationTests.Silverlight.NoRefToMicrosoftSLTesting.csproj", "{406BE1DE-C4D3-4CDD-9E1A-AD425F81AB9F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatLight.IntegrationTests.Silverlight.MSTest-SL5", "StatLight.IntegrationTests.Silverlight.MSTest\StatLight.IntegrationTests.Silverlight.MSTest-SL5.csproj", "{D563A469-E386-42AF-A66E-99AC16B3C494}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatLight.IntegrationTests.Silverlight.MSTest-SL5", "IntegrationTests\StatLight.IntegrationTests.Silverlight.MSTest\StatLight.IntegrationTests.Silverlight.MSTest-SL5.csproj", "{D563A469-E386-42AF-A66E-99AC16B3C494}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -356,11 +356,9 @@ Global
 		{D563A469-E386-42AF-A66E-99AC16B3C494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D563A469-E386-42AF-A66E-99AC16B3C494}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D563A469-E386-42AF-A66E-99AC16B3C494}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D563A469-E386-42AF-A66E-99AC16B3C494}.Debug|x86.Build.0 = Debug|Any CPU
 		{D563A469-E386-42AF-A66E-99AC16B3C494}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D563A469-E386-42AF-A66E-99AC16B3C494}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D563A469-E386-42AF-A66E-99AC16B3C494}.Release|x86.ActiveCfg = Release|Any CPU
-		{D563A469-E386-42AF-A66E-99AC16B3C494}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
-Original file line number
+Diff line change
@@ Expand Up @@
             protected override string GetTestXapPath()
             {
-                return TestXapFileLocations.MSTest;
+                return TestXapFileLocations.MSTestSL4;
             }
         }
@@ Expand Down @@