File tree 2 files changed +26
-5
lines changed
Installer/redist-installer/targets
Tasks/Microsoft.NET.Build.Tasks
2 files changed +26
-5
lines changed Original file line number Diff line number Diff line change 202
202
<RelativeLayoutPath >packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath >
203
203
</BundledLayoutPackage >
204
204
205
+ <BundledLayoutPackage Include =" MicrosoftDotNetILCompilerPackNupkg" Condition =" '$(BundleNativeAotCompiler)' == 'true'" >
206
+ <PackageName >runtime.$(SharedFrameworkRid).Microsoft.DotNet.ILCompiler</PackageName >
207
+ <PackageVersion >$(MicrosoftNETCoreAppRuntimePackageVersion)</PackageVersion >
208
+ <TargetFramework >$(TargetFramework)</TargetFramework >
209
+ <RelativeLayoutPath >packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath >
210
+ </BundledLayoutPackage >
211
+
212
+ <BundledLayoutLibraryPackage Include =" $(SourceBuiltShippingPackagesDir)/../runtime/Microsoft.DotNet.ILCompiler.$(MicrosoftNETCoreAppRuntimePackageVersion).nupkg" Condition =" '$(BundleNativeAotCompiler)' == 'true'" />
213
+
214
+ <BundledLayoutLibraryPackage Include =" $(SourceBuiltShippingPackagesDir)/../runtime/Microsoft.NET.ILLink.Tasks.$(MicrosoftNETILLinkTasksPackageVersion).nupkg" Condition =" '$(BundleNativeAotCompiler)' == 'true'" />
215
+
205
216
<BundledInstallerComponent Include =" DownloadedRuntimeDepsInstallerFile"
206
217
Condition =" ('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))" >
207
218
<BaseUrl >$(NetRuntimeRootUrl)</BaseUrl >
460
471
SkipUnchangedFiles =" true"
461
472
/>
462
473
474
+ <Copy SourceFiles =" @(BundledLayoutLibraryPackage)"
475
+ DestinationFolder =" $(RedistLayoutPath)/library-packs"
476
+ SkipUnchangedFiles =" true"
477
+ />
478
+
463
479
<!-- From Version.targets in SDK redist -->
464
480
<PropertyGroup >
465
481
<ArtifactNameSdk >dotnet-toolset-internal</ArtifactNameSdk >
Original file line number Diff line number Diff line change @@ -788,17 +788,22 @@ private ToolPackSupport AddToolPack(
788
788
789
789
var runtimePackName = packNamePattern . Replace ( "**RID**" , hostRuntimeIdentifier ) ;
790
790
791
- if ( EnableRuntimePackDownload )
791
+ var runtimePackItem = new TaskItem ( runtimePackName ) ;
792
+ runtimePackItem . SetMetadata ( MetadataKeys . NuGetPackageId , runtimePackName ) ;
793
+ runtimePackItem . SetMetadata ( MetadataKeys . NuGetPackageVersion , packVersion ) ;
794
+
795
+ string runtimePackPath = GetPackPath ( runtimePackName , packVersion ) ;
796
+ if ( runtimePackPath != null )
797
+ {
798
+ runtimePackItem . SetMetadata ( MetadataKeys . PackageDirectory , runtimePackPath ) ;
799
+ }
800
+ else if ( EnableRuntimePackDownload )
792
801
{
793
802
// We need to download the runtime pack
794
803
runtimePackToDownload = new TaskItem ( runtimePackName ) ;
795
804
runtimePackToDownload . SetMetadata ( MetadataKeys . Version , packVersion ) ;
796
805
}
797
806
798
- var runtimePackItem = new TaskItem ( runtimePackName ) ;
799
- runtimePackItem . SetMetadata ( MetadataKeys . NuGetPackageId , runtimePackName ) ;
800
- runtimePackItem . SetMetadata ( MetadataKeys . NuGetPackageVersion , packVersion ) ;
801
-
802
807
switch ( toolPackType )
803
808
{
804
809
case ToolPackType . Crossgen2 :
You can’t perform that action at this time.
0 commit comments