fix npm flake (#13106)
This commit is contained in:
parent
74c09470c6
commit
ed360e171a
|
|
@ -171,8 +171,13 @@ try {
|
||||||
# Redirect stderr to stdout because PowerShell does not consistently handle output to stderr
|
# Redirect stderr to stdout because PowerShell does not consistently handle output to stderr
|
||||||
$changedFiles = & cmd /c 'git --no-pager diff --ignore-space-at-eol --name-only 2>nul'
|
$changedFiles = & cmd /c 'git --no-pager diff --ignore-space-at-eol --name-only 2>nul'
|
||||||
|
|
||||||
|
# Temporary: Disable check for blazor js file
|
||||||
|
$changedFilesExclusion = "src/Components/Web.JS/dist/Release/blazor.server.js"
|
||||||
|
|
||||||
if ($changedFiles) {
|
if ($changedFiles) {
|
||||||
foreach ($file in $changedFiles) {
|
foreach ($file in $changedFiles) {
|
||||||
|
if ($file -eq $changedFilesExclusion) {continue}
|
||||||
|
|
||||||
$filePath = Resolve-Path "${repoRoot}/${file}"
|
$filePath = Resolve-Path "${repoRoot}/${file}"
|
||||||
LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath
|
LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath
|
||||||
& git --no-pager diff --ignore-space-at-eol $filePath
|
& git --no-pager diff --ignore-space-at-eol $filePath
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,6 @@
|
||||||
<NpmTestArgs>test</NpmTestArgs>
|
<NpmTestArgs>test</NpmTestArgs>
|
||||||
<Configuration Condition="'$(Configuration)' == '' AND '$(ContinuousIntegrationBuild)' == 'true'">Release</Configuration>
|
<Configuration Condition="'$(Configuration)' == '' AND '$(ContinuousIntegrationBuild)' == 'true'">Release</Configuration>
|
||||||
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
|
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
|
||||||
|
<PackOnBuild>false</PackOnBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,9 @@
|
||||||
BuildInParallel="true" />
|
BuildInParallel="true" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
|
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)">
|
||||||
|
<CallTarget Targets="_Pack" Condition="'$(PackOnBuild)' == 'true'" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
<Target Name="_Build"
|
<Target Name="_Build"
|
||||||
Condition="'$(IsBuildable)' != 'false'"
|
Condition="'$(IsBuildable)' != 'false'"
|
||||||
|
|
@ -66,11 +68,12 @@
|
||||||
</PackDependsOn>
|
</PackDependsOn>
|
||||||
<PackDependsOn Condition="'$(NoBuild)' != 'true'">
|
<PackDependsOn Condition="'$(NoBuild)' != 'true'">
|
||||||
$(PackDependsOn);
|
$(PackDependsOn);
|
||||||
Build
|
Build;
|
||||||
|
_Pack
|
||||||
</PackDependsOn>
|
</PackDependsOn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)">
|
<Target Name="_Pack" Condition="'$(IsPackable)' == 'true'" >
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_PackageTargetPath>$(MSBuildProjectDirectory)\$(PackageFileName)</_PackageTargetPath>
|
<_PackageTargetPath>$(MSBuildProjectDirectory)\$(PackageFileName)</_PackageTargetPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
@ -88,6 +91,8 @@
|
||||||
<OnError ExecuteTargets="_RestoreBackupPackageJsonFile" />
|
<OnError ExecuteTargets="_RestoreBackupPackageJsonFile" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)" />
|
||||||
|
|
||||||
<Target Name="_RestoreBackupPackageJsonFile">
|
<Target Name="_RestoreBackupPackageJsonFile">
|
||||||
<Move SourceFiles="$(_BackupPackageJson)" DestinationFiles="$(PackageJson)" />
|
<Move SourceFiles="$(_BackupPackageJson)" DestinationFiles="$(PackageJson)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -6,6 +6,7 @@
|
||||||
<IsPackable>true</IsPackable>
|
<IsPackable>true</IsPackable>
|
||||||
<IsTestProject>false</IsTestProject>
|
<IsTestProject>false</IsTestProject>
|
||||||
<IsShippingPackage>true</IsShippingPackage>
|
<IsShippingPackage>true</IsShippingPackage>
|
||||||
|
<PackOnBuild>true</PackOnBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue