Fix CI script

dotnet · Dec 4, 2018 · 5477b42 · 5477b42
1 parent 23d317e
commit 5477b42
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -351,7 +351,7 @@
     <NetFxRefPath>$(RefRootPath)netfx/</NetFxRefPath>
     <GlobalToolsDir>$(ArtifactsDir)tools/</GlobalToolsDir>
 
-    <!-- Helix proprties -->
+    <!-- Helix properties -->
     <OSPlatformConfig>$(OSGroup).$(Platform).$(ConfigurationGroup)</OSPlatformConfig>
     <AnyOSPlatformConfig>AnyOS.AnyCPU.$(ConfigurationGroup)</AnyOSPlatformConfig>
     <UnixPlatformConfig>Unix.$(Platform).$(ConfigurationGroup)</UnixPlatformConfig>

diff --git a/buildpipeline/windows.groovy b/buildpipeline/windows.groovy
@@ -75,7 +75,8 @@ simpleNode('windows.10.amd64.clientrs4.devex.open') {
                     targetHelixQueues = ['Windows.10.Amd64.ClientRS4.Open']
                 }
 
-                powershell -command ".\\eng\\common\\msbuild.ps1 \\src\\upload-tests.proj /p:TargetGroup=${params.TGroup} /p:ArchGroup=${params.AGroup} /p:ConfigurationGroup=${params.CGroup} /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:HelixJobType=test/functional/cli/ /p:HelixSource=${helixSource} /p:BuildMoniker=${helixBuild} /p:HelixCreator=${helixCreator} /p:CloudDropAccountName=dotnetbuilddrops /p:CloudResultsAccountName=dotnetjobresults /p:CloudDropAccessToken=%CloudDropAccessToken% /p:CloudResultsAccessToken=%OutputCloudResultsAccessToken% /p:HelixApiEndpoint=https://helix.dot.net/api/2017-04-14/jobs /p:TargetQueues=\"${targetHelixQueues.join(',')}\" /p:HelixLogFolder= /p:HelixLogFolder=${WORKSPACE}\\${logFolder}\\ /p:HelixCorrelationInfoFileName=SubmittedHelixRuns.txt /p:MaxRetryCount=3"
+                // We should just use .\eng\common\msbuild.ps1 here instead.
+                bat "set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1& .\\.dotnet\\dotnet.exe msbuild /nologo .\\src\\upload-tests.proj /p:TargetGroup=${params.TGroup} /p:ArchGroup=${params.AGroup} /p:ConfigurationGroup=${params.CGroup} /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:HelixJobType=test/functional/cli/ /p:HelixSource=${helixSource} /p:BuildMoniker=${helixBuild} /p:HelixCreator=${helixCreator} /p:CloudDropAccountName=dotnetbuilddrops /p:CloudResultsAccountName=dotnetjobresults /p:CloudDropAccessToken=%CloudDropAccessToken% /p:CloudResultsAccessToken=%OutputCloudResultsAccessToken% /p:HelixApiEndpoint=https://helix.dot.net/api/2017-04-14/jobs /p:TargetQueues=\\\"${targetHelixQueues.join(',')}\\\" /p:HelixLogFolder=${WORKSPACE}\\${logFolder}\\ /p:HelixCorrelationInfoFileName=SubmittedHelixRuns.txt /p:MaxRetryCount=3"
 
                 submittedHelixJson = readJSON file: "${logFolder}\\SubmittedHelixRuns.txt"
             }

