From 8ee7c159f46fe0e9218d27439e9543cba13b2919 Mon Sep 17 00:00:00 2001
From: Andreas Gullberg Larsen <anjdreas@gmail.com>
Date: Sun, 30 Oct 2016 09:39:34 +0100
Subject: [PATCH 1/3] GenerateUnits.bat: Resolve absolute path

So it can be run from other work dirs.
---
 GenerateUnits.bat | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/GenerateUnits.bat b/GenerateUnits.bat
index 077e591b5e..0b52484ae7 100644
--- a/GenerateUnits.bat
+++ b/GenerateUnits.bat
@@ -1,3 +1,4 @@
 @echo off
-powershell -ExecutionPolicy Bypass -NoProfile -File .\UnitsNet\Scripts\GenerateUnits.ps1
+SET scriptdir=%~dp0
+powershell -ExecutionPolicy Bypass -NoProfile -File %scriptdir%UnitsNet\Scripts\GenerateUnits.ps1
 pause

From fbd44fd568d55ab2a0a7ef6a232bc94fe1818f19 Mon Sep 17 00:00:00 2001
From: Andreas Gullberg Larsen <anjdreas@gmail.com>
Date: Sun, 30 Oct 2016 09:40:14 +0100
Subject: [PATCH 2/3] UnitsNet.Net35: Add pre-build step to regenerate code

Ideally this was a solution-wide pre-build step, but only way to achieve
that is to add a new project and let the others depend on it, but seems
a bit overkill. If you edit the source code (shared among the core
projects), then the Net35 project will rebuild when you build the
solution.
---
 UnitsNet/UnitsNet.Net35.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/UnitsNet/UnitsNet.Net35.csproj b/UnitsNet/UnitsNet.Net35.csproj
index 503dd6a257..f79e06f464 100644
--- a/UnitsNet/UnitsNet.Net35.csproj
+++ b/UnitsNet/UnitsNet.Net35.csproj
@@ -48,6 +48,9 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>call $(ProjectDir)..\GenerateUnits.bat</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From 211eaeb9318d018a500109f578fea1862a676397 Mon Sep 17 00:00:00 2001
From: Andreas Gullberg Larsen <anjdreas@gmail.com>
Date: Sun, 30 Oct 2016 12:32:29 +0100
Subject: [PATCH 3/3] build.bat: Build src and tests in one go

Pre-build step was ran twice, and generally the setup of .msbuild files
were unnecessarily complex. Simplified by building source and tests in one go
via all.msbuild and defining relative paths directly instead of paths.msbuild.

* Add all.msbuild
* Remove obsolete .msbuild files: src, tests, paths
* Rename to build-all-release/debug.bat
* build.bat: Remove call to GenerateUnits.bat, called by pre-build step
---
 Build/all.msbuild                             | 34 +++++++++++++++++++
 ...uild-src-debug.bat => build-all-debug.bat} |  2 +-
 ...-src-release.bat => build-all-release.bat} |  2 +-
 Build/build.bat                               |  9 ++---
 Build/paths.msbuild                           | 26 --------------
 Build/src.msbuild                             | 30 ----------------
 Build/tests.msbuild                           | 29 ----------------
 7 files changed, 38 insertions(+), 94 deletions(-)
 create mode 100644 Build/all.msbuild
 rename Build/{build-src-debug.bat => build-all-debug.bat} (74%)
 rename Build/{build-src-release.bat => build-all-release.bat} (75%)
 delete mode 100644 Build/paths.msbuild
 delete mode 100644 Build/src.msbuild
 delete mode 100644 Build/tests.msbuild

diff --git a/Build/all.msbuild b/Build/all.msbuild
new file mode 100644
index 0000000000..10cd4fec26
--- /dev/null
+++ b/Build/all.msbuild
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CompileProjects" ToolsVersion="14.0">
+
+  <PropertyGroup>
+    <Platform>AnyCPU</Platform>
+    <Configuration>Release</Configuration>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <RootPath>$(MSBuildProjectDirectory)\..\</RootPath>
+  </PropertyGroup>
+
+  <Target Name="CleanAndBuild" DependsOnTargets="Clean;CompileProjects" />
+
+  <Target Name="Clean">
+    <MSBuild Projects="@(AllProjects)" Targets="Clean" />
+    <RemoveDir Directories="$(SrcBinPath)" />
+  </Target>
+
+  <Target Name="CompileProjects">
+    <MSBuild Projects="
+        $(RootPath)\UnitsNet\UnitsNet.Net35.csproj;
+        $(RootPath)\UnitsNet\UnitsNet.Portable40.csproj;
+        $(RootPath)\UnitsNet\UnitsNet.NetStandard10.csproj;
+        $(RootPath)\UnitsNet\UnitsNet.WindowsRuntimeComponent.csproj;
+        $(RootPath)\UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.Net35.csproj;
+        $(RootPath)\UnitsNet.Tests\UnitsNet.Tests.csproj;
+        $(RootPath)\UnitsNet.Tests\UnitsNet.WindowsRuntimeComponent.Tests.csproj;
+        $(RootPath)\UnitsNet.Serialization.JsonNet.Tests\UnitsNet.Serialization.JsonNet.Tests.csproj"
+
+      Properties="Platform=$(Platform);Configuration=$(Configuration);VisualStudioVersion=$(VisualStudioVersion)"
+      Targets="Build">
+    </MSBuild>
+  </Target>
+
+</Project>
diff --git a/Build/build-src-debug.bat b/Build/build-all-debug.bat
similarity index 74%
rename from Build/build-src-debug.bat
rename to Build/build-all-debug.bat
index ee233c955a..b7b01c203f 100644
--- a/Build/build-src-debug.bat
+++ b/Build/build-all-debug.bat
@@ -1,3 +1,3 @@
 SET ROOT=%~dp0..
-"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %ROOT%\Build\src.msbuild /verbosity:normal /p:Configuration=Debug /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
+"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %ROOT%\Build\all.msbuild /verbosity:normal /p:Configuration=Debug /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/Build/build-src-release.bat b/Build/build-all-release.bat
similarity index 75%
rename from Build/build-src-release.bat
rename to Build/build-all-release.bat
index 24a900ee11..98172cc3a1 100644
--- a/Build/build-src-release.bat
+++ b/Build/build-all-release.bat
@@ -1,4 +1,4 @@
 @echo off
 SET ROOT=%~dp0..
-"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"  %ROOT%\Build\src.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
+"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"  %ROOT%\Build\all.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/Build/build.bat b/Build/build.bat
index 014b94d58b..869aec3779 100644
--- a/Build/build.bat
+++ b/Build/build.bat
@@ -1,20 +1,15 @@
 @echo off
 SET ROOT=%~dp0..
+
 if exist %ROOT%\Artifacts rmdir /Q /S %ROOT%\Artifacts
 
 call powershell -NoProfile %ROOT%\Build\UpdateAssemblyInfo.ps1
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-call powershell -ExecutionPolicy Bypass -NoProfile -File %ROOT%\UnitsNet\Scripts\GenerateUnits.ps1
-if %errorlevel% neq 0 exit /b %errorlevel%
-
 call %ROOT%\Build\nuget-restore.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-call %ROOT%\Build\build-src-release.bat
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-call %ROOT%\Build\build-tests.bat
+call %ROOT%\Build\build-all-release.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 call %ROOT%\Build\run-tests.bat
diff --git a/Build/paths.msbuild b/Build/paths.msbuild
deleted file mode 100644
index 438e0c1e8c..0000000000
--- a/Build/paths.msbuild
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RootPath>$(MSBuildProjectDirectory)\..\</RootPath>
-    
-    <!-- Root -->
-    <ArtifactsPath>$(RootPath)\Artifacts</ArtifactsPath>
-    <SrcPath>$(RootPath)\UnitsNet</SrcPath>
-    <SerializationSrcPath>$(RootPath)\UnitsNet.Serialization.JsonNet</SerializationSrcPath>
-    <TestsSrcPath>$(RootPath)\UnitsNet.Tests</TestsSrcPath>
-    <SerializationTestsSrcPath>$(RootPath)\UnitsNet.Serialization.JsonNet.Tests</SerializationTestsSrcPath>
-    <BuildToolsPath>$(RootPath)\Tools</BuildToolsPath>
-    <LibsPath>$(RootPath)\Libs</LibsPath>
-	<ToolsPath>$(RootPath)\Tools</ToolsPath>
-
-    <!-- Artifacts -->
-    <BuildLogsPath>$(ArtifactsPath)\BuildLog</BuildLogsPath>
-    <DeployPath>$(ArtifactsPath)\Deploy</DeployPath>
-    <BinPath>$(ArtifactsPath)\Bin</BinPath>
-    
-    <!-- Artifacts\Bin -->
-    <SrcBinBasePath>$(BinPath)\Src</SrcBinBasePath>
-    <TestsBinPath>$(BinPath)\Tests\$(Platform)_$(Configuration)</TestsBinPath>
-    <SrcBinPath>$(SrcBinBasePath)\$(Platform)_$(Configuration)</SrcBinPath>    
-    
-  </PropertyGroup>
-</Project>
diff --git a/Build/src.msbuild b/Build/src.msbuild
deleted file mode 100644
index 9acd014f69..0000000000
--- a/Build/src.msbuild
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CompileProjects" ToolsVersion="14.0">
-  <Import Project="paths.msbuild" />
-
-  <PropertyGroup>
-    <Platform>AnyCPU</Platform>
-    <Configuration>Release</Configuration>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-  </PropertyGroup>
-
-  <Target Name="CleanAndBuild" DependsOnTargets="Clean;CompileProjects" />
-
-  <Target Name="Clean">
-    <MSBuild Projects="@(AllProjects)" Targets="Clean" />
-    <RemoveDir Directories="$(SrcBinPath)" />
-  </Target>
-
-  <Target Name="CompileProjects">
-
-    <MSBuild Projects="
-$(SrcPath)\UnitsNet.Net35.csproj;
-$(SrcPath)\UnitsNet.Portable40.csproj;
-$(SrcPath)\UnitsNet.NetStandard10.csproj;
-$(SrcPath)\UnitsNet.WindowsRuntimeComponent.csproj;
-$(SerializationSrcPath)\UnitsNet.Serialization.JsonNet.Net35.csproj"
-       Properties="Platform=$(Platform);Configuration=$(Configuration);VisualStudioVersion=$(VisualStudioVersion);AllowUnsafeBlocks=true;Retries=15;RetryDelayMilliseconds=5"
-       Targets="Build">
-    </MSBuild>
-  </Target>
-</Project>
diff --git a/Build/tests.msbuild b/Build/tests.msbuild
deleted file mode 100644
index 9c61397fe5..0000000000
--- a/Build/tests.msbuild
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CleanAndBuild" ToolsVersion="14.0">
-  <Import Project="paths.msbuild" />
-
-  <PropertyGroup>
-    <Platform>AnyCPU</Platform>
-    <Configuration>Release</Configuration>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-  </PropertyGroup>
-
-  <Target Name="CleanAndBuild" DependsOnTargets="Clean;CompileProjects" />
-
-  <Target Name="Clean">
-    <MSBuild Projects="@(AllProjects)" Targets="Clean" />
-    <RemoveDir Directories="$(TestsBinPath)" />
-  </Target>
-
-  <Target Name="CompileProjects">
-
-    <MSBuild Projects="
-$(TestsSrcPath)\UnitsNet.Tests.csproj;
-$(TestsSrcPath)\UnitsNet.WindowsRuntimeComponent.Tests.csproj;
-$(SerializationTestsSrcPath)\UnitsNet.Serialization.JsonNet.Tests.csproj"
-       Properties="Platform=$(Platform);Configuration=$(Configuration);VisualStudioVersion=$(VisualStudioVersion);AllowUnsafeBlocks=true"
-       Targets="Build">
-    </MSBuild>
-
-  </Target>
-</Project>