update

Author: hendrikmennen

oneware-extension.json

@@ -122,9 +122,9 @@
       ]
     },
     {
-      "version": "0.99.4",
+      "version": "0.99.5",
       "isPrerelease": true,
-      "minStudioVersion": "0.99.4",
+      "minStudioVersion": "0.99.5",
       "targets": [
         {
           "target": "all"

src/OneWare.GhdlExtension/OneWare.GhdlExtension.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>0.99.4</Version>
+        <Version>0.99.5</Version>
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -11,9 +11,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneWare.Essentials" Version="0.99.4.0" Private="false" ExcludeAssets="runtime;Native" />
-        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.99.4.0" Private="false" ExcludeAssets="runtime;Native" />
-        <PackageReference Include="OneWare.OssCadSuiteIntegration" Version="0.99.4.0" Private="true" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.Essentials" Version="0.99.5.0" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.99.5.0" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.OssCadSuiteIntegration" Version="0.99.5.0" Private="true" ExcludeAssets="runtime;Native" />
     </ItemGroup>
 
     <Target Name="GenerateCompatibilityFile" AfterTargets="Build">

src/OneWare.GhdlExtension/Services/GhdlService.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Logging;
 using OneWare.Essentials.Enums;
 using OneWare.Essentials.Models;
+using OneWare.Essentials.PackageManager.Compatibility;
 using OneWare.Essentials.Services;
 using OneWare.Essentials.ViewModels;
 using OneWare.GhdlExtension.ViewModels;
@@ -115,7 +116,7 @@ private async Task<bool> InstallGhdlAsync()
         if (_packageService.Packages.GetValueOrDefault(GhdlExtensionModule.GhdlPackage.Id!) is {Status: PackageStatus.Available or PackageStatus.UpdateAvailable or PackageStatus.Installing})
         {
             if (!_settingsService.GetSettingValue<bool>("Experimental_AutoDownloadBinaries")) return false;
-            if(!await _packageService.InstallAsync(GhdlExtensionModule.GhdlPackage)) return false;
+            if(await _packageService.InstallAsync(GhdlExtensionModule.GhdlPackage) is {Status: PackageInstallResultReason.Installed or PackageInstallResultReason.AlreadyInstalled}) return false;
             SetEnvironment();
             return true;
         }
@@ -368,7 +369,7 @@ public async Task<bool> SynthAsync(IProjectFile file, string outputType, string
     {
         if (file.Root is UniversalFpgaProjectRoot root)
         {
-            PackageModel? ghdlPackagemodel = _packageService.Packages.GetValueOrDefault("ghdl");
+            IPackageState? ghdlPackagemodel = _packageService.Packages.GetValueOrDefault("ghdl");
             Version ghdlVersion = new Version(5, 0, 1);
             bool directVerilogOutput = (ghdlPackagemodel is not null &&
                  ghdlVersion.CompareTo(Version.Parse(ghdlPackagemodel.InstalledVersion!.Version!)) <= 0 && outputType.Equals("verilog"));