Procházet zdrojové kódy

Fix RunHelix script (#34601)

Brennan před 4 roky
rodič
revize
f608a19915
2 změnil soubory, kde provedl 5 přidání a 3 odebrání
  1. 4 2
      eng/helix/helix.proj
  2. 1 1
      eng/scripts/RunHelix.ps1

+ 4 - 2
eng/helix/helix.proj

@@ -74,7 +74,9 @@
     <HelixProperties Condition="'$(RunQuarantinedTests)' != 'true'" Include="runType" Value="unquarantined" />
     <HelixProperties Condition="'$(RunQuarantinedTests)' != 'true'" Include="runType" Value="unquarantined" />
   </ItemGroup>
   </ItemGroup>
 
 
-  <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather">
+  <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather"
+    Condition="'$(DoNotRequireSharedFxHelix)' != 'true' OR
+    EXISTS('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg')">
     <MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
     <MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
         Properties="DisableYarnCheck=true;ExcludeFromBuild=false"
         Properties="DisableYarnCheck=true;ExcludeFromBuild=false"
         Targets="_GetPackageVersionInfo"
         Targets="_GetPackageVersionInfo"
@@ -87,7 +89,7 @@
     </PropertyGroup>
     </PropertyGroup>
 
 
     <!-- Use package because .dotnet/ folder doesn't contain RuntimeList.xml file and SharedFxTests checks that. -->
     <!-- Use package because .dotnet/ folder doesn't contain RuntimeList.xml file and SharedFxTests checks that. -->
-    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg')"
+    <Unzip
        SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg"
        SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg"
        DestinationFolder="$(OutputPath)\SharedFx.Unzip" />
        DestinationFolder="$(OutputPath)\SharedFx.Unzip" />
     <ItemGroup>
     <ItemGroup>

+ 1 - 1
eng/scripts/RunHelix.ps1

@@ -56,4 +56,4 @@ $HelixQueues = $HelixQueues -replace ";", "%3B"
 dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true `
 dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true `
     /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests `
     /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests `
     /p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log `
     /p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log `
-    @MSBuildArguments
+    /p:DoNotRequireSharedFxHelix=true @MSBuildArguments