fix verible windows

one-ware · Nov 14, 2023 · 3ba66fd · 3ba66fd
1 parent f1f816f
commit 3ba66fd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x 
+        dotnet-version: 8.0.x 
     - name: Workload Restore
       run: dotnet workload restore
     - name: Restore dependencies

diff --git a/OneWare.sln b/OneWare.sln
@@ -120,6 +120,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FpgaSupport", "FpgaSupport"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.IceBreaker", "src\OneWare.IceBreaker\OneWare.IceBreaker.csproj", "{B970E17F-ED6D-4A50-9477-BF2809198416}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "actions", "actions", "{60A1DF89-0129-42B7-A509-D717A887667C}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\publish-onewarestudio-web.yml = .github\workflows\publish-onewarestudio-web.yml
+		.github\workflows\publish-shared.yml = .github\workflows\publish-shared.yml
+		.github\workflows\test.yml = .github\workflows\test.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -304,5 +311,6 @@ Global
 		{20969AC5-F5E0-439C-9217-6FAE0CA01F73} = {6FF7E7F6-DA3F-477E-AAD7-47E3655FA34D}
 		{52DDC84A-27F8-4AF0-93C4-903614BE613D} = {6FF7E7F6-DA3F-477E-AAD7-47E3655FA34D}
 		{B970E17F-ED6D-4A50-9477-BF2809198416} = {52DDC84A-27F8-4AF0-93C4-903614BE613D}
+		{60A1DF89-0129-42B7-A509-D717A887667C} = {3782EFDF-2990-4B2C-907F-12739A839A3C}
 	EndGlobalSection
 EndGlobal
diff --git a/demo/OneWare.Demo.Desktop/OneWare.Demo.Desktop.csproj b/demo/OneWare.Demo.Desktop/OneWare.Demo.Desktop.csproj
@@ -7,7 +7,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <OutputType Condition="'$(Configuration.toUpper())' != 'DEBUG'">WinExe</OutputType>
         <OutputType Condition="'$(Configuration.toUpper())' == 'DEBUG'">Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ApplicationIcon>..\OneWare.Demo\Assets\icon.ico</ApplicationIcon>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>

diff --git a/src/OneWare.Verilog/LanguageServiceVerilog.cs b/src/OneWare.Verilog/LanguageServiceVerilog.cs
@@ -21,7 +21,7 @@ static LanguageServiceVerilog()
 
             StartPath = PlatformHelper.Platform switch
             {
-                PlatformId.WinX64 => $"{assemblyPath}/native_tools/win-x64/verible/verible-v0.0-3426-gac4a37d8-win64/verible-verilog-ls.exe",
+                PlatformId.WinX64 => $"{assemblyPath}/native_tools/win-x64/verible/verible-v0.0-3428-gcfcbb82b-win64/verible-verilog-ls.exe",
                 PlatformId.LinuxX64 => $"{assemblyPath}/native_tools/linux-x64/verible/verible-v0.0-3428-gcfcbb82b/bin/verible-verilog-ls",
                 PlatformId.OsxX64 => $"{assemblyPath}/native_tools/osx-x64/verible/verible-v0.0-3426-gac4a37d8-macOS/bin/verible-verilog-ls",
                 PlatformId.OsxArm64 => $"{assemblyPath}/native_tools/osx-x64/verible/verible-v0.0-3426-gac4a37d8-macOS/bin/verible-verilog-ls",

diff --git a/src/OneWare.Verilog/OneWare.Verilog.csproj b/src/OneWare.Verilog/OneWare.Verilog.csproj
@@ -14,7 +14,7 @@
 
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-x64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Windows')))">
         <UsePackageTarget>win-x64</UsePackageTarget>
-        <ExternalPackageUrl>https://github.com/chipsalliance/verible/releases/download/v0.0-3401-g0b8cb4e0/verible-v0.0-3401-g0b8cb4e0-win64.zip</ExternalPackageUrl>
+        <ExternalPackageUrl>https://github.com/chipsalliance/verible/releases/download/v0.0-3428-gcfcbb82b/verible-v0.0-3428-gcfcbb82b-win64.zip</ExternalPackageUrl>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Linux')))">