mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ArPow] Temporary fix for reference packages with broken extension methods (#11092)

Browse source 
* Add some needed prebuilt packages to override temporarily bad ref packages.

* Remove bad ref packages.

* Also don't copy new versions of the bad SBRP packages after the SBRP build.

* Account for missing intermediate packages and different paths.

* Address code review comment.
This commit is contained in:
Chris Rummel 2021-07-09 17:43:30 -05:00 • committed by GitHub
parent 5048e0f143
commit 91afacfc09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
View file

@ -203,8 +203,6 @@
File="$(ArchiveArtifactsTextFile)"
Lines="@(ArtifactUrls)"
Overwrite="true" />
<MakeDir Directories="$(TarballRootDir)packages/prebuilt" />
</Target>
</Project>

BIN
src/SourceBuild/tarball/content/packages/prebuilt/Microsoft.NETCore.App.2.0.3.nupkg Normal file
View file

Binary file not shown.

BIN
src/SourceBuild/tarball/content/packages/prebuilt/Microsoft.NETCore.App.2.1.0.nupkg Normal file
View file

Binary file not shown.

BIN
src/SourceBuild/tarball/content/packages/prebuilt/Microsoft.NETCore.App.Ref.3.1.0.nupkg Normal file
View file

Binary file not shown.

BIN
src/SourceBuild/tarball/content/packages/prebuilt/NETStandard.Library.2.0.3.nupkg Normal file
View file

Binary file not shown.

8
src/SourceBuild/tarball/content/repos/Directory.Build.targets
View file

@ -482,8 +482,14 @@
DestinationDirectory="$(SourceBuiltPackagesPath)extractArtifacts/"
OverwriteDestination="true" />
<ItemGroup>
<ItemGroup Condition="'@(_BuiltIntermediatePackages)' != ''">
<SourceBuiltNupkgFiles Include="$(SourceBuiltPackagesPath)extractArtifacts/**/*.nupkg" />
<!-- don't copy some packages that we specifically want to override for now due to bad reference package generation -->
<!-- relevant issues: https://github.com/dotnet/runtime/issues/44646, https://github.com/dotnet/runtime/issues/45183, https://github.com/dotnet/runtime/issues/45417 -->
<!-- these should be fixed for 6.0 proper -->
<PrebuiltPackagesToUse Include="$(PrebuiltPackagesPath)/*.nupkg" />
<SourceBuiltNupkgFilesToSkip Include="@(PrebuiltPackagesToUse -> '$(SourceBuiltPackagesPath)extractArtifacts/artifacts/%(Filename)%(Extension)')" />
<SourceBuiltNupkgFiles Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))" Remove="@(SourceBuiltNupkgFilesToSkip)" />
</ItemGroup>
<Copy

12
src/SourceBuild/tarball/content/tools-local/init-build.proj
View file

@ -54,6 +54,18 @@
<Move SourceFiles="@(UnpackedSourceBuildReferencePackages)" DestinationFiles="$(ReferencePackagesDir)%(Filename)%(Extension)" />
<!-- remove some reference packages that are generated incorrectly and instead use the prebuilt checked-in version instead -->
<!-- relevant issues: https://github.com/dotnet/runtime/issues/44646, https://github.com/dotnet/runtime/issues/45183,
https://github.com/dotnet/runtime/issues/45417. this should be fixed for the 6.0 release. -->
<ItemGroup>
<PrebuiltPackagesToUse Include="$(PrebuiltPackagesPath)/*.nupkg" />
<ReferencePackagesToOverride Include="@(PrebuiltPackagesToUse -> '$(ReferencePackagesDir)/%(Filename)%(Extension)')" />
</ItemGroup>
<Message Text="Overriding @(ReferencePackagesToOverride) with @(PrebuiltPackagesToUse)" Importance="High" />
<Delete Files="@(ReferencePackagesToOverride)" />
<!-- Setup the PackageVersions.props file to be a combination of SourceBuilt and GennedPackages -->
<Copy SourceFiles="$(PrebuiltSourceBuiltPackagesPath)PackageVersions.props" DestinationFiles="$(IntermediatePath)SourceBuiltPackageVersions.props" />