More actions changes

nsacyber · Apr 12, 2024 · 85b5ba3 · 85b5ba3
1 parent cedc4fd
commit 85b5ba3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/dotnet-build-hardwaremanifest.yml b/.github/workflows/dotnet-build-hardwaremanifest.yml
@@ -20,10 +20,10 @@ jobs:
  run: dotnet restore
  - name: Build
  working-directory: dotnet/HardwareManifestPlugin
- run: dotnet build --no-restore
+ run: dotnet build
  - name: Test
  working-directory: dotnet/HardwareManifestPlugin
- run: dotnet test --no-build
+ run: dotnet test
  - name: Pack
  working-directory: dotnet/HardwareManifestPlugin
  run: dotnet pack
diff --git a/.github/workflows/dotnet-build-paccor_scripts.yml b/.github/workflows/dotnet-build-paccor_scripts.yml
@@ -20,10 +20,10 @@ jobs:
  run: dotnet restore
  - name: Build
  working-directory: dotnet/paccor_scripts
- run: dotnet build --no-restore
+ run: dotnet build
  - name: Test
  working-directory: dotnet/paccor_scripts
- run: dotnet test --no-build
+ run: dotnet test
  - name: Pack
  working-directory: dotnet/paccor_scripts
  run: dotnet pack

diff --git a/dotnet/HardwareManifestPlugin/HardwareManifestPlugin/HardwareManifestPlugin.csproj b/dotnet/HardwareManifestPlugin/HardwareManifestPlugin/HardwareManifestPlugin.csproj
@@ -53,6 +53,9 @@
  <Exec Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'" Command="for /f %%i in ('dir /s /b $(FOLDER_PROTO)\*.proto') do ( $(protoc) --proto_path=$(protoc_tools) --proto_path=$(PlatformCertificateProtoFilesDir) -I=$(FOLDER_PROTO) --csharp_out=$(FOLDER_OUT) %%i )" />
  <Exec Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'" Command="for file in `ls -1R $(FOLDER_PROTO)/*.proto` ; do $(protoc) --proto_path=$(protoc_tools) --proto_path=$(PlatformCertificateProtoFilesDir) -I=$(FOLDER_PROTO) --csharp_out=$(FOLDER_OUT) $file; done " />
 
+ <ItemGroup>
+ <Compile Condition="Exists('$(FOLDER_OUT)')" Include="$(FOLDER_OUT)/*.cs" />
+ </ItemGroup>
  <ItemGroup>
  <GeneratedFiles Include="$(FOLDER_OUT)/*.cs;" />
  </ItemGroup>