bump version into 2024.2.0

Author: sdcb

generator/Sdcb.OpenVINO.AutoGen/Program.cs

@@ -12,7 +12,7 @@
 IServiceProvider services = ConfigureServices();
 //ExtractedInfo info = (await services.GetRequiredService<HeadersDownloader>().DownloadAsync());
 AppSettings appSettings = services.GetRequiredService<AppSettings>();
-string url = "https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/windows/w_openvino_toolkit_windows_2023.3.0.13775.ceeafaf64f3_x86_64.zip";
+string url = "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.2/windows/w_openvino_toolkit_windows_2024.2.0.15519.5c0f38f83f6_x86_64.zip";
 ExtractedInfo info = await HeadersDownloader.DirectDownloadAsync(url, services.GetRequiredService<ArtifactDownloader>(), appSettings.DownloadFolder);
 ParsedInfo parsed = HeadersParser.Parse(info);
 GeneratedAll all = GeneratedAll.Generate(parsed);

generator/Sdcb.OpenVINO.NuGetBuilder/ArtifactSources/StorageNodeRoot.cs

@@ -32,12 +32,11 @@ public IEnumerable<VersionFolder> VersionFolders
         get
         {
             return EnumerateDirectories(VersionFolder.Prefix)
-                .Where(x => x.Name != "nightly")
-                .GroupBy(x => x.Name == "master")
-                .SelectMany(x => x.Key switch
+                .Where(x => x.Name != "master")
+                .SelectMany(x => x.Name.StartsWith("202") switch
                 {
-                    true => x.First().EnumerateDirectories("").Select(x => VersionFolder.FromFolder(x)),
-                    false => x.Select(x => VersionFolder.FromFolder(x))
+                    true => [VersionFolder.FromFolder(x)], 
+                    false => x.EnumerateDirectories("").Select(x => VersionFolder.FromFolder(x)),
                 });
         }
     }

generator/Sdcb.OpenVINO.NuGetBuilder/ArtifactSources/VersionFolder.cs

@@ -1,5 +1,4 @@
 using NuGet.Versioning;
-using System.Text.RegularExpressions;
 
 namespace Sdcb.OpenVINO.NuGetBuilders.ArtifactSources;
 
@@ -16,37 +15,85 @@ public static VersionFolder FromFolder(StorageNode Folder)
         return new VersionFolder(path, Folder, ver);
     }
 
-    static SemanticVersion ParseOpenVINOVersion(string versionString)
+    /// <summary>
+    /// Supported formats:
+    /// <list type="bullet">
+    /// <item>2024.3.0-15549-ae01c973d53</item>
+    /// <item>2022.1</item>
+    /// <item>2022.3.1</item>
+    /// <item>2024.2.0rc1</item>
+    /// </list>
+    /// </summary>
+    /// <exception cref="ArgumentException"></exception>
+    public static SemanticVersion ParseOpenVINOVersion(string versionString)
     {
-        string[] versionParts = versionString.Split('.');
+        // Split into major, minor, patch and optional additional label parts
+        string[] parts = versionString.Split('.');
 
-        // If the version string is in the format 'major.minor', e.g., '2014.7'
-        if (versionParts.Length == 2)
+        if (parts.Length < 2)
         {
-            // Append '.0' to convert it into a valid Semantic Version format (major.minor.patch)
-            versionString += ".0";
+            throw new ArgumentException("Invalid version string");
         }
 
-        // If the version string is in the format 'major.minor.0.0.dev+time', e.g., '2022.7.0.0.dev20220714'
-        else if (versionParts.Length == 4 && versionParts[3].StartsWith("dev"))
+        // Parse the major and minor versions
+        int major = int.Parse(parts[0]);
+        int minor = int.Parse(parts[1]);
+
+        // Initialize patch and label
+        int patch = 0;
+        string? releaseLabel = null;
+
+        if (parts.Length > 2)
         {
-            // Remove 'dev' part and convert the last part (time) into a valid build metadata part
-            versionString = OpenVINODevVersionRegex().Replace(versionString, "$1-$2.$3");
+            // Possible formats can be "patch", "patch-...", "patchrc..."
+            // Split third part further by '-' to separate patch and prerelease label if exists
+            string[] subParts = parts[2].Split(['-'], 2);
+
+            // Parse patch version which is always the first part
+            // Handle cases where the patch part might have a release candidate or similar suffix directly attached
+            string patchPart = subParts[0];
+            int releaseLabelIndex = FindFirstNonNumericIndex(patchPart);
+
+            if (releaseLabelIndex != -1)
+            {
+                // Separate the numeric patch from the non-numeric release label
+                patch = int.Parse(patchPart[..releaseLabelIndex]);
+                releaseLabel = patchPart[releaseLabelIndex..];
+            }
+            else
+            {
+                patch = int.Parse(patchPart);
+            }
+
+            // If there is any further information after a '-', it is part of the release label
+            if (subParts.Length > 1)
+            {
+                releaseLabel = (releaseLabel != null ? releaseLabel + "-" : "") + subParts[1];
+            }
         }
 
-        // Try to parse the version string into a SemanticVersion object
-        if (SemanticVersion.TryParse(versionString, out SemanticVersion? semVersion))
+        // Create the SemanticVersion based on extracted information
+        if (releaseLabel != null)
         {
-            return semVersion;
+            return new SemanticVersion(major, minor, patch, releaseLabel);
         }
         else
         {
-            throw new FormatException($"{versionString} is not a known OpenVINO Version");
+            return new SemanticVersion(major, minor, patch);
         }
-    }
 
