Skip to content

Commit 2cd777f

Browse files
author
John Luo
committed
Bust MSBuild cache on retries
1 parent a296fe4 commit 2cd777f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

build/PackageArchive.targets

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
<ItemGroup>
3333
<_FallbackArchiveRestoreSources Include="$(RestoreSources)" />
34+
<!-- Add nuget to restore released packages (i.e. pinned runtimes/metapackages) -->
35+
<_FallbackArchiveRestoreSources Include="https://api.nuget.org/v3/index.json" />
3436
<_FallbackArchiveRestoreSources Include="$(BuildDir)" Condition="Exists($(BuildDir))" />
3537
<_FallbackArchiveRestoreSources Include="$(MetapackageRestoreSource)" Condition="Exists($(MetapackageRestoreSource))" />
3638
</ItemGroup>
@@ -59,7 +61,7 @@
5961
Condition="'$(RestorePassed)' == 'false'"
6062
Projects="$(_WorkRoot)Archive.csproj"
6163
Targets="Restore"
62-
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
64+
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore2" />
6365

6466
<!-- Retry if restore failed -->
6567
<PropertyGroup>
@@ -71,7 +73,7 @@
7173
Condition="'$(RestorePassed)' == 'false'"
7274
Projects="$(_WorkRoot)Archive.csproj"
7375
Targets="Restore"
74-
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
76+
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore3" />
7577

7678
<!-- Retry if restore failed -->
7779
<PropertyGroup>
@@ -83,7 +85,7 @@
8385
Condition="'$(RestorePassed)' == 'false'"
8486
Projects="$(_WorkRoot)Archive.csproj"
8587
Targets="Restore"
86-
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
88+
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore4" />
8789

8890
<!-- Retry if restore failed -->
8991
<PropertyGroup>
@@ -94,7 +96,7 @@
9496
Condition="'$(RestorePassed)' == 'false'"
9597
Projects="$(_WorkRoot)Archive.csproj"
9698
Targets="Restore"
97-
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
99+
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore5" />
98100

99101
<!-- Create the archive -->
100102
<RepoTasks.CreateLzma OutputPath="$(FallbackOutputPath)" Sources="$(FallbackStagingDir)" />

0 commit comments

Comments
 (0)