From 837b3163d1d3a857df1e2ac1367ff3f08b744115 Mon Sep 17 00:00:00 2001
From: Matthias Vill <github@cconstruct.de>
Date: Mon, 26 Oct 2020 14:26:23 +0100
Subject: [PATCH 1/3] Replace CreateAssemblyGenerator.exe by
 CreateAssemblyGenerator.ps1

---
 Build/Build.ssmssqlproj           |   4 +-
 Build/CreateAssemblyGenerator.exe | Bin 8192 -> 0 bytes
 Build/CreateAssemblyGenerator.ps1 | 111 ++++++++++++++++++++++++++++++
 Build/tSQLt.build.xml             |  82 ++++++++++++++++------
 4 files changed, 175 insertions(+), 22 deletions(-)
 delete mode 100644 Build/CreateAssemblyGenerator.exe
 create mode 100644 Build/CreateAssemblyGenerator.ps1

diff --git a/Build/Build.ssmssqlproj b/Build/Build.ssmssqlproj
index 00d157469..44dafa35a 100644
--- a/Build/Build.ssmssqlproj
+++ b/Build/Build.ssmssqlproj
@@ -131,11 +131,11 @@
           <AssociatedConnUserName />
           <FullPath>ChangeSigningKey_ReadMe.txt</FullPath>
         </FileNode>
-        <FileNode Name="CreateAssemblyGenerator.exe">
+        <FileNode Name="CreateAssemblyGenerator.ps1">
           <AssociatedConnectionMoniker />
           <AssociatedConnSrvName />
           <AssociatedConnUserName />
-          <FullPath>CreateAssemblyGenerator.exe</FullPath>
+          <FullPath>CreateAssemblyGenerator.ps1</FullPath>
         </FileNode>
         <FileNode Name="Install the tSQLt build.docx">
           <AssociatedConnectionMoniker />
