Skip to content

Commit

Permalink
Remove unused packageindex infra (dotnet#111002)
Browse files Browse the repository at this point in the history
  • Loading branch information
ViktorHofer authored Jan 3, 2025
1 parent 192f43b commit 27fd292
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 30 deletions.
9 changes: 0 additions & 9 deletions src/coreclr/.nuget/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,13 @@
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
<PackagePlatform>AnyCPU</PackagePlatform>

<PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>

<!-- coreclr doesn't currently use the index so don't force it to be in sync -->
<SkipIndexCheck>true</SkipIndexCheck>
</PropertyGroup>

<!-- CoreCLR nuget packages shouldn't be published during servicing. -->
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<IsShipping>false</IsShipping>
</PropertyGroup>

<ItemGroup>
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
</ItemGroup>

<PropertyGroup>
<!-- build the transport package which includes product and symbols in addition to standard packages
This is a legacy setting as we tend to use symbol packages for symbol indexing and we don't use
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/.nuget/packageIndex.json

This file was deleted.

8 changes: 0 additions & 8 deletions src/installer/pkg/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
<PropertyGroup>
<PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
<PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>

<PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>

<!-- this repo doesn't currently use the index so don't force it to be in sync -->
<SkipIndexCheck>true</SkipIndexCheck>
</PropertyGroup>

<ItemGroup>
<PackageIndex Include="$(PackageIndexFile)" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions src/installer/pkg/packageIndex.json

This file was deleted.

8 changes: 1 addition & 7 deletions src/mono/nuget/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
<Project>

<!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
<Import Project="..\Directory.Build.props" />
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" />
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />

<PropertyGroup>
<PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>
<PackagePlatform>AnyCPU</PackagePlatform>

<!-- mono doesn't currently use the index so don't force it to be in sync -->
<SkipIndexCheck>true</SkipIndexCheck>
</PropertyGroup>

<ItemGroup>
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions src/mono/nuget/packageIndex.json

This file was deleted.

0 comments on commit 27fd292

Please sign in to comment.