From e5f520623bf44e5c45cd7f7df2af0f9c5c1e3fb9 Mon Sep 17 00:00:00 2001
From: Tim Long <Tim@tigranetworks.co.uk>
Date: Tue, 1 Jan 2019 01:37:43 +0000
Subject: [PATCH] Moved installer build outputs into the BuildOutput directory
 Named outputs to include the SemVer from GitVersion

---
 .../TA.DigitalDomewoks.AscomDome.csproj         |  9 ++-------
 .../TA.DigitalDomeworks.AscomSwitch.csproj      |  9 ++-------
 .../TA.DigitalDomeworks.Aspects.csproj          | 10 ++++------
 .../TA.DigitalDomeworks.DeviceInterface.csproj  |  4 ++--
 ...TA.DigitalDomeworks.HardwareSimulator.csproj |  6 +++---
 .../TA.DigitalDomeworks.Installer.wixproj       | 17 +++++++++--------
 TA.DigitalDomeworks.Installer/packages.config   |  2 ++
 TA.DigitalDomeworks.Server/NLog.config          | 10 ++--------
 .../TA.DigitalDomeworks.Server.csproj           | 12 +++++-------
 .../TA.DigitalDomeworks.SharedTypes.csproj      |  6 +++---
 .../TA.DigitalDomeworks.Specifications.csproj   |  6 +++---
 11 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/TA.DigitalDomewoks.AscomDome/TA.DigitalDomewoks.AscomDome.csproj b/TA.DigitalDomewoks.AscomDome/TA.DigitalDomewoks.AscomDome.csproj
index c28ac11..89515e5 100644
--- a/TA.DigitalDomewoks.AscomDome/TA.DigitalDomewoks.AscomDome.csproj
+++ b/TA.DigitalDomewoks.AscomDome/TA.DigitalDomewoks.AscomDome.csproj
@@ -45,13 +45,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ASCOM.Platform">
-      <Version>6.4.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -59,7 +54,7 @@
       <Version>2018.2.1</Version>
     </PackageReference>
     <PackageReference Include="PostSharp">
-      <Version>6.0.26</Version>
+      <Version>6.0.32</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TA.DigitalDomeworks.AscomSwitch/TA.DigitalDomeworks.AscomSwitch.csproj b/TA.DigitalDomeworks.AscomSwitch/TA.DigitalDomeworks.AscomSwitch.csproj
index a2b315f..8970860 100644
--- a/TA.DigitalDomeworks.AscomSwitch/TA.DigitalDomeworks.AscomSwitch.csproj
+++ b/TA.DigitalDomeworks.AscomSwitch/TA.DigitalDomeworks.AscomSwitch.csproj
@@ -63,13 +63,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ASCOM.Platform">
-      <Version>6.4.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -77,7 +72,7 @@
       <Version>2018.2.1</Version>
     </PackageReference>
     <PackageReference Include="PostSharp">
-      <Version>6.0.26</Version>
+      <Version>6.0.32</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\TA.DigitalDomeworks.SharedCode\TA.DigitalDomeworks.SharedCode.projitems" Label="Shared" />
diff --git a/TA.DigitalDomeworks.Aspects/TA.DigitalDomeworks.Aspects.csproj b/TA.DigitalDomeworks.Aspects/TA.DigitalDomeworks.Aspects.csproj
index e49b0a4..6c25b0c 100644
--- a/TA.DigitalDomeworks.Aspects/TA.DigitalDomeworks.Aspects.csproj
+++ b/TA.DigitalDomeworks.Aspects/TA.DigitalDomeworks.Aspects.csproj
@@ -55,20 +55,18 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ASCOM.Platform">
-      <Version>6.4.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+      <Version>6.4.2</Version>
     </PackageReference>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.5.9</Version>
+      <Version>4.5.11</Version>
     </PackageReference>
     <PackageReference Include="PostSharp">
-      <Version>6.0.26</Version>
+      <Version>6.0.32</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\TA.DigitalDomeworks.SharedCode\TA.DigitalDomeworks.SharedCode.projitems" Label="Shared" />
diff --git a/TA.DigitalDomeworks.DeviceInterface/TA.DigitalDomeworks.DeviceInterface.csproj b/TA.DigitalDomeworks.DeviceInterface/TA.DigitalDomeworks.DeviceInterface.csproj
index 97d7ceb..c289242 100644
--- a/TA.DigitalDomeworks.DeviceInterface/TA.DigitalDomeworks.DeviceInterface.csproj
+++ b/TA.DigitalDomeworks.DeviceInterface/TA.DigitalDomeworks.DeviceInterface.csproj
@@ -75,7 +75,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -83,7 +83,7 @@
       <Version>2018.2.1</Version>
     </PackageReference>
     <PackageReference Include="PostSharp.Patterns.Model">