diff --git a/Build/CreateAssemblyGenerator.exe b/Build/CreateAssemblyGenerator.exe
deleted file mode 100644
index b48385a8bf9a2e26e26868325e9b1e0c612b4d82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
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
F{vXvSgC+m~

diff --git a/Build/CreateAssemblyGenerator.ps1 b/Build/CreateAssemblyGenerator.ps1
new file mode 100644
index 000000000..f45fcdc9d
--- /dev/null
+++ b/Build/CreateAssemblyGenerator.ps1
@@ -0,0 +1,111 @@
+param([Parameter(Mandatory = $true)][string]$dllPath,
+    [Parameter(Mandatory = $true)][string]$templatePath,
+    [Parameter(Mandatory = $true)][string]$assemblyPattern,
+    [string]$thumbPrintPattern,
+    [int]$maxLength = 0,
+    [string]$separator = "'+$( [Environment]::NewLine )'")
+
+$ErrorActionPreference = 'Stop'
+
+class Generator
+{
+    static
+    [string]
+    GetHexStringFromBytes([byte[]]$dllBytes)
+    {
+        $stringBuilder = [System.Text.StringBuilder]::new('0x', $dllBytes.Length * 2 + 2)
+
+        foreach ($dllByte in $dllBytes)
+        {
+            $stringBuilder.Append($dllByte.ToString('X2'))
+        }
+
+        return $stringBuilder.ToString()
+    }
+
+    static
+    [byte[]]
+    GetBytesFromDll([string]$dllPath)
+    {
+        return (Get-Content -Path $dllPath -AsByteStream -Raw)
+    }
+
+    static
+    [string]
+    GetTemplateFile([string]$templatePath)
+    {
+        return (Get-Content -Path $templatePath -Raw)
+    }
+
+    static
+    [string]
+    GetTemplate([string]$templatePath,
+                [string]$assemblyPattern,
+                [string]$thumbPrintPattern)
+    {
+        $template = [Generator]::GetTemplateFile($templatePath)
+        if ($template -notmatch $assemblyPattern)
+        {
+            throw "The specified template file [" + $templatePath + "] did not contain the specified assembly pattern [" + $assemblyPattern + "]!"
+        }
+
+        if (![string]::IsNullOrEmpty($thumbPrintPattern) -and $template -notmatch $thumbPrintPattern)
+        {
+            throw "The specified template file [" + $templatePath + "] did not contain the specified thumbprint pattern [" + $thumbPrintPattern + "]!"
+        }
+        return $template
+    }
+
+    static
+    [byte[]]
+    GetAssemblyBytes([string]$dllPath)
+    {
+        $bytesFromDll = [Generator]::GetBytesFromDll($dllPath)
+        if ($bytesFromDll.Length -eq 0)
+        {
+            throw "The DLL specified [" + $dllPath + "] for generating the CREATE ASSEMBLY statement was empty"
+        }
+        return $bytesFromDll
+    }
+
+    static
+    [string]
+    Wrap([string]$hexString,
+         [int] $maxLength,
+         [string] $separator)
+    {
+        if ($maxLength -le 0 -or $hexString.Length -le $maxLength)
+        {
+            return $hexString
+        }
+
+        $separator = $separator -replace '\\n', [Environment]::NewLine
+        $stringBuilder = [System.Text.StringBuilder]::new($hexString.Length + [int][Math]::Floor($hexString.Length / $maxLength) * $separator.Length)
+
+        $stringBuilder.Append($hexString, 0, $maxLength);
+        for ($i = $maxLength; $i -lt $hexString.Length; $i += $maxLength) {
+            $stringBuilder.Append($separator)
+            $stringBuilder.Append($hexString, $i,[Math]::Min($maxLength, $hexString.Length - $i))
+        }
+
+        return $stringBuilder.ToString()
+    }
+}
+
+$template = [Generator]::GetTemplate($templatePath, $assemblyPattern, $thumbPrintPattern)
+$assemblyBytes = [Generator]::GetAssemblyBytes($dllPath)
+
+if (![string]::IsNullOrEmpty($thumbPrintPattern))
+{
+    $thumbPrint = [Generator]::GetHexStringFromBytes([System.Reflection.Assembly]::Load($assemblyBytes).GetName().GetPublicKeyToken())
+    $template = $template -replace $thumbPrintPattern, $thumbPrint
+}
+
+if (![string]::IsNullOrEmpty($assemblyPattern))
+{
+    $hexString = [Generator]::GetHexStringFromBytes($assemblyBytes)
+    $assembly = [Generator]::Wrap($hexString, $maxLength, $separator)
+    $template = $template -replace $assemblyPattern, $assembly
+}
+
+Write-Host $template
diff --git a/Build/tSQLt.build.xml b/Build/tSQLt.build.xml
index 0b3046c09..c45c3bb83 100644
--- a/Build/tSQLt.build.xml
+++ b/Build/tSQLt.build.xml
@@ -112,24 +112,50 @@
 
  <target name="package.construct.tsqlt">
   <echo message="Generating CREATE ASSEMBLY statement."/>
-  <exec executable="cmd" dir="." failonerror="true" output="temp/CreateAssembly.sql">
-   <arg value="/c"/>
-   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/tSQLtCLR.dll ../Source/tSQLtCLR.mdl.sql 0x000000 &quot;&quot; 200 &quot;'+\n'&quot;"/>
-  </exec>
-  <exec executable="cmd" dir="." failonerror="true" >
-   <arg value="/c"/>
-   <arg value="type temp\CreateAssembly.sql"/>
+  <exec executable="pwsh" dir="." failonerror="true" output="temp/CreateAssembly.sql" logError="true">
+   <arg value="-ExecutionPolicy"/>
+   <arg value="RemoteSigned"/>
+   <arg value="-File"/>
+   <arg value="CreateAssemblyGenerator.ps1"/>
+   <arg value="-dllPath"/>
+   <arg value="output/tSQLtCLR/tSQLtCLR.dll"/>
+   <arg value="-templatePath"/>
+   <arg value="../Source/tSQLtCLR.mdl.sql"/>
+   <arg value="-assemblyPattern"/>
+   <arg value="0x000000"/>
+   <arg value="-thumbprintPattern"/>
+   <arg value=""/>
+   <arg value="-maxLength"/>
+   <arg value="200"/>
+   <arg value="-separator"/>
+   <arg value="'+\n'"/>
   </exec>
+  <concat>
+   <filelist dir="." files="temp\CreateAssembly.sql"/>
+  </concat>
 
   <echo message="Generating GetAssemblyKeyBytes function."/>
-  <exec executable="cmd" dir="." failonerror="true" output="output/tSQLt.Private_GetAssemblyKeyBytes.sql">
-   <arg value="/c"/>
-   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/tSQLtAssemblyKey.dll ../Source/tSQLt.Private_GetAssemblyKeyBytes.mdl.sql 0x000000 0x000001 200 &quot;+\n0x&quot;"/>
-  </exec>
-  <exec executable="cmd" dir="." failonerror="true" >
-   <arg value="/c"/>
-   <arg value="type output\tSQLt.Private_GetAssemblyKeyBytes.sql"/>
+  <exec executable="pwsh" dir="." failonerror="true" output="output/tSQLt.Private_GetAssemblyKeyBytes.sql" logError="true">
+   <arg value="-ExecutionPolicy"/>
+   <arg value="RemoteSigned"/>
+   <arg value="-File"/>
+   <arg value="CreateAssemblyGenerator.ps1"/>
+   <arg value="-dllPath"/>
+   <arg value="output/tSQLtCLR/tSQLtAssemblyKey.dll"/>
+   <arg value="-templatePath"/>
+   <arg value="../Source/tSQLt.Private_GetAssemblyKeyBytes.mdl.sql"/>
+   <arg value="-assemblyPattern"/>
+   <arg value="0x000000"/>
+   <arg value="-thumbprintPattern"/>
+   <arg value="0x000001"/>
+   <arg value="-maxLength"/>
+   <arg value="200"/>
+   <arg value="-separator"/>
+   <arg value="+\n0x"/>
   </exec>
+  <concat>
+   <filelist dir="." files="output/tSQLt.Private_GetAssemblyKeyBytes.sql"/>
+  </concat>
 
   <exec executable="cmd" dir="." failonerror="true">
    <arg value="/c"/>
@@ -291,15 +317,31 @@
 
  <target name="package.test.files">
   <echo message="scripting tSQLtTestUtilCLR.dll" />
-  <exec executable="cmd" dir="." failonerror="true" output="temp/CreateTestUtilAssembly.sql">
-   <arg value="/c"/>
-   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/tSQLtTestUtilCLR.dll ../TestUtil/tSQLtTestUtilCLR.mdl.sql 0x000000"/>
+  <exec executable="pwsh" dir="." failonerror="true" output="temp/CreateTestUtilAssembly.sql" logError="true">
+   <arg value="-ExecutionPolicy"/>
+   <arg value="RemoteSigned"/>
+   <arg value="-File"/>
+   <arg value="CreateAssemblyGenerator.ps1"/>
+   <arg value="-dllPath"/>
+   <arg value="output/tSQLtCLR/tSQLtTestUtilCLR.dll"/>
+   <arg value="-templatePath"/>
+   <arg value="../TestUtil/tSQLtTestUtilCLR.mdl.sql"/>
+   <arg value="-assemblyPattern"/>
+   <arg value="0x000000"/>
   </exec>
 
   <echo message="scripting UnsignedEmpty.dll" />
-  <exec executable="cmd" dir="." failonerror="true" output="temp/GetUnsignedEmptyBytes.sql">
-   <arg value="/c"/>
-   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/UnsignedEmpty.dll ../TestUtil/GetUnsignedEmptyBytes.mdl.sql 0x000000"/>
+  <exec executable="pwsh" dir="." failonerror="true" output="temp/GetUnsignedEmptyBytes.sql" logError="true">
+   <arg value="-ExecutionPolicy"/>
+   <arg value="RemoteSigned"/>
+   <arg value="-File"/>
+   <arg value="CreateAssemblyGenerator.ps1"/>
+   <arg value="-dllPath"/>
+   <arg value="output/tSQLtCLR/UnsignedEmpty.dll"/>
+   <arg value="-templatePath"/>
+   <arg value="../TestUtil/GetUnsignedEmptyBytes.mdl.sql"/>
+   <arg value="-assemblyPattern"/>
+   <arg value="0x000000"/>
   </exec>
 
   <echo message="Building TestUtil.sql" />

From 91980cd5679c577b53184767a61ade5f5faaf18b Mon Sep 17 00:00:00 2001
From: Matthias Vill <github@cconstruct.de>
Date: Mon, 26 Oct 2020 15:51:08 +0100
Subject: [PATCH 2/3] Indent outputted scripts for better readability

---
 Build/tSQLt.build.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Build/tSQLt.build.xml b/Build/tSQLt.build.xml
index c45c3bb83..2988e0f11 100644
--- a/Build/tSQLt.build.xml
+++ b/Build/tSQLt.build.xml
@@ -132,6 +132,9 @@
   </exec>
   <concat>
    <filelist dir="." files="temp\CreateAssembly.sql"/>
+   <filterchain>
+    <prefixlines prefix="    "/>
+   </filterchain>
   </concat>
 
   <echo message="Generating GetAssemblyKeyBytes function."/>
@@ -155,6 +158,9 @@
   </exec>
   <concat>
    <filelist dir="." files="output/tSQLt.Private_GetAssemblyKeyBytes.sql"/>
+   <filterchain>
+    <prefixlines prefix="    "/>
+   </filterchain>
   </concat>
 
   <exec executable="cmd" dir="." failonerror="true">

From 56aea07251c19e09a53a1da453b6648c9c82319c Mon Sep 17 00:00:00 2001
From: Matthias Vill <github@cconstruct.de>
Date: Sun, 1 Nov 2020 15:15:35 +0100
Subject: [PATCH 3/3] Use powershell instead of pwsh on windows (should be
 preinstalled since Windows 7)

---
 Build/tSQLt.build.xml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Build/tSQLt.build.xml b/Build/tSQLt.build.xml
index 2988e0f11..0ba00acc5 100644
--- a/Build/tSQLt.build.xml
+++ b/Build/tSQLt.build.xml
@@ -2,8 +2,20 @@
 <project name="tSQLt" default="all" basedir=".">
  <description>Build tSQLt</description>
 
+ <condition property="powershell.exe" value="powershell" else="pwsh">
+  <os family="windows"/>
+ </condition>
+
  <target name="validate.parameters" description="">
-  <!-- no parameters at this point-->
+  <fail message="Parameter '${powershell.exe}' is required">
+   <condition>
+    <not>
+     <and>
+      <isset property="${powershell.exe}"/>
+     </and>
+    </not>
+   </condition>
+  </fail>
  </target>
 
  <target
@@ -112,7 +124,7 @@
 
  <target name="package.construct.tsqlt">
   <echo message="Generating CREATE ASSEMBLY statement."/>
-  <exec executable="pwsh" dir="." failonerror="true" output="temp/CreateAssembly.sql" logError="true">
+  <exec executable="${powershell.exe}" dir="." failonerror="true" output="temp/CreateAssembly.sql" logError="true">
    <arg value="-ExecutionPolicy"/>
    <arg value="RemoteSigned"/>
    <arg value="-File"/>
@@ -138,7 +150,7 @@
   </concat>
 
   <echo message="Generating GetAssemblyKeyBytes function."/>
-  <exec executable="pwsh" dir="." failonerror="true" output="output/tSQLt.Private_GetAssemblyKeyBytes.sql" logError="true">
+  <exec executable="${powershell.exe}" dir="." failonerror="true" output="output/tSQLt.Private_GetAssemblyKeyBytes.sql" logError="true">
    <arg value="-ExecutionPolicy"/>
    <arg value="RemoteSigned"/>
    <arg value="-File"/>
@@ -323,7 +335,7 @@
 
  <target name="package.test.files">
   <echo message="scripting tSQLtTestUtilCLR.dll" />
-  <exec executable="pwsh" dir="." failonerror="true" output="temp/CreateTestUtilAssembly.sql" logError="true">
+  <exec executable="${powershell.exe}" dir="." failonerror="true" output="temp/CreateTestUtilAssembly.sql" logError="true">
    <arg value="-ExecutionPolicy"/>
    <arg value="RemoteSigned"/>
    <arg value="-File"/>
@@ -337,7 +349,7 @@
   </exec>
 
   <echo message="scripting UnsignedEmpty.dll" />
-  <exec executable="pwsh" dir="." failonerror="true" output="temp/GetUnsignedEmptyBytes.sql" logError="true">
+  <exec executable="${powershell.exe}" dir="." failonerror="true" output="temp/GetUnsignedEmptyBytes.sql" logError="true">
    <arg value="-ExecutionPolicy"/>
    <arg value="RemoteSigned"/>
    <arg value="-File"/>