Ignore cpp test

navin22 · Dec 12, 2016 · e6bd574 · e6bd574
2 parents b621e4c + 0d2b9e0
commit e6bd574
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 111 deletions.
diff --git a/TestPlatform.sln b/TestPlatform.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.25929.2
+VisualStudioVersion = 15.0.26008.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
 EndProject

diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -30,8 +30,8 @@ Param(
     [System.Boolean] $Localized = $false,
 
     [Parameter(Mandatory=$false)]
-    [Alias("real")]
-    [System.Boolean] $RealBuild = $false
+    [Alias("ci")]
+    [Switch] $CIBuild = $false
 )
 
 $ErrorActionPreference = "Stop"
@@ -68,6 +68,7 @@ $TPB_Configuration = $Configuration
 $TPB_TargetRuntime = $TargetRuntime
 $TPB_Version = $Version
 $TPB_VersionSuffix = $VersionSuffix
+$TPB_CIBuild = $CIBuild
 
 # Capture error state in any step globally to modify return code
 $Script:ScriptFailed = $false
@@ -149,7 +150,7 @@ function Invoke-Build
 
     Write-Log ".. .. Build: Source: $TPB_Solution"
     Write-Verbose "$dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version"
-    & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version
+    & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild
     Write-Log ".. .. Build: Complete."
 
     if ($lastExitCode -ne 0) {

diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
@@ -10,8 +10,8 @@
     <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <PublicSign>true</PublicSign>
-    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition="'$(CIBuild)' == '' or '$(CIBuild)' == 'false'">true</PublicSign>
+    <DelaySign Condition="'$(CIBuild)' == 'true'">true</DelaySign>
     <!--<GenerateDocumentationFile>true</GenerateDocumentationFile>-->
     <AssemblyOriginatorKeyFile>$(TestPlatformRoot)scripts/key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs
@@ -366,20 +366,35 @@ internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                 if (string.IsNullOrEmpty(trxFileName))
                 {
                     // save the xml to file in testResultsFolder
-                    trxFileName = this.GetTrxFileName(TrxFileDirectory, this.testRun.RunConfiguration.RunDeploymentRootDirectory);
+                    // [RunDeploymentRootDirectory] Replace white space with underscore from trx file name to make it command line friendly
+                    trxFileName = this.GetTrxFileName(TrxFileDirectory, this.testRun.RunConfiguration.RunDeploymentRootDirectory.Replace(' ', '_'));
                 }
 
-                try
-                {
-                    FileStream fs = File.OpenWrite(trxFileName);
-                    rootElement.OwnerDocument.Save(fs);
-                    String resultsFileMessage = String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.TrxLoggerResultsFile, trxFileName);
-                    Console.WriteLine(resultsFileMessage);
-                }
-                catch (System.UnauthorizedAccessException fileWriteException)
-                {
-                    Console.WriteLine(fileWriteException.Message);
-                }
+                this.PopulateTrxFile(trxFileName, rootElement);
+            }
+        }
+
+        /// <summary>
+        /// populate trx file from the xmlelement
+        /// </summary>
+        /// <param name="trxFileName">
+        /// Trx full path
+        /// </param>
+        /// <param name="rootElement">
+        /// XmlElement.
+        /// </param>
+        internal virtual void PopulateTrxFile(string trxFileName, XmlElement rootElement)
+        {
+            try
+            {
+                FileStream fs = File.OpenWrite(trxFileName);
+                rootElement.OwnerDocument.Save(fs);
+                String resultsFileMessage = String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.TrxLoggerResultsFile, trxFileName);
+                Console.WriteLine(resultsFileMessage);
+            }
+            catch (System.UnauthorizedAccessException fileWriteException)
+            {
+                Console.WriteLine(fileWriteException.Message);
             }
         }
 

diff --git a/...ensions.TrxLogger/Utility/FilterHelper.cs → ...xtensions.TrxLogger/Utility/FileHelper.cs b/...ensions.TrxLogger/Utility/FilterHelper.cs → ...xtensions.TrxLogger/Utility/FileHelper.cs
diff --git a/src/package/package.csproj b/src/package/package.csproj
@@ -1,9 +1,15 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--<Target Name="WorkAroundToSkipPreprocessingBinaries" BeforeTargets="RunProduceContentAssets">
+    <ItemGroup>
+        <FileDependencies>
+         <codeLanguage Condition="'%(FileDependencies.codeLanguage)' == 'any' and '%(FileDependencies.Extension)' == '.dll'">binary</codeLanguage>
+        </FileDependencies>  
+    </ItemGroup>
+  </Target>-->
   <PropertyGroup>
     <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">../../</TestPlatformRoot>
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
     <AssemblyName>package</AssemblyName>
@@ -21,13 +27,11 @@
   <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp1.0'">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
-
   <ItemGroup>
     <Content Include="[Content_Types].xml;extension.vsixmanifest;License.rtf;TestPlatform.ObjectModel.manifest;TestPlatform.ObjectModel.x86.manifest">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>    
+    </Content>
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
@@ -42,16 +46,7 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <!--<PackageReference Include="Microsoft.Internal.TestPlatform.Extensions">
-      <Version>15.0.0</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Internal.Dia">
-      <Version>14.0.0</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>-->
     <PackageReference Include="NuGet.CommandLine">
       <Version>3.4.3</Version>
       <PrivateAssets>All</PrivateAssets>
@@ -60,26 +55,20 @@
       <Version>0.1.2</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="MicroBuild.Core">
+      <Version>0.2.0</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <PackageReference Include="Microsoft.NETCore.App">
       <Version>1.0.0</Version>
     </PackageReference>
   </ItemGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
-
-  <!--<Target Name="WorkAroundToSkipPreprocessingBinaries" BeforeTargets="RunProduceContentAssets">
-    <ItemGroup>
-        <FileDependencies>
-         <codeLanguage Condition="'%(FileDependencies.codeLanguage)' == 'any' and '%(FileDependencies.Extension)' == '.dll'">binary</codeLanguage>
-        </FileDependencies>  
-    </ItemGroup>
-  </Target>-->
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
+</Project>
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs
@@ -22,6 +22,7 @@ public virtual void ChutzpahRunAllTestExecution()
             this.ValidateSummaryStatus(1, 1, 0);
         }
 
+        [Ignore]
         [TestMethod]
         public virtual void CPPRunAllTestExecution()
         {

diff --git a/...tensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj b/...tensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj
@@ -39,6 +39,7 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+	<Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />