update

one-ware · Mar 14, 2024 · e92722d · e92722d
1 parent 0c084d8
commit e92722d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/oneware-extension.json b/oneware-extension.json
@@ -61,6 +61,19 @@
           "url": "https://github.com/one-ware/OneWare.Quartus/releases/download/0.3/OneWare.QuartusExtension_0.3_linux-x64.zip"
         }
       ]
+    },
+    {
+      "version": "0.4",
+      "targets": [
+        {
+          "target": "win-x64",
+          "url": "https://github.com/one-ware/OneWare.Quartus/releases/download/0.4/OneWare.QuartusExtension_0.4_win-x64.zip"
+        },
+        {
+          "target": "linux-x64",
+          "url": "https://github.com/one-ware/OneWare.Quartus/releases/download/0.4/OneWare.QuartusExtension_0.4_linux-x64.zip"
+        }
+      ]
     }
   ]
 }
diff --git a/src/OneWare.Quartus/OneWare.Quartus.csproj b/src/OneWare.Quartus/OneWare.Quartus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>0.3</Version>
+        <Version>0.4</Version>
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -16,8 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneWare.Essentials" Version="0.4.1" Private="false" ExcludeAssets="runtime;Native"/>
-        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.16.1" Private="false" ExcludeAssets="runtime;Native"/>
+        <PackageReference Include="OneWare.Essentials" Version="0.4.2" Private="false" ExcludeAssets="runtime;Native"/>
+        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.16.3" Private="false" ExcludeAssets="runtime;Native"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/OneWare.Quartus/QuartusModule.cs b/src/OneWare.Quartus/QuartusModule.cs
@@ -48,9 +48,7 @@ public void OnInitialized(IContainerProvider containerProvider)
         settingsService.RegisterTitledPath("Tools", "Quartus", "Quartus_Path", "Quartus Path",
             "Sets the path for Quartus", defaultQuartusPath, null, null, IsQuartusPathValid);
 
-        string? environmentPathSetting;
-
-        settingsService.GetSettingObservable<string>("Quartus_Path").Skip(1).Subscribe(x =>
+        settingsService.GetSettingObservable<string>("Quartus_Path").Subscribe(x =>
         {
             if (string.IsNullOrEmpty(x)) return;
 
@@ -59,19 +57,12 @@ public void OnInitialized(IContainerProvider containerProvider)
                 containerProvider.Resolve<ILogger>().Warning("Quartus path invalid", null, false);
                 return;
             }
-
+            
             var binPath = Path.Combine(x, "bin");
             var bin64Path = Path.Combine(x, "bin64");
 
-            environmentPathSetting = PlatformHelper.Platform switch
-            {
-                PlatformId.WinX64 or PlatformId.WinArm64 => $";{bin64Path};",
-                _ => $":{binPath}:"
-            };
-
-            var currentPath = Environment.GetEnvironmentVariable("PATH");
-
-            Environment.SetEnvironmentVariable("PATH", $"{environmentPathSetting}{currentPath}");
+            ContainerLocator.Container.Resolve<IEnvironmentService>().SetPath("Quartus_Bin64", bin64Path);
+            ContainerLocator.Container.Resolve<IEnvironmentService>().SetPath("Quartus_Bin", binPath);
         });
     }
 

diff --git a/src/OneWare.Quartus/oneware.json b/src/OneWare.Quartus/oneware.json
@@ -2,13 +2,13 @@
   "Dependencies": [
     {
       "Name": "OneWare.Essentials",
-      "MinVersion": "0.4.1.0",
-      "MaxVersion": "0.4.1.0"
+      "MinVersion": "0.4.2.0",
+      "MaxVersion": "0.4.2.0"
     },
     {
       "Name": "OneWare.UniversalFpgaProjectSystem",
-      "MinVersion": "0.16.1.0",
-      "MaxVersion": "0.16.2.0"
+      "MinVersion": "0.16.3.0",
+      "MaxVersion": "0.16.3.0"
     }
   ]
 }