-    [GeneratedRegex("(.+)\\.(dev)(\\d{8})")]
-    private static partial Regex OpenVINODevVersionRegex();
+        static int FindFirstNonNumericIndex(string str)
+        {
+            for (int i = 0; i < str.Length; i++)
+            {
+                if (!char.IsDigit(str[i]))
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+    }
 
     public IEnumerable<ArtifactInfo> Artifacts => ArtifactInfo.FromFolder(this);
 }

generator/Sdcb.OpenVINO.NuGetBuilder/Extractors/ArchiveExtractor.cs

@@ -28,7 +28,7 @@ public static ExtractedInfo Extract(Stream stream, string destinationFolder, ILi
             Console.WriteLine($"Extracting artifacts into {destinationFolder}...");
             foreach (ZipEntrySlim entry in dynamicLibs)
             {
-                string destFile = Path.Combine(destinationFolder, flatten ? Path.GetFileName(entry.Key) : entry.Key.Replace(reader.RootFolderName, ""));
+                string destFile = Path.Combine(destinationFolder, flatten ? Path.GetFileName(entry.Key) : entry.Key);
                 Directory.CreateDirectory(Path.GetDirectoryName(destFile)!);
 
                 if (entry.Data.Length > 0)

generator/Sdcb.OpenVINO.NuGetBuilder/PackageBuilders/NuGetPackageInfo.cs

@@ -16,6 +16,7 @@ public static NuGetPackageInfo FromArtifact(ArtifactInfo info)
             "ubuntu18" => "ubuntu.18.04",
             "ubuntu20" => "ubuntu.20.04",
             "ubuntu22" => "ubuntu.22.04",
+            "ubuntu24" => "ubuntu.24.04",
             "macos_10_15" => "osx.10.15",
             "macos_11_0" => "osx.11.0",
             "windows" => "win",
@@ -29,6 +30,7 @@ public static NuGetPackageInfo FromArtifact(ArtifactInfo info)
             "ubuntu18" => "linux",
             "ubuntu20" => "linux",
             "ubuntu22" => "linux",
+            "ubuntu24" => "linux",
             "macos_10_15" => "osx",
             "macos_11_0" => "osx",
             "windows" => "win",

generator/Sdcb.OpenVINO.NuGetBuilder/Program.cs

@@ -16,7 +16,7 @@ static async Task Main(string[] args)
         IServiceProvider sp = ConfigureServices();
         ArtifactDownloader w = sp.GetRequiredService<ArtifactDownloader>();
         StorageNodeRoot root = sp.GetRequiredService<StorageNodeRoot>();
-        string purpose = args.Length > 0 ? args[0] : "win64";
+        string purpose = args.Length > 0 ? args[0] : "linux";
         string? versionSuffix = "preview.1"; // null or "preview.1", can't be ""
         string dir = Path.Combine(DirectoryUtils.SearchFileInCurrentAndParentDirectories(new DirectoryInfo("."), "OpenVINO.NET.sln").DirectoryName!,
             "build", "nupkgs");