-      <Version>6.0.26</Version>
+      <Version>6.0.32</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\TA.DigitalDomeworks.SharedCode\TA.DigitalDomeworks.SharedCode.projitems" Label="Shared" />
diff --git a/TA.DigitalDomeworks.HardwareSimulator/TA.DigitalDomeworks.HardwareSimulator.csproj b/TA.DigitalDomeworks.HardwareSimulator/TA.DigitalDomeworks.HardwareSimulator.csproj
index 9b26cd3..81209ff 100644
--- a/TA.DigitalDomeworks.HardwareSimulator/TA.DigitalDomeworks.HardwareSimulator.csproj
+++ b/TA.DigitalDomeworks.HardwareSimulator/TA.DigitalDomeworks.HardwareSimulator.csproj
@@ -74,17 +74,17 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ASCOM.Platform">
-      <Version>6.4.0</Version>
+      <Version>6.4.2</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="TA.Ascom.ReactiveCommunications">
-      <Version>1.1.0</Version>
+      <Version>1.2.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TA.DigitalDomeworks.Installer/TA.DigitalDomeworks.Installer.wixproj b/TA.DigitalDomeworks.Installer/TA.DigitalDomeworks.Installer.wixproj
index 0bed53a..1bc037d 100644
--- a/TA.DigitalDomeworks.Installer/TA.DigitalDomeworks.Installer.wixproj
+++ b/TA.DigitalDomeworks.Installer/TA.DigitalDomeworks.Installer.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\UtilPack.NuGet.MSBuild.2.7.0\build\UtilPack.NuGet.MSBuild.props" Condition="Exists('..\packages\UtilPack.NuGet.MSBuild.2.7.0\build\UtilPack.NuGet.MSBuild.props')" />
   <Import Project="..\packages\WiX.3.11.1\build\wix.props" Condition="Exists('..\packages\WiX.3.11.1\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,22 +14,22 @@
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\Debug\x86\</OutputPath>
+    <OutputPath>..\BuildOutput\Debug\</OutputPath>
     <IntermediateOutputPath>obj\Debug\x86\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\Release\x86\</OutputPath>
+    <OutputPath>..\BuildOutput\Release\</OutputPath>
     <IntermediateOutputPath>obj\Release\x86\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <OutputPath>bin\Debug\x64\</OutputPath>
+    <OutputPath>..\BuildOutput\Debug\</OutputPath>
     <IntermediateOutputPath>obj\Debug\x64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
     <SuppressSpecificWarnings>1076</SuppressSpecificWarnings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>bin\Release\x64\</OutputPath>
+    <OutputPath>..\BuildOutput\Release\</OutputPath>
     <IntermediateOutputPath>obj\Release\x64\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
@@ -136,10 +137,7 @@
 	-->
   <!-- [TPL] name the output file to include the version from theLocalServer assembly -->
   <Target Name="BeforeBuild">
-    <GetAssemblyIdentity AssemblyFiles="$(SolutionDir)BuildOutput\$(Configuration)\TA.DigitalDomeworks.Server.exe">
-      <Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
-    </GetAssemblyIdentity>
-    <CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
+    <CreateProperty Value="$(OutputName)-$(Platform)-$(GitVersion_SemVer)">
       <Output TaskParameter="Value" PropertyName="TargetName" />
     </CreateProperty>
     <CreateProperty Value="$(TargetName)$(TargetExt)">
@@ -155,5 +153,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\WiX.3.11.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.1\build\wix.props'))" />
     <Error Condition="!Exists('..\packages\WiX.3.11.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.1\build\wix.props'))" />
+    <Error Condition="!Exists('..\packages\UtilPack.NuGet.MSBuild.2.7.0\build\UtilPack.NuGet.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UtilPack.NuGet.MSBuild.2.7.0\build\UtilPack.NuGet.MSBuild.props'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.4.0.0\build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.4.0.0\build\GitVersionTask.targets'))" />
   </Target>
+  <Import Project="..\packages\GitVersionTask.4.0.0\build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.4.0.0\build\GitVersionTask.targets')" />
 </Project>
\ No newline at end of file
diff --git a/TA.DigitalDomeworks.Installer/packages.config b/TA.DigitalDomeworks.Installer/packages.config
index 3027fb1..8442013 100644
--- a/TA.DigitalDomeworks.Installer/packages.config
+++ b/TA.DigitalDomeworks.Installer/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitVersionTask" version="4.0.0" developmentDependency="true" />
   <package id="TA.Ascom.WixCustomActions" version="0.1.0-Beta15" />
+  <package id="UtilPack.NuGet.MSBuild" version="2.7.0" developmentDependency="true" />
   <package id="WiX" version="3.11.1" />
 </packages>
\ No newline at end of file
diff --git a/TA.DigitalDomeworks.Server/NLog.config b/TA.DigitalDomeworks.Server/NLog.config
index e3dd3f5..05d7fb4 100644
--- a/TA.DigitalDomeworks.Server/NLog.config
+++ b/TA.DigitalDomeworks.Server/NLog.config
@@ -14,15 +14,9 @@
     <target xsi:type="File" name="LogFile"
             filename="${environment:variable=UserProfile}/logs/TA.DigitalDomeworks2018.LocalServer-${filesystem-normalize:fSNormalize=true:inner=${shortdate}-${windows-identity}-${machinename}.log}"
             layout="${time}|${pad:padding=-5:inner=${uppercase:${level}}}|${pad:padding=-16:inner=${callsite:className=true:fileName=false:includeSourcePath=false:methodName=false:includeNamespace=false}}|${message}" />
-    <target xsi:type="NLogViewer" name="viewer"
-            address="tcp://127.0.0.1:878"
-            newLine="false" maxMessageSize="65000" encoding="utf-8"
-            includeAllProperties="true"
-            layout="${log4jxmlevent:includeSourceInfo=true:includeCallSite=true:includeMdc=true:appInfo=LogEmiter:includeNdc=true:includeNLogData=true:includeAllProperties=true}"/>
   </targets>
   <rules>
-    <logger name="*" minlevel="Trace" writeTo="DebugView" />
-    <logger name="*" minlevel="Error" writeTo="LogFile" />
-    <logger name="*" minlevel="Trace" writeTo="viewer" />
+    <logger name="*" minlevel="Debug" writeTo="DebugView" />
+    <logger name="*" minlevel="Trace" writeTo="LogFile" />
   </rules>
 </nlog>
\ No newline at end of file
diff --git a/TA.DigitalDomeworks.Server/TA.DigitalDomeworks.Server.csproj b/TA.DigitalDomeworks.Server/TA.DigitalDomeworks.Server.csproj
index 892cfaf..6035e6f 100644
--- a/TA.DigitalDomeworks.Server/TA.DigitalDomeworks.Server.csproj
+++ b/TA.DigitalDomeworks.Server/TA.DigitalDomeworks.Server.csproj
@@ -148,12 +148,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ASCOM.Platform">
-      <Version>6.4.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+      <Version>6.4.2</Version>
     </PackageReference>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -169,13 +167,13 @@
       <Version>3.3.4</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.5.9</Version>
+      <Version>4.5.11</Version>
     </PackageReference>
     <PackageReference Include="PostSharp.Patterns.Threading">
-      <Version>6.0.26</Version>
+      <Version>6.0.32</Version>
     </PackageReference>
     <PackageReference Include="TA.Ascom.ReactiveCommunications">
-      <Version>1.1.0</Version>
+      <Version>1.2.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TA.DigitalDomeworks.SharedTypes/TA.DigitalDomeworks.SharedTypes.csproj b/TA.DigitalDomeworks.SharedTypes/TA.DigitalDomeworks.SharedTypes.csproj
index 0938377..f6515b0 100644
--- a/TA.DigitalDomeworks.SharedTypes/TA.DigitalDomeworks.SharedTypes.csproj
+++ b/TA.DigitalDomeworks.SharedTypes/TA.DigitalDomeworks.SharedTypes.csproj
@@ -59,15 +59,15 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.5.9</Version>
+      <Version>4.5.11</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive">
-      <Version>4.1.0</Version>
+      <Version>4.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\TA.DigitalDomeworks.SharedCode\TA.DigitalDomeworks.SharedCode.projitems" Label="Shared" />
diff --git a/TA.DigitalDomeworks.Specifications/TA.DigitalDomeworks.Specifications.csproj b/TA.DigitalDomeworks.Specifications/TA.DigitalDomeworks.Specifications.csproj
index 425acd9..96ab383 100644
--- a/TA.DigitalDomeworks.Specifications/TA.DigitalDomeworks.Specifications.csproj
+++ b/TA.DigitalDomeworks.Specifications/TA.DigitalDomeworks.Specifications.csproj
@@ -71,10 +71,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy">
-      <Version>4.8.0</Version>
+      <Version>4.9.2</Version>
     </PackageReference>
     <PackageReference Include="GitVersionTask">
-      <Version>3.6.5</Version>
+      <Version>4.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -82,7 +82,7 @@
       <Version>0.11.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>11.0.2</Version>
+      <Version>12.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>