Trying to get build order right

nsacyber · Apr 12, 2024 · 25c8bfa · 25c8bfa
1 parent c1f63c7
commit 25c8bfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dotnet/HardwareManifestPlugin/HardwareManifestPlugin/HardwareManifestPlugin.csproj b/dotnet/HardwareManifestPlugin/HardwareManifestPlugin/HardwareManifestPlugin.csproj
@@ -49,13 +49,14 @@
       <protoc Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">$(protoc_windows64)</protoc>
       <protoc Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X86'">$(protoc_windows86)</protoc>
     </PropertyGroup>
+    <ItemGroup>
+      <Compile Condition="!Exists('$(FOLDER_OUT)')" Include="generated/HardwareManifest.cs" />
+    </ItemGroup>
     <Exec Condition="!Exists('$(FOLDER_OUT)')" Command="mkdir $(FOLDER_OUT)" />
     <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>

diff --git a/dotnet/paccor_scripts/paccor_scripts/src/PaccorComponentScriptsPlugin.cs b/dotnet/paccor_scripts/paccor_scripts/src/PaccorComponentScriptsPlugin.cs
@@ -1,9 +1,8 @@
 using HardwareManifestProto;
-using HardwareManifestPlugin;
 using System.Runtime.InteropServices;
 
 namespace paccor_scripts {
-    public sealed class PaccorComponentScriptsPlugin : HardwareManifest {
+    public sealed class PaccorComponentScriptsPlugin : HardwareManifestPlugin.HardwareManifestPlugin {
         public static readonly string Scripts = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(typeof(PaccorComponentScriptsPlugin).Assembly.Location)!, "scripts"));
         public static readonly string LinuxComponents = Path.GetFullPath(Path.Combine(Scripts, "allcomponents.sh"));
         public static readonly string WinPath = Path.GetFullPath(Path.Combine(Scripts, "windows"));