Policy tool package output fix (#114)

* Policy tool published to consuming project output in debug packages
* Add policytool to release package

Author: condron

package.bat

@@ -4,5 +4,5 @@ del .\bld\pub\*.* /q
 dotnet restore .\src\ReactiveDomain.sln
 dotnet build .\src\ReactiveDomain.sln -c Debug
 dotnet publish .\src\ReactiveDomain.PolicyTool\ReactiveDomain.PolicyTool.csproj -p:PublishProfile=FolderProfile
-powershell -Command "& {.\tools\CreateDebugNuget.ps1 -rc003}"
+powershell -Command "& {.\tools\CreateDebugNuget.ps1 -rc009}"
 

src/ReactiveDomain.Policy.Debug.nuspec

@@ -22,16 +22,14 @@
         <reference file="ReactiveDomain.PolicyStorage.dll" />
         <reference file="ReactiveDomain.IdentityStorage.dll" />
       </group>
-    </references>
-    <contentFiles>
-      <files include="..\bld\pub\ReactiveDomain.PolicyTool.exe" buildAction="None" copyToOutput="true" />
-      <files include="..\bld\pub\appsettings.json" buildAction="None" copyToOutput="true" />
-    </contentFiles>
+    </references>    
   </metadata>
+  
   <files>
-    <file src="..\bld\pub\ReactiveDomain.PolicyTool.exe" target="PolicyTool.exe" />
-    <file src="..\bld\pub\appsettings.json" target="appsettings.json" />
-
+    <file src="..\bld\tools\ReactiveDomain.PolicyTool.exe" target="Build\PolicyTool.exe" />
+    <file src="..\bld\tools\es_settings.json" target="Build\es_settings.json" />
+    <file src="ReactiveDomain.Policy.targets" target="Build\" />
+    
     <file src="..\bld\Debug\netstandard2.0\ReactiveDomain.Policy.pdb" target="lib\netstandard2.0" />
     <file src="..\bld\Debug\netstandard2.0\ReactiveDomain.Policy.dll" target="lib\netstandard2.0" />
     <file src="..\bld\Debug\netstandard2.0\ReactiveDomain.Policy.dll" target="ref\netstandard2.0" />

src/ReactiveDomain.Policy.nuspec

@@ -23,15 +23,12 @@
         <reference file="ReactiveDomain.PolicyStorage.dll" />
         <reference file="ReactiveDomain.IdentityStorage.dll" />
       </group>
-    </references>
-    <contentFiles>
-      <files include="..\bld\pub\ReactiveDomain.PolicyTool.exe" buildAction="None" copyToOutput="true" />
-      <files include="..\bld\pub\appsettings.json" buildAction="None" copyToOutput="true" />
-    </contentFiles>
+    </references>    
   </metadata>
   <files>
-    <file src="..\bld\pub\ReactiveDomain.PolicyTool.exe" target="PolicyTool.exe" />
-    <file src="..\bld\pub\appsettings.json" target="appsettings.json" />
+    <file src="..\bld\tools\ReactiveDomain.PolicyTool.exe" target="Build\PolicyTool.exe" />
+    <file src="..\bld\tools\es_settings.json" target="Build\es_settings.json" />
+    <file src="ReactiveDomain.Policy.targets" target="Build\" />
 
     <file src="..\bld\Release\netstandard2.0\ReactiveDomain.Policy.pdb" target="lib\netstandard2.0" />
     <file src="..\bld\Release\netstandard2.0\ReactiveDomain.Policy.dll" target="lib\netstandard2.0" />

src/ReactiveDomain.Policy.targets

@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+      <None Include="$(MSBuildThisFileDirectory)PolicyTool.exe">
+        <Link>PolicyTool.exe</Link>
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+      <None Include="$(MSBuildThisFileDirectory)es_settings.json">
+        <Link>es_settings.json</Link>
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+  </Project>

src/ReactiveDomain.PolicyTool/Program.cs

@@ -285,7 +285,7 @@ private static void ConnectToEs()
         {
             AppConfig = new ConfigurationBuilder()
              .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
-             .AddJsonFile("appsettings.json")
+             .AddJsonFile("es_settings.json")
              .Build();
             Console.WriteLine($"{AppConfig["EventStoreUserName"]}");
             EsConnection = BuildConnection();

src/ReactiveDomain.PolicyTool/Properties/PublishProfiles/FolderProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\..\bld\pub</PublishDir>
+    <PublishDir>..\..\bld\tools\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <SelfContained>true</SelfContained>

src/ReactiveDomain.PolicyTool/ReactiveDomain.PolicyTool.csproj

@@ -22,7 +22,7 @@
  </ItemGroup>
 
   <ItemGroup>
-    <None Update="appsettings.json">
+    <None Update="es_settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

src/ReactiveDomain.PolicyTool/appsettings.json renamed to src/ReactiveDomain.PolicyTool/es_settings.json

@@ -37,6 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		ReactiveDomain.Policy.Debug.nuspec = ReactiveDomain.Policy.Debug.nuspec
 		ReactiveDomain.Policy.nuspec = ReactiveDomain.Policy.nuspec
 		ReactiveDomain.Testing.Debug.nuspec = ReactiveDomain.Testing.Debug.nuspec
+		ReactiveDomain.Policy.targets = ReactiveDomain.Policy.targets
 		ReactiveDomain.Testing.nuspec = ReactiveDomain.Testing.nuspec
 		ReactiveDomain.UI.Debug.nuspec = ReactiveDomain.UI.Debug.nuspec
 		ReactiveDomain.UI.nuspec = ReactiveDomain.UI.nuspec

src/ReactiveDomain.sln

@@ -42,6 +42,7 @@ Copy-Item -Path $buildDir -Destination $tempBuildDir -Recurse
 #source nuspec file paths
 $sourceRDNuspec = Join-Path $sourceDir "ReactiveDomain.Debug.nuspec"
 $sourceRDPolicyNuspec = Join-Path $sourceDir "ReactiveDomain.Policy.Debug.nuspec"
+$sourceRDPolicyTargets = Join-Path $sourceDir "ReactiveDomain.Policy.targets"
 $sourceRDTestNuspec = Join-Path $sourceDir "ReactiveDomain.Testing.Debug.nuspec"
 $sourceRDUINuspec = Join-Path $sourceDir "ReactiveDomain.UI.Debug.nuspec"
 $sourceRDUITestNuspec = Join-Path $sourceDir "ReactiveDomain.UI.Testing.Debug.nuspec"
@@ -50,6 +51,7 @@ $sourceRDUITestNuspec = Join-Path $sourceDir "ReactiveDomain.UI.Testing.Debug.nu
 #target nuspec file paths in temp dir
 $ReactiveDomainNuspec = Join-Path $tempSourceDir "ReactiveDomain.Debug.nuspec"
 $ReactiveDomainPolicyNuspec = Join-Path $tempSourceDir "ReactiveDomain.Policy.Debug.nuspec"
+$ReactiveDomainPolicyTargets = Join-Path $tempSourceDir "ReactiveDomain.Policy.targets"
 $ReactiveDomainTestingNuspec = Join-Path $tempSourceDir "ReactiveDomain.Testing.Debug.nuspec"
 $ReactiveDomainUINuspec = Join-Path $tempSourceDir "ReactiveDomain.UI.Debug.nuspec"
 $ReactiveDomainUITestingNuspec = Join-Path $tempSourceDir "ReactiveDomain.UI.Testing.Debug.nuspec"
@@ -58,6 +60,7 @@ $ReactiveDomainUITestingNuspec = Join-Path $tempSourceDir "ReactiveDomain.UI.Tes
 #copy nuspec files to temp
 Copy-Item $sourceRDNuspec -Destination $ReactiveDomainNuspec
 Copy-Item $sourceRDPolicyNuspec -Destination $ReactiveDomainPolicyNuspec
+Copy-Item $sourceRDPolicyTargets -Destination $ReactiveDomainPolicyTargets
 Copy-Item $sourceRDTestNuspec -Destination $ReactiveDomainTestingNuspec
 Copy-Item $sourceRDUINuspec -Destination $ReactiveDomainUINuspec
 Copy-Item $sourceRDUITestNuspec -Destination $ReactiveDomainUITestingNuspec