Skip to content

Commit 2f5eb8f

Browse files
committed
Move portable RID graph into runtime and clean-up
1. Move portable RID graph into runtime 2. Allow updates to both the non-portable and portable RID graphs under source build. 3. Clean-up project and remove hacks
1 parent bc97b0a commit 2f5eb8f

19 files changed

+572
-13689
lines changed

Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,4 +471,11 @@
471471
<CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
472472
<CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
473473
</PropertyGroup>
474+
475+
<PropertyGroup>
476+
<!-- Keep in sync with outputs defined in Microsoft.NETCore.Platforms.csproj. -->
477+
<BundledRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
478+
<BundledRuntimeIdentifierGraphFile Condition="!Exists('$(BundledRuntimeIdentifierGraphFile)')">$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
479+
</PropertyGroup>
480+
474481
</Project>

Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,5 @@
216216
<InstallersRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
217217
</PropertyGroup>
218218
</Target>
219+
219220
</Project>

eng/AvoidRestoreCycleOnSelfReference.targets

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/libraries/Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<Import Project="$(RepositoryEngineeringDir)slngen.targets" Condition="'$(IsSlnGen)' == 'true'" />
129129

130130
<Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(IsSourceProject)' == 'true' or '$(ExplicitlyImportCustomILLinkTargets)' == 'true'" />
131-
<Import Project="$(RepositoryEngineeringDir)AvoidRestoreCycleOnSelfReference.targets" Condition="'$(AvoidRestoreCycleOnSelfReference)' == 'true'" />
132131
<Import Project="$(RepositoryEngineeringDir)nativeSanitizers.targets" />
133132

134133
<ItemGroup Condition="'$(UseTargetFrameworkPackage)' != 'false'">

src/libraries/Microsoft.NETCore.Platforms/src/AssemblyResolver.cs

Lines changed: 0 additions & 111 deletions
This file was deleted.

src/libraries/Microsoft.NETCore.Platforms/src/BuildTask.Desktop.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/libraries/Microsoft.NETCore.Platforms/src/BuildTask.cs

Lines changed: 0 additions & 151 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<IsSourceProject>false</IsSourceProject>
5+
</PropertyGroup>
6+
7+
<Import Project="..\..\Directory.Build.props" />
8+
9+
</Project>

src/libraries/Microsoft.NETCore.Platforms/src/Extensions.cs

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)