From 868585bbef40934d7097770f6b77fff97d501b29 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 13:37:06 -0700 Subject: [PATCH 1/7] Use path.combine --- Server/Handlers/SignatureHelpHandler.cs | 5 +--- Server/ShaderlabVS.Data/Attributes.cs | 4 +-- .../DefinationDataProvider.cs | 5 +--- Server/ShaderlabVS.Data/DefinationReader.cs | 4 +-- Server/ShaderlabVS.Data/Models.cs | 6 +---- .../ShaderlabVS.Data/ShaderlabDataManager.cs | 25 ++++++++----------- Server/ShaderlabVS/Utilities.cs | 4 +-- 7 files changed, 16 insertions(+), 37 deletions(-) diff --git a/Server/Handlers/SignatureHelpHandler.cs b/Server/Handlers/SignatureHelpHandler.cs index 1fb1857..86a4ae3 100644 --- a/Server/Handlers/SignatureHelpHandler.cs +++ b/Server/Handlers/SignatureHelpHandler.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Security.Cryptography.Xml; -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Document; @@ -8,7 +6,6 @@ using OmniSharp.Extensions.LanguageServer.Protocol.Server; using ShaderlabVS.Data; using ShaderLS.Management; -using static System.Net.Mime.MediaTypeNames; namespace ShaderLS.Handlers { diff --git a/Server/ShaderlabVS.Data/Attributes.cs b/Server/ShaderlabVS.Data/Attributes.cs index d986a3a..9dbecbf 100644 --- a/Server/ShaderlabVS.Data/Attributes.cs +++ b/Server/ShaderlabVS.Data/Attributes.cs @@ -1,6 +1,4 @@ -using System; - -namespace ShaderlabVS.Data +namespace ShaderlabVS.Data { [AttributeUsage(AttributeTargets.Property, Inherited = false, AllowMultiple = false)] sealed class DefinationKeyAttribute : Attribute diff --git a/Server/ShaderlabVS.Data/DefinationDataProvider.cs b/Server/ShaderlabVS.Data/DefinationDataProvider.cs index 298229d..317416e 100644 --- a/Server/ShaderlabVS.Data/DefinationDataProvider.cs +++ b/Server/ShaderlabVS.Data/DefinationDataProvider.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; +using System.Reflection; namespace ShaderlabVS.Data { diff --git a/Server/ShaderlabVS.Data/DefinationReader.cs b/Server/ShaderlabVS.Data/DefinationReader.cs index c25edaa..0ce5230 100644 --- a/Server/ShaderlabVS.Data/DefinationReader.cs +++ b/Server/ShaderlabVS.Data/DefinationReader.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using System.IO; -using System.Text; +using System.Text; using System.Text.RegularExpressions; namespace ShaderlabVS.Data diff --git a/Server/ShaderlabVS.Data/Models.cs b/Server/ShaderlabVS.Data/Models.cs index 0672996..7c9e9d8 100644 --- a/Server/ShaderlabVS.Data/Models.cs +++ b/Server/ShaderlabVS.Data/Models.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace ShaderlabVS.Data +namespace ShaderlabVS.Data { #region Common public class ModelBase diff --git a/Server/ShaderlabVS.Data/ShaderlabDataManager.cs b/Server/ShaderlabVS.Data/ShaderlabDataManager.cs index 93774a9..fdffee2 100644 --- a/Server/ShaderlabVS.Data/ShaderlabDataManager.cs +++ b/Server/ShaderlabVS.Data/ShaderlabDataManager.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.Eventing.Reader; -using System.IO; -using System.Linq; -using System.Reflection; +using System.Reflection; namespace ShaderlabVS.Data { @@ -13,15 +8,15 @@ namespace ShaderlabVS.Data public class ShaderlabDataManager { #region Constants - public static string HLSL_CG_DATATYPE_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "HLSL_CG_datatype.def"; - public static string HLSL_CG_FUNCTION_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "HLSL_CG_functions.def"; - public static string HLSL_CG_KEYWORD_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "HLSL_CG_Keywords.def"; - - public static string UNITY3D_DATATYPE_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_datatype.def"; - public static string UNITY3D_FUNCTION_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_functions.def"; - public static string UNITY3D_KEYWORD_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_keywords.def"; - public static string UNITY3D_MACROS_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_macros.def"; - public static string UNITY3D_VALUES_DEFINATIONFILE = "Data" + Path.DirectorySeparatorChar.ToString() + "Unity3D_values.def"; + public static string HLSL_CG_DATATYPE_DEFINATIONFILE = Path.Combine("Data", "HLSL_CG_datatype.def"); + public static string HLSL_CG_FUNCTION_DEFINATIONFILE = Path.Combine("Data", "HLSL_CG_functions.def"); + public static string HLSL_CG_KEYWORD_DEFINATIONFILE = Path.Combine("Data", "HLSL_CG_Keywords.def"); + + public static string UNITY3D_DATATYPE_DEFINATIONFILE = Path.Combine("Data", "Unity3D_datatype.def"); + public static string UNITY3D_FUNCTION_DEFINATIONFILE = Path.Combine("Data", "Unity3D_functions.def"); + public static string UNITY3D_KEYWORD_DEFINATIONFILE = Path.Combine("Data", "Unity3D_keywords.def"); + public static string UNITY3D_MACROS_DEFINATIONFILE = Path.Combine("Data", "Unity3D_macros.def"); + public static string UNITY3D_VALUES_DEFINATIONFILE = Path.Combine("Data", "Unity3D_values.def"); #endregion #region Properties diff --git a/Server/ShaderlabVS/Utilities.cs b/Server/ShaderlabVS/Utilities.cs index 734d787..8edf39a 100644 --- a/Server/ShaderlabVS/Utilities.cs +++ b/Server/ShaderlabVS/Utilities.cs @@ -1,6 +1,4 @@ -using System; - -namespace ShaderlabVS +namespace ShaderlabVS { internal class Utilities { From 1290d64c91de613ae82169a268bc50e0cc37956e Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 13:50:19 -0700 Subject: [PATCH 2/7] try build --- .github/workflows/test.yml | 66 +++----------------------------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f767f79..25f0ea4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,42 +1,4 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -# This workflow will build, test, sign and package a WPF or Windows Forms desktop application -# built on .NET Core. -# To learn how to migrate your existing application to .NET Core, -# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework -# -# To configure this workflow: -# -# 1. Configure environment variables -# GitHub sets default environment variables for every workflow run. -# Replace the variables relative to your project in the "env" section below. -# -# 2. Signing -# Generate a signing certificate in the Windows Application -# Packaging Project or add an existing signing certificate to the project. -# Next, use PowerShell to encode the .pfx file using Base64 encoding -# by running the following Powershell script to generate the output string: -# -# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte -# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt' -# -# Open the output file, SigningCertificate_Encoded.txt, and copy the -# string inside. Then, add the string to the repo as a GitHub secret -# and name it "Base64_Encoded_Pfx." -# For more information on how to configure your signing certificate for -# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing -# -# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key". -# See "Build the Windows Application Packaging project" below to see how the secret is used. -# -# For more information on GitHub Actions, refer to https://github.com/features/actions -# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications, -# refer to https://github.com/microsoft/github-actions-for-desktop-apps - -name: .NET Core Desktop +name: Build on: push: @@ -52,20 +14,13 @@ jobs: matrix: configuration: [Debug, Release] - runs-on: windows-latest # For a list of available runner types, refer to - # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on - + runs-on: windows-latest env: - Solution_Name: your-solution-name # Replace with your solution name, i.e. MyWpfApp.sln. - Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. - Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. - Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. + Solution_Name: shader-ls.sln # Replace with your solution name, i.e. MyWpfApp.sln. + Test_Project_Path: Server\shader-ls.csproj # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 + - uses: actions/checkout@v3 # Install the .NET Core workload - name: Install .NET Core @@ -102,14 +57,3 @@ jobs: Appx_Bundle_Platforms: x86|x64 Appx_Package_Build_Mode: StoreUpload Configuration: ${{ matrix.configuration }} - - # Remove the pfx - - name: Remove the pfx - run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx - - # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: Upload build artifacts - uses: actions/upload-artifact@v3 - with: - name: MSIX Package - path: ${{ env.Wap_Project_Directory }}\AppPackages From f03e6911eaccda0b9d83070786f6b14b5be064af Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 13:53:45 -0700 Subject: [PATCH 3/7] Add badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9bb1944..bf6b7d7 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ # shader-language-server > Language server implementation for ShaderLab +[![Build](https://github.com/shader-ls/shader-language-server/actions/workflows/test.yml/badge.svg)](https://github.com/shader-ls/shader-language-server/actions/workflows/test.yml) + ## 🚧 Status Still in development. From be02d7b0e3569406d633d9c151566d1ed35a60db Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 13:53:51 -0700 Subject: [PATCH 4/7] Add dep bot --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..3eddd09 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: 'github-actions' + directory: '/' + schedule: + interval: 'daily' From 107b32bfd99e053423058c51829e21600ab28742 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 13:56:34 -0700 Subject: [PATCH 5/7] Update test --- .github/workflows/test.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25f0ea4..162397d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,8 @@ jobs: runs-on: windows-latest env: - Solution_Name: shader-ls.sln # Replace with your solution name, i.e. MyWpfApp.sln. - Test_Project_Path: Server\shader-ls.csproj # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. + Solution_Name: Server\shader-ls.sln + Test_Project_Path: Server\shader-ls.csproj steps: - uses: actions/checkout@v3 @@ -28,28 +28,24 @@ jobs: with: dotnet-version: 6.0.x - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.0.2 - # Execute all unit tests in the solution - name: Execute unit tests + working-directory: Server run: dotnet test - # Restore the application to populate the obj folder with RuntimeIdentifiers - name: Restore the application run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration env: Configuration: ${{ matrix.configuration }} - # Decode the base 64 encoded pfx and save the Signing_Certificate - name: Decode the pfx run: | $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}") $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) - # Create the app package by building and packaging the Windows Application Packaging project - name: Create the app package run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} env: From 048105e67466ba363c6ccc7e05bfb4d578b399f5 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 14:07:16 -0700 Subject: [PATCH 6/7] try rebuild --- .github/workflows/test.yml | 29 ++++++++--------------------- Server/Buffer.cs | 2 +- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 162397d..19872e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,19 +5,19 @@ on: branches: [ "master" ] pull_request: branches: [ "master" ] + workflow_dispatch: -jobs: +env: + Solution_Name: shader-ls.sln +jobs: build: - strategy: + fail-fast: false matrix: configuration: [Debug, Release] runs-on: windows-latest - env: - Solution_Name: Server\shader-ls.sln - Test_Project_Path: Server\shader-ls.csproj steps: - uses: actions/checkout@v3 @@ -35,21 +35,8 @@ jobs: working-directory: Server run: dotnet test - - name: Restore the application - run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration - env: - Configuration: ${{ matrix.configuration }} - - - name: Decode the pfx - run: | - $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}") - $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx - [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) - - - name: Create the app package - run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + - name: Build the application + working-directory: Server + run: msbuild $env:Solution_Name /t:Rebuild /p:Configuration=$env:Configuration env: - Appx_Bundle: Always - Appx_Bundle_Platforms: x86|x64 - Appx_Package_Build_Mode: StoreUpload Configuration: ${{ matrix.configuration }} diff --git a/Server/Buffer.cs b/Server/Buffer.cs index eb66311..c3fa581 100644 --- a/Server/Buffer.cs +++ b/Server/Buffer.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.LanguageServer.Protocol.Models; using ShaderlabVS; - +x namespace ShaderLS { public class Buffer From dd7264c6fe6f10121d6af41c02a0b463752c4e41 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 9 Sep 2023 14:16:48 -0700 Subject: [PATCH 7/7] Revert test x --- Server/Buffer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Buffer.cs b/Server/Buffer.cs index c3fa581..eb66311 100644 --- a/Server/Buffer.cs +++ b/Server/Buffer.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.LanguageServer.Protocol.Models; using ShaderlabVS; -x + namespace ShaderLS { public class Buffer