Skip to content

Commit 31f3635

Browse files
committed
Revert GenerateBundledVersions and ProcessFrameworkReferences
1 parent 73e9c82 commit 31f3635

File tree

2 files changed

+190
-153
lines changed

2 files changed

+190
-153
lines changed

src/Layout/redist/targets/GenerateBundledVersions.targets

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,14 @@
276276
Condition="'$(BundleRuntimePacks)' == 'true'"
277277
Include="$(ProductMonikerRid)" />
278278

279+
<ILCompilerSupportedRids
280+
Condition="'$(BundleNativeAotCompiler)' == 'true'"
281+
Include="$(ProductMonikerRid)" />
282+
283+
<Crossgen2SupportedRids
284+
Condition="'$(BundleCrossgen2)' == 'true'"
285+
Include="$(ProductMonikerRid)" />
286+
279287
<Net60MonoRuntimePackRids Include="
280288
@(Net60RuntimePackRids);
281289
browser-wasm;
@@ -368,12 +376,6 @@
368376

369377
<Crossgen2SupportedRids Include="@(Net90Crossgen2SupportedRids);" />
370378

371-
<Crossgen2SupportedPortableRids Include="@(Crossgen2SupportedRids)" />
372-
373-
<Crossgen2SupportedRids
374-
Condition="'$(BundleCrossgen2)' == 'true'"
375-
Include="$(ProductMonikerRid)" />
376-
377379
<Net70ILCompilerSupportedRids Include="
378380
linux-arm64;
379381
linux-musl-arm64;
@@ -408,12 +410,6 @@
408410
linux-musl-riscv64;
409411
" />
410412

411-
<ILCompilerSupportedPortableRids Include="@(ILCompilerSupportedRids)" />
412-
413-
<ILCompilerSupportedRids
414-
Condition="'$(BundleNativeAotCompiler)' == 'true'"
415-
Include="$(ProductMonikerRid)" />
416-
417413
<Net80NativeAOTRuntimePackRids Include="
418414
ios-arm64;
419415
iossimulator-arm64;
@@ -707,7 +703,6 @@ Copyright (c) .NET Foundation. All rights reserved.
707703
TargetFramework="net10.0"
708704
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
709705
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
710-
Crossgen2PortableRuntimeIdentifiers="@(Crossgen2SupportedPortableRids, '%3B')"
711706
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
712707
/>
713708
@@ -716,7 +711,6 @@ Copyright (c) .NET Foundation. All rights reserved.
716711
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
717712
ILCompilerRuntimePackNamePattern="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
718713
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
719-
ILCompilerPortableRuntimeIdentifiers="@(ILCompilerSupportedPortableRids, '%3B')"
720714
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
721715
/>
722716

0 commit comments

Comments
 (0)