diff --git a/src/DotnetRelease/MajorReleaseOverviewRecords.cs b/src/DotnetRelease/MajorReleaseOverviewRecords.cs index ac023dfa..7769d3f7 100644 --- a/src/DotnetRelease/MajorReleaseOverviewRecords.cs +++ b/src/DotnetRelease/MajorReleaseOverviewRecords.cs @@ -3,7 +3,7 @@ namespace DotnetRelease; -[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] +// [JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] [Description("A major product release, including detailed information for each patch release.")] public record MajorReleaseOverview( [property: Description("Major (or major.minor) version of the product.")] diff --git a/src/DotnetRelease/OSPackagesRecords.cs b/src/DotnetRelease/OSPackagesRecords.cs index 3fad8c0f..ef43d96f 100644 --- a/src/DotnetRelease/OSPackagesRecords.cs +++ b/src/DotnetRelease/OSPackagesRecords.cs @@ -6,7 +6,7 @@ namespace DotnetRelease; // For os-packages.json file // List of packages required by product // Example: https://github.com/dotnet/core/blob/main/release-notes/9.0/supported-os.json -[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] +[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Skip)] [Description("The set of packages required by a given product version for a set of distros.")] public record OSPackagesOverview( [property: Description("Major (or major.minor) version of product.")] diff --git a/src/DotnetRelease/PatchReleaseOverviewRecords.cs b/src/DotnetRelease/PatchReleaseOverviewRecords.cs index 8c91d9f1..68f3fffe 100644 --- a/src/DotnetRelease/PatchReleaseOverviewRecords.cs +++ b/src/DotnetRelease/PatchReleaseOverviewRecords.cs @@ -21,7 +21,7 @@ public record PatchReleaseOverview( [property: Description("A patch release with detailed release information.")] PatchRelease Release); -[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] +// [JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] [Description("Detailed information for the patch release.")] public record PatchRelease( [property: Description("The date of the patch release.")] @@ -65,7 +65,7 @@ public record Cve( [property: Description("The URL tracking the CVE at the authoritative site.")] string CveUrl); -[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] +// [JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] [Description("Runtime component of a release.")] public record RuntimeComponent( [property: Description("The version of the component.")] @@ -85,7 +85,7 @@ public record RuntimeComponent( JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] string? VSSupport = null); -[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] +// [JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)] [Description("SDK component of the release.")] public record SdkComponent( [property: Description("The version of the component.")] diff --git a/src/GenerateJsonSchemas/Program.cs b/src/GenerateJsonSchemas/Program.cs index 5911a8bf..d7187fea 100644 --- a/src/GenerateJsonSchemas/Program.cs +++ b/src/GenerateJsonSchemas/Program.cs @@ -11,7 +11,7 @@ new (typeof(PatchReleasesIndex), "dotnet-patch-releases-index.json"), new (typeof(PatchReleaseOverview), "dotnet-patch-release.json"), new (typeof(OSPackagesOverview), "dotnet-os-packages.json"), - new (typeof(SupportedOSMatrix), "dotnet-supported-os-matrix.json"), + new (typeof(SupportedOSMatrix), "dotnet-supported-os.json"), // new (typeof(ReportOverview), "dotnet-support-report.json"), ]; diff --git a/src/LinuxPackagesMd/Program.cs b/src/LinuxPackagesMd/Program.cs index 33a8f0b1..f8e0a607 100644 --- a/src/LinuxPackagesMd/Program.cs +++ b/src/LinuxPackagesMd/Program.cs @@ -2,16 +2,10 @@ using DotnetRelease; using MarkdownHelpers; -// if (args.Length is 0 || !int.TryParse(args[0], out int ver)) -// { -// ReportInvalidArgs(); -// return; -// } - int ver = 9; string version = $"{ver}.0"; -string baseDefaultURL = "https://raw.githubusercontent.com/dotnet/core/linux-packages/release-notes/"; +string baseDefaultURL = "https://raw.githubusercontent.com/dotnet/core/main/release-notes"; string baseUrl = args.Length > 1 ? args[1] : baseDefaultURL; bool preferWeb = baseUrl.StartsWith("https"); string packageJson = baseUrl; @@ -29,6 +23,8 @@ StreamWriter writer = new(stream); OSPackagesOverview? packageOverview = null; +Console.WriteLine($"Querying {packageJson}"); + if (preferWeb) { packageOverview = await ReleaseNotes.GetOSPackages(client, packageJson) ?? throw new();