From da0ed0016b662199546a2b3213626fbed93117ed Mon Sep 17 00:00:00 2001
From: iadgovuser29 <33426478+iadgovuser29@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:32:21 -0400
Subject: [PATCH] Hardware collection scripts should be back

---
 .../hirs/Directory.Build.targets              | 22 -------------------
 .../hirs/HIRS_Provisioner.NET.csproj          | 21 ++++++++++++++++--
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/HIRS_Provisioner.NET/hirs/Directory.Build.targets b/HIRS_Provisioner.NET/hirs/Directory.Build.targets
index 3c0846378..52da4a222 100644
--- a/HIRS_Provisioner.NET/hirs/Directory.Build.targets
+++ b/HIRS_Provisioner.NET/hirs/Directory.Build.targets
@@ -44,27 +44,5 @@
       SourceFiles="@(PaccorScriptsDll)"
       DestinationFolder="$(PublishDir)plugins"
     />
-<!--
-    <ItemGroup> 
-      <PaccorScriptsLinux Include="$(PublishDir)scripts\*"/>
-      <PaccorScriptsWindows Include="$(PublishDir)scripts\windows\*"/>
-    </ItemGroup>
-    <Move
-      SourceFiles="@(PaccorScriptsLinux)"
-      DestinationFolder="$(PublishDir)plugins/scripts"
-    />
-    <Move
-      SourceFiles="@(PaccorScriptsWindows)"
-      DestinationFolder="$(PublishDir)plugins/scripts/windows"
-    />
-    <RemoveDir Directories="$(PublishDir)scripts" />
--->
   </Target>
-  <ItemGroup>
-    <Content Include="plugins\**\*.*">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </Content>  
-  </ItemGroup>
 </Project>
diff --git a/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj b/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
index d51f641b5..c76feecc2 100644
--- a/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
+++ b/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="paccor.HardwareManifestPlugin" Version="1.0.0" />
     <PackageReference Include="paccor.HardwareManifestPluginManager" Version="1.0.0" />
-    <PackageReference Include="paccor.paccor_scripts" Version="1.0.0" />
+    <PackageReference Include="paccor.paccor_scripts" Version="1.0.1" />
     <PackageReference Include="Packaging.Targets" Version="0.1.220">
       <PrivateAssets>all</PrivateAssets> <!-- These assets will be consumed but won't flow to the parent project -->
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -73,7 +73,7 @@
         <protoc Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X86'">$(protoc_macosx86)</protoc>
         <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>
+    </PropertyGroup>    
    <ItemGroup>
     <Compile Condition="!Exists('$(FOLDER_OUT)')" Include="generated/ProvisionerTpm2.cs" /> <!-- Necessary to include the proto file(s) compiled during this prebuild phase, if they didn't exist before. CANNOT use wildcards! -->
   </ItemGroup>   
@@ -81,4 +81,21 @@
     <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) -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) -I=$(FOLDER_PROTO) --csharp_out=$(FOLDER_OUT) $file; done " />
   </Target>
+  <Import Project="$(NuGetPackageRoot)paccor.paccor_scripts/1.0.1/contentFiles/any/net6.0/resources/paccor.paccor_scripts.targets" Condition="Exists('$(NuGetPackageRoot)paccor.paccor_scripts/1.0.1/contentFiles/any/net6.0/resources/paccor.paccor_scripts.targets')" />
+  <Target Name="ImportPaccorScripts" BeforeTargets="PreBuildEvent">
+    <ItemGroup>
+      <PaccorScriptsLinux Include="$(dotnet_paccor_scripts_directory)/*" />
+      <PaccorScriptsWindows Include="$(dotnet_paccor_scripts_windows_directory)/*" />
+    </ItemGroup>
+    <Message Text="Blah @(PaccorScriptsLinux)" Importance="high" />
+    <Copy SourceFiles="@(PaccorScriptsLinux)" DestinationFolder="$(ProjectDir)/plugins/scripts/" />
+    <Copy SourceFiles="@(PaccorScriptsWindows)" DestinationFolder="$(ProjectDir)/plugins/scripts/windows/" />
+    <ItemGroup>
+      <Content Include="plugins\**\*.*">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      </Content>
+    </ItemGroup>
+  </Target>
 </Project>