Skip to content

Commit 29fd205

Browse files
authored
[PackageIndexer] Special case two AI packages (#470)
1 parent 521ab5e commit 29fd205

File tree

6 files changed

+14
-50
lines changed

6 files changed

+14
-50
lines changed

PackageIndexer/CsvUtils.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ string frameworkName
159159
// Special case for packages from dotnet/extensions repo - include XML files.
160160
string[] reposToIncludeXmlComments = [
161161
"https://github.com/dotnet/extensions",
162+
"https://github.com/microsoft/semantic-kernel",
162163
"https://devdiv.visualstudio.com/DevDiv/_git/AITestingTools"
163164
];
164165

PackageIndexer/DotnetPackageIndex.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ params string[] feedUrls
9494
packageIds.Add(packageId);
9595
}
9696

97+
// Special case since not owned by dotnetframework (yet)
98+
packageIds.Add("Microsoft.Extensions.VectorData.Abstractions");
99+
97100
Console.WriteLine($"Found {packageIds.Count:N0} package IDs owned by .NET.");
98101

99102
Console.WriteLine("Getting versions...");
@@ -163,8 +166,12 @@ bool usePreviewVersions
163166

164167
if (usePreviewVersions)
165168
{
169+
// TODO - this seems clunky.
166170
// Make sure it's a .NET 9 preview version.
167-
if ((latestPrerelease != default) && latestPrerelease.packageId.Version.Major == 9)
171+
if (latestPrerelease != default &&
172+
(latestPrerelease.packageId.Version.Major == 9 ||
173+
// Special case for major version (0) of Microsoft.Extensions.AI.Evaluation.
174+
latestPrerelease.packageId.Id.StartsWith("Microsoft.Extensions.AI.Evaluation")))
168175
result.Add(latestPrerelease.packageId);
169176
}
170177
}

PackageIndexer/NuGet/NuGetStore.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace PackageIndexer;
77
public class NuGetStore
88
{
99
private readonly NuGetFeed[] _feeds;
10-
private readonly Dictionary<string, IReadOnlyList<NuGetVersion>> _packageVersionCache = new();
1110

1211
public NuGetStore(string packagesCachePath, params NuGetFeed[] feeds)
1312
{

PackageIndexer/PackageFilter.cs

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -72,46 +72,4 @@ public bool IsMatch(string packageId)
7272
return Includes.Any(e => e.IsMatch(packageId)) &&
7373
!Excludes.Any(e => e.IsMatch(packageId));
7474
}
75-
76-
public static PackageFilter Default { get; } = new(
77-
includes:
78-
[
79-
PackageFilterExpression.Parse("Microsoft.Bcl.*"),
80-
PackageFilterExpression.Parse("Microsoft.Extensions.*"),
81-
PackageFilterExpression.Parse("Microsoft.IO.Redist"),
82-
PackageFilterExpression.Parse("Microsoft.Win32.*"),
83-
PackageFilterExpression.Parse("System.*"),
84-
],
85-
excludes:
86-
[
87-
PackageFilterExpression.Parse("System.Private.ServiceModel"),
88-
PackageFilterExpression.Parse("System.Runtime.WindowsRuntime"),
89-
PackageFilterExpression.Parse("System.Runtime.WindowsRuntime.UI.Xaml"),
90-
// Documented under Azure SDK for .NET moniker.
91-
PackageFilterExpression.Parse("System.ClientModel"),
92-
// Documented under ASP.NET Core moniker.
93-
PackageFilterExpression.Parse("System.Threading.RateLimiting"),
94-
PackageFilterExpression.Parse("Microsoft.Extensions.Features"),
95-
PackageFilterExpression.Parse("Microsoft.Extensions.Identity.Core"),
96-
PackageFilterExpression.Parse("Microsoft.Extensions.Identity.Stores"),
97-
// Documented under ML.NET moniker.
98-
PackageFilterExpression.Parse("Microsoft.Extensions.ML"),
99-
// Documented under .NET Aspire moniker.
100-
PackageFilterExpression.Parse("Microsoft.Extensions.ServiceDiscovery*"),
101-
// Suffixes.
102-
PackageFilterExpression.Parse("*.cs"),
103-
PackageFilterExpression.Parse("*.de"),
104-
PackageFilterExpression.Parse("*.es"),
105-
PackageFilterExpression.Parse("*.fr"),
106-
PackageFilterExpression.Parse("*.it"),
107-
PackageFilterExpression.Parse("*.ja"),
108-
PackageFilterExpression.Parse("*.ko"),
109-
PackageFilterExpression.Parse("*.pl"),
110-
PackageFilterExpression.Parse("*.pt-br"),
111-
PackageFilterExpression.Parse("*.ru"),
112-
PackageFilterExpression.Parse("*.tr"),
113-
PackageFilterExpression.Parse("*.zh-Hans"),
114-
PackageFilterExpression.Parse("*.zh-Hant"),
115-
]
116-
);
11775
}

PackageIndexer/PlatformPackageDefinition.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ internal static class PlatformPackageDefinition
6161
"System.Formats.Nrbf",
6262
"System.Net.ServerSentEvents",
6363
"System.Numerics.Tensors",
64-
"System.Runtime.Serialization.Schema",
65-
"System.Speech"
64+
"System.Runtime.Serialization.Schema"
6665
];
6766

6867
public static FrozenSet<string> Owners = FrozenSet.ToFrozenSet(

PackageIndexer/Program.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ internal static class Program
88
private static async Task<int> Main(string[] args)
99
{
1010
#if DEBUG
11-
args = [@"c:\users\gewarren\desktop\Package Index 1106", "preview"];
11+
args = [@"c:\users\gewarren\desktop\Package Index 0130", "preview"];
1212
#endif
1313

1414
if ((args.Length == 0) || (args.Length > 2))
@@ -101,9 +101,9 @@ string indexPackagesPath
101101
string disabledPath = Path.Join(indexPackagesPath, $"{id}-all.disabled");
102102
string failedVersionPath = Path.Join(indexPackagesPath, $"{id}-{version}.failed");
103103

104-
bool alreadyIndexed = !retryIndexed && File.Exists(path) ||
105-
!retryDisabled && File.Exists(disabledPath) ||
106-
!retryFailed && File.Exists(failedVersionPath);
104+
bool alreadyIndexed = (!retryIndexed && File.Exists(path)) ||
105+
(!retryDisabled && File.Exists(disabledPath)) ||
106+
(!retryFailed && File.Exists(failedVersionPath));
107107

108108
if (alreadyIndexed)
109109
{

0 commit comments

Comments
 (0)