From d17fc2e52575fba592b88b06a4c02b96bc901e5f Mon Sep 17 00:00:00 2001
From: iadgovuser29 <33426478+iadgovuser29@users.noreply.github.com>
Date: Mon, 23 Oct 2023 11:38:30 -0400
Subject: [PATCH] Updated HIRS_Provisioner.NET package options

---
 HIRS_Provisioner.NET/hirs.sln                 |  2 +-
 .../hirs/Directory.Build.targets              | 42 +++++++++++--------
 ...irs.csproj => HIRS_Provisioner.NET.csproj} |  4 +-
 HIRS_Provisioner.NET/hirsTest/hirsTest.csproj |  2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)
 rename HIRS_Provisioner.NET/hirs/{hirs.csproj => HIRS_Provisioner.NET.csproj} (97%)

diff --git a/HIRS_Provisioner.NET/hirs.sln b/HIRS_Provisioner.NET/hirs.sln
index 06b73368..4a2c8b2a 100644
--- a/HIRS_Provisioner.NET/hirs.sln
+++ b/HIRS_Provisioner.NET/hirs.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "hirs", "hirs\hirs.csproj", "{300FF15E-1E10-4586-843D-D652BA40DEE5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "hirs", "hirs\HIRS_Provisioner.NET.csproj", "{300FF15E-1E10-4586-843D-D652BA40DEE5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E61D6E28-B993-436D-AA88-165857AAEEC0}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/HIRS_Provisioner.NET/hirs/Directory.Build.targets b/HIRS_Provisioner.NET/hirs/Directory.Build.targets
index 27b0ec2f..3c084637 100644
--- a/HIRS_Provisioner.NET/hirs/Directory.Build.targets
+++ b/HIRS_Provisioner.NET/hirs/Directory.Build.targets
@@ -5,21 +5,28 @@
     </PropertyGroup>
     <Move SourceFiles="$(OUTDIR)publish\$(AssemblyName)" DestinationFiles="$(OUTDIR)publish\tpm_aca_provision" />
     <Message Text="Renamed linux binary file." Importance="high" />
+    <PropertyGroup>
+      <Prefix>/usr/share/hirs</Prefix>
+      <PostInstallScript>/usr/bin/chmod 644 /usr/share/hirs/appsettings.json; /usr/bin/ln -s /usr/share/hirs/tpm_aca_provision /usr/bin/tpm_aca_provision</PostInstallScript>
+      <PostRemoveScript>rm -f /usr/bin/tpm_aca_provision; rm -rf /usr/share/hirs</PostRemoveScript>
+    </PropertyGroup>
+    <Message Text="Set installed directory prefix to $(PREFIX)." Importance="high" />
   </Target>
   <Target Name="RenameBeforePublishWindows" BeforeTargets="SetWixPath" Condition="$(RuntimeIdentifier.Contains('win'))">
     <Move SourceFiles="$(OUTDIR)publish\$(AssemblyName).exe" DestinationFiles="$(OUTDIR)publish\tpm_aca_provision.exe" />
     <Message Text="Renamed exe binary file." Importance="high" />
+    <PropertyGroup>
+      <Prefix>C:/Progra~1/hirs</Prefix>
+    </PropertyGroup>
+    <Message Text="Set installed directory prefix to $(PREFIX)." Importance="high" />
   </Target>
-  <PropertyGroup>
-    <PostInstallScript>"/bin/sh -c \"chmod 664 /usr/share/hirs/appsettings.json\""</PostInstallScript>
-  </PropertyGroup>
   <Target Name="SetWixPath" BeforeTargets="Msi">
     <PropertyGroup>
-        <ProductSourceFilePath>$(MSBuildThisFileDirectory)\Resources\Product.wxs</ProductSourceFilePath>
-        <WixInstallPath>$(NuGetPackageRoot)wix\3.11.2\tools\</WixInstallPath>
-        <Heat>$(WixInstallPath)heat.exe</Heat>
-        <Candle>$(WixInstallPath)candle.exe</Candle>
-        <Light>$(WixInstallPath)light.exe</Light>
+      <ProductSourceFilePath>$(MSBuildThisFileDirectory)\Resources\Product.wxs</ProductSourceFilePath>
+      <WixInstallPath>$(NuGetPackageRoot)wix\3.11.2\tools\</WixInstallPath>
+      <Heat>$(WixInstallPath)heat.exe</Heat>
+      <Candle>$(WixInstallPath)candle.exe</Candle>
+      <Light>$(WixInstallPath)light.exe</Light>
     </PropertyGroup>
   </Target>
   <Target Name="DeletePDB" AfterTargets="RenameBeforePublishLinux;RenameBeforePublishWindows">
@@ -37,26 +44,27 @@
       SourceFiles="@(PaccorScriptsDll)"
       DestinationFolder="$(PublishDir)plugins"
     />
-	<ItemGroup> 
+<!--
+    <ItemGroup> 
       <PaccorScriptsLinux Include="$(PublishDir)scripts\*"/>
-	  <PaccorScriptsWindows Include="$(PublishDir)scripts\windows\*"/>
-	</ItemGroup>
-	<Move
+      <PaccorScriptsWindows Include="$(PublishDir)scripts\windows\*"/>
+    </ItemGroup>
+    <Move
       SourceFiles="@(PaccorScriptsLinux)"
       DestinationFolder="$(PublishDir)plugins/scripts"
     />
-	<Move
+    <Move
       SourceFiles="@(PaccorScriptsWindows)"
       DestinationFolder="$(PublishDir)plugins/scripts/windows"
     />
-	<RemoveDir Directories="$(PublishDir)scripts" />
+    <RemoveDir Directories="$(PublishDir)scripts" />
+-->
   </Target>
-  
-<ItemGroup>
+  <ItemGroup>
     <Content Include="plugins\**\*.*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </Content>  
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/HIRS_Provisioner.NET/hirs/hirs.csproj b/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
similarity index 97%
rename from HIRS_Provisioner.NET/hirs/hirs.csproj
rename to HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
index 4bd90607..d51f641b 100644
--- a/HIRS_Provisioner.NET/hirs/hirs.csproj
+++ b/HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
@@ -8,7 +8,9 @@
     <PublishSingleFile>true</PublishSingleFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PackageVersion>2.2.0</PackageVersion>
+    <Release></Release> 
+</PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
diff --git a/HIRS_Provisioner.NET/hirsTest/hirsTest.csproj b/HIRS_Provisioner.NET/hirsTest/hirsTest.csproj
index 61a47eff..120dfd60 100644
--- a/HIRS_Provisioner.NET/hirsTest/hirsTest.csproj
+++ b/HIRS_Provisioner.NET/hirsTest/hirsTest.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\hirs\hirs.csproj" />
+    <ProjectReference Include="..\hirs\HIRS_Provisioner.NET.csproj" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties resources_4settings_3test_4appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>