Skip to content

Commit 0421af6

Browse files
authored
Let runtime supply the portable RID graph (#36807)
1 parent 96178a2 commit 0421af6

File tree

5 files changed

+13
-555
lines changed

5 files changed

+13
-555
lines changed

src/Installer/redist-installer/targets/GenerateBundledVersions.targets

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ Copyright (c) .NET Foundation. All rights reserved.
576576
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
577577
TargetFramework="net9.0"
578578
ILLinkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
579-
579+
580580
<KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
581581
TargetFramework="net9.0"
582582
WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
@@ -1183,13 +1183,13 @@ Copyright (c) .NET Foundation. All rights reserved.
11831183
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="6.0" />
11841184
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="6.0" />
11851185
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="6.0" />
1186-
1186+
11871187
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="10.0.22000.26" MinimumNETVersion="5.0" />
11881188
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="10.0.20348.26" MinimumNETVersion="5.0" />
11891189
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="10.0.19041.26" MinimumNETVersion="5.0" />
11901190
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="10.0.18362.26" MinimumNETVersion="5.0" />
11911191
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="10.0.17763.26" MinimumNETVersion="5.0" />
1192-
1192+
11931193
<WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
11941194
<WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
11951195
@@ -1295,14 +1295,6 @@ Copyright (c) .NET Foundation. All rights reserved.
12951295
<Target Name="LayoutRuntimeGraph"
12961296
DependsOnTargets="GenerateBundledVersionsProps">
12971297

1298-
<Copy SourceFiles="$(NuGetPackageRoot)/microsoft.netcore.platforms/$(_NETCorePlatformsPackageVersion)/runtime.json"
1299-
DestinationFiles="$(SdkOutputDirectory)RuntimeIdentifierGraph.json"
1300-
SkipUnchangedFiles="true" />
1301-
1302-
<Copy SourceFiles="$(NuGetPackageRoot)/microsoft.netcore.platforms/$(_NETCorePlatformsPackageVersion)/PortableRuntimeIdentifierGraph.json"
1303-
DestinationFolder="$(SdkOutputDirectory)"
1304-
SkipUnchangedFiles="true"/>
1305-
13061298
<GenerateSdkRuntimeIdentifierChain
13071299
RuntimeIdentifier="$(PortableProductMonikerRid)"
13081300
RuntimeIdentifierGraphPath="$(SdkOutputDirectory)PortableRuntimeIdentifierGraph.json"

0 commit comments

Comments
 (0)