diff --git a/src/System.ComponentModel.TypeConverter/tests/AddingNewEventArgsTests.cs b/src/System.ComponentModel.TypeConverter/tests/AddingNewEventArgsTests.cs
@@ -8,12 +8,6 @@ namespace System.ComponentModel.Tests
 {
     public class AddingNewEventArgsTests
     {
-        [Fact]
-        public void C()
-        {
-            var x = TypeDescriptor.GetConverter(typeof(Nullable<Boolean>));
-        }
-
         [Fact]
         public void Ctor_Default()
         {

diff --git a/src/tests.builds b/src/tests.builds
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <!-- Run code coverage if flag passed in and only for netcoreapp. -->
-  <PropertyGroup Condition="'$(Coverage)' == 'true' AND '$(BuildingNETCoreAppVertical)' == 'true'">
+  <PropertyGroup Condition="'$(Coverage)' == 'true' AND '$(SkipTests)' != 'true' AND '$(BuildingNETCoreAppVertical)' == 'true'">
     <EnableFullCoverageReportTarget>true</EnableFullCoverageReportTarget>
     <GenerateFullCoverageReport>true</GenerateFullCoverageReport>
     <CoverageReportInputPath>$(TestWorkingDir)**/coverage.xml</CoverageReportInputPath>

diff --git a/src/upload-tests.proj b/src/upload-tests.proj
@@ -28,11 +28,14 @@
     <UseContinuationRunner Condition="'$(ArchGroup)'=='arm' AND '$(TargetGroup)'=='uapaot'">true</UseContinuationRunner>
     <SecondaryPayloadDir   Condition="'$(ArchGroup)'=='arm' AND '$(TargetGroup)'=='uapaot'">%HELIX_WORKITEM_PAYLOAD%\native</SecondaryPayloadDir>
 
-    <AnyOSTestArchivesRoot>$(TestArchiveTestsRoot)$(AnyOSPlatformConfig)/</AnyOSTestArchivesRoot>
-    <UnixTestArchivesRoot>$(TestArchiveTestsRoot)$(UnixPlatformConfig)/</UnixTestArchivesRoot>
+    <TestArchiveTestsAnyOSDir>$(TestArchiveTestsRoot)$(AnyOSPlatformConfig)/</TestArchiveTestsAnyOSDir>
+    <TestArchiveTestsUnixDir>$(TestArchiveTestsRoot)$(UnixPlatformConfig)/</TestArchiveTestsUnixDir>
     <!-- Finally, these archives represent the zips of tests that are OSPlatform specific 
          This is used by CloudTest.Helix.Targets to generate relative blob paths for archives. -->
-    <TestArchivesRoot>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchivesRoot>
+    <TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
+
+    <!-- Obsolete: Remove with new Helix SDK. -->
+    <ArchivesRoot>$(TestArchiveRoot)</ArchivesRoot>
 
     <!-- test-runtime-*.zip is the new-for-.NET-Core-2.0 way to pass along the runtime  -->
     <TestRuntimeArchiveFilename>test-runtime-$(BuildConfiguration).zip</TestRuntimeArchiveFilename>
@@ -83,14 +86,14 @@
     <!-- Gather the test archives for this build 
          If you change binplacing behavior and official runs break, 
          this is a good place to check.-->
-    <Message Text="Using OS-Specific test archives from: $(TestArchivesRoot)" />
-    <Message Text="Using AnyOS test archives from: $(AnyOSTestArchivesRoot)" />
-    <Message Condition="'$(TargetsUnix)' == 'true'"  Text="Using Unix test archives from: $(UnixTestArchivesRoot)" />
+    <Message Text="Using OS-Specific test archives from: $(TestArchiveTestsDir)" />
+    <Message Text="Using AnyOS test archives from: $(TestArchiveTestsAnyOSDir)" />
+    <Message Condition="'$(TargetsUnix)' == 'true'"  Text="Using Unix test archives from: $(TestArchiveTestsUnixDir)" />
     <ItemGroup>
-      <HelixWorkItem Include="$(TestArchivesRoot)*.zip" />
-      <HelixWorkItem Include="$(AnyOSTestArchivesRoot)*.zip" />
+      <HelixWorkItem Include="$(TestArchiveTestsDir)*.zip" />
+      <HelixWorkItem Include="$(TestArchiveTestsAnyOSDir)*.zip" />
       <!-- Only include Unix folders if supported by the target OS -->
-      <HelixWorkItem Condition="'$(TargetsUnix)' == 'true'" Include="$(UnixTestArchivesRoot)*.zip" />
+      <HelixWorkItem Condition="'$(TargetsUnix)' == 'true'" Include="$(TestArchiveTestsUnixDir)*.zip" />
     </ItemGroup>
     <Message Text="Full test archive collection : @(HelixWorkItem)" Importance="Low" />