update .net 9.0

.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Get Version
         uses: kzrnm/[email protected]
         id: get-version

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x 
+        dotnet-version: 9.0.x 
     - name: Workload Restore
       run: dotnet workload restore
     - name: Restore dependencies

src/OneWare.Quartus/Helper/IQsfSetting.cs

@@ -1,9 +1,10 @@
-using OneWare.Settings.ViewModels.SettingTypes;
+using OneWare.Essentials.Models;
+using OneWare.Settings.ViewModels.SettingTypes;
 
 namespace OneWare.Quartus.Helper;
 
 public interface IQsfSetting
 {
-    public SettingViewModel GetViewModel();
+    public TitledSetting GetSettingModel();
     public void Save();
 }

src/OneWare.Quartus/Helper/QsfSettingComboBox.cs

@@ -17,7 +17,10 @@ public QsfSettingComboBox(QsfFile file, string name, string title, string descri
         _name = name;
         _options = options;
 
-        _setting = new ComboBoxSetting(title, description, defaultValue, options.Values);
+        _setting = new ComboBoxSetting(title, defaultValue, options.Values)
+        {
+            HoverDescription = description
+        };
 
         var setting = file.GetGlobalAssignment(name);
 
@@ -28,9 +31,9 @@ public QsfSettingComboBox(QsfFile file, string name, string title, string descri
         }
     }
 
-    public SettingViewModel GetViewModel()
+    public TitledSetting GetSettingModel()
     {
-        return new ComboBoxSettingViewModel(_setting);
+        return _setting;
     }
 
     public void Save()

src/OneWare.Quartus/Helper/QsfSettingSlider.cs

@@ -16,7 +16,10 @@ public QsfSettingSlider(QsfFile file, string name, string title, string descript
         _qsfFile = file;
         _name = name;
 
-        _setting = new SliderSetting(title, description, defaultValue, min, max, step);
+        _setting = new SliderSetting(title, defaultValue, min, max, step)
+        {
+            HoverDescription = description
+        };
 
         var setting = file.GetGlobalAssignment(name);
 
@@ -26,9 +29,9 @@ public QsfSettingSlider(QsfFile file, string name, string title, string descript
         }
     }
 
-    public SettingViewModel GetViewModel()
+    public TitledSetting GetSettingModel()
     {
-        return new SliderSettingViewModel(_setting);
+        return _setting;
     }
 
     public void Save()

src/OneWare.Quartus/OneWare.Quartus.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.8.4</Version>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -15,8 +15,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneWare.Essentials" Version="0.11.0" Private="false" ExcludeAssets="runtime;Native" />
-        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.41.0" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.Essentials" Version="0.11.2" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.41.2" Private="false" ExcludeAssets="runtime;Native" />
     </ItemGroup>
 
     <Target Name="GenerateCompatibilityFile" AfterTargets="Build">

src/OneWare.Quartus/QuartusModule.cs

@@ -53,7 +53,7 @@ public void OnInitialized(IContainerProvider containerProvider)
                 "quartus")
         };
 
-        settingsService.RegisterTitledPath("Tools", "Quartus", "Quartus_Path", "Quartus Path",
+        settingsService.RegisterTitledFolderPath("Tools", "Quartus", "Quartus_Path", "Quartus Path",
             "Sets the path for Quartus", defaultQuartusPath, null, null, IsQuartusPathValid);
 
         settingsService.GetSettingObservable<string>("Quartus_Path").Subscribe(x =>

src/OneWare.Quartus/ViewModels/QuartusCompileSettingsViewModel.cs

@@ -53,7 +53,7 @@ public QuartusCompileSettingsViewModel(UniversalFpgaProjectRoot fpgaProjectRoot)
 
         foreach (var setting in _settings)
         {
-            SettingsCollection.SettingModels.Add(setting.GetViewModel());
+            SettingsCollection.SettingModels.Add(setting.GetSettingModel());
         }
     }
 

src/OneWare.Quartus/ViewModels/QuartusLoaderSettingsViewModel.cs

@@ -41,28 +41,28 @@ public QuartusLoaderSettingsViewModel(UniversalFpgaProjectRoot projectRoot, IFpg
         var defaultProperties = fpga.Properties;
         _settings = FpgaSettingsParser.LoadSettings(projectRoot, fpga.Name);
 
-        _shortTermModeSetting = new ComboBoxSetting("Short Term Mode", "Mode to use for Short Term Programming",
+        _shortTermModeSetting = new ComboBoxSetting("Short Term Mode",
             defaultProperties.GetValueOrDefault("quartusProgrammerShortTermMode") ?? "", ["JTAG", "AS", "PS", "SD"]);
 
-        _shortTermOperationSetting = new TitledSetting("Short Term Operation", "Operation to use for Short Term Programming",
+        _shortTermOperationSetting = new TextBoxSetting("Short Term Operation", "Operation to use for Short Term Programming",
             defaultProperties.GetValueOrDefault("quartusProgrammerShortTermOperation") ?? "");
 
-        _shortTermArgumentsSetting = new TitledSetting("Short Term Additional Arguments", "Additional Arguments to use for Short Term Programming",
+        _shortTermArgumentsSetting = new TextBoxSetting("Short Term Additional Arguments", "Additional Arguments to use for Short Term Programming",
             defaultProperties.GetValueOrDefault("quartusProgrammerShortTermArguments") ?? "");
 
-        _longTermModeSetting = new ComboBoxSetting("Long Term Mode", "Mode to use for Long Term Programming",
+        _longTermModeSetting = new ComboBoxSetting("Long Term Mode",
             defaultProperties.GetValueOrDefault("quartusProgrammerLongTermMode") ?? "", ["JTAG", "AS", "PS", "SD"]);
 
-        _longTermOperationSetting = new TitledSetting("Long Term Operation", "Operation to use for Long Term Programming",
+        _longTermOperationSetting = new TextBoxSetting("Long Term Operation", "Operation to use for Long Term Programming",
             defaultProperties.GetValueOrDefault("quartusProgrammerLongTermOperation") ?? "");
 
-        _longTermFormatSetting = new ComboBoxSetting("Long Term Format", "Programming Format to use",
+        _longTermFormatSetting = new ComboBoxSetting("Long Term Format",
             defaultProperties.GetValueOrDefault("quartusProgrammerLongTermFormat") ?? "", ["POF", "JIC"]);
 
-        _longTermCpfArgumentsSetting = new TitledSetting("Long Term Cpf Arguments", "If format is different from POF, these arguments will be used to convert .sof to given format",
+        _longTermCpfArgumentsSetting = new TextBoxSetting("Long Term Cpf Arguments", "If format is different from POF, these arguments will be used to convert .sof to given format",
             defaultProperties.GetValueOrDefault("quartusProgrammerLongTermCpfArguments") ?? "");
 
-        _longTermArgumentsSetting = new TitledSetting("Long Term Additional Arguments", "Additional Arguments to use for Long Term Programming",
+        _longTermArgumentsSetting = new TextBoxSetting("Long Term Additional Arguments", "Additional Arguments to use for Long Term Programming",
             defaultProperties.GetValueOrDefault("quartusProgrammerLongTermArguments") ?? "");
 
         if (_settings.TryGetValue("quartusProgrammerShortTermMode", out var qPstMode))
@@ -89,14 +89,14 @@ public QuartusLoaderSettingsViewModel(UniversalFpgaProjectRoot projectRoot, IFpg
         if (_settings.TryGetValue("quartusProgrammerLongTermArguments", out var qPltArguments))
             _longTermArgumentsSetting.Value = qPltArguments;
 
-        SettingsCollection.SettingModels.Add(new ComboBoxSettingViewModel(_shortTermModeSetting));
-        SettingsCollection.SettingModels.Add(new TextBoxSettingViewModel(_shortTermOperationSetting));
-        SettingsCollection.SettingModels.Add(new TextBoxSettingViewModel(_shortTermArgumentsSetting));
-        SettingsCollection.SettingModels.Add(new ComboBoxSettingViewModel(_longTermModeSetting));
-        SettingsCollection.SettingModels.Add(new TextBoxSettingViewModel(_longTermOperationSetting));
-        SettingsCollection.SettingModels.Add(new ComboBoxSettingViewModel(_longTermFormatSetting));
-        SettingsCollection.SettingModels.Add(new TextBoxSettingViewModel(_longTermCpfArgumentsSetting));
-        SettingsCollection.SettingModels.Add(new TextBoxSettingViewModel(_longTermArgumentsSetting));
+        SettingsCollection.SettingModels.Add(_shortTermModeSetting);
+        SettingsCollection.SettingModels.Add(_shortTermOperationSetting);
+        SettingsCollection.SettingModels.Add(_shortTermArgumentsSetting);
+        SettingsCollection.SettingModels.Add(_longTermModeSetting);
+        SettingsCollection.SettingModels.Add(_longTermOperationSetting);
+        SettingsCollection.SettingModels.Add(_longTermFormatSetting);
+        SettingsCollection.SettingModels.Add(_longTermCpfArgumentsSetting);
+        SettingsCollection.SettingModels.Add(_longTermArgumentsSetting);
     }
 
     public void Save(FlexibleWindow flexibleWindow)
@@ -119,7 +119,7 @@ public void Reset()
     {
         foreach (var setting in SettingsCollection.SettingModels)
         {
-            setting.Setting.Value = setting.Setting.DefaultValue;
+            setting.Value = setting.DefaultValue;
         }
     }
 }

tests/OneWare.Quartus.UnitTests/OneWare.Quartus.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <OutputType>Library</OutputType>
         <IsPackable>False</IsPackable>
         <IsTestProject>True</IsTestProject>