From 5fc40a670aeca38d7eef6022c0c2ddf02fefac05 Mon Sep 17 00:00:00 2001
From: Drew Skwiers-Koballa <drew.skwierskoballa@microsoft.com>
Date: Fri, 25 Sep 2020 14:25:08 -0700
Subject: [PATCH 1/5] update dacfx to 18.6

---
 images/win/scripts/Installers/Install-DACFx.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/win/scripts/Installers/Install-DACFx.ps1
index fb50af0d..01c1c47f 100644
--- a/images/win/scripts/Installers/Install-DACFx.ps1
+++ b/images/win/scripts/Installers/Install-DACFx.ps1
@@ -6,7 +6,7 @@
 Import-Module -Name ImageHelpers -Force
 
 $InstallerName = "DacFramework.msi"
-$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2134206"
+$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2143544"
 
 Install-Binary -Url $InstallerUrl -Name $InstallerName
 

From c4a0c6a8eab7e9d5cdb7dc10c3cb0d825f789ae8 Mon Sep 17 00:00:00 2001
From: Drew Skwiers-Koballa <drew.skwierskoballa@microsoft.com>
Date: Wed, 30 Sep 2020 13:47:59 -0700
Subject: [PATCH 2/5] adds dacfx to win tools report

---
 images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index 85c73c15..cf5c7b0b 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -260,3 +260,9 @@ function Get-AZDSVersion {
     $azdsVersion = $(azds --version) | Select-String "(\d+\.\d+\.\d+.\d+)"
     return "Azure Dev Spaces CLI $azdsVersion"
 }
+
+function Get-DacFxVersion {
+    cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\"
+    $dacfxversion = (./sqlpackage.exe /version)
+    return "DacFx $dacfxversion"
+}
\ No newline at end of file

From bae2994912d49b28e39e26d24b09bc0380cbecda Mon Sep 17 00:00:00 2001
From: Drew Skwiers-Koballa <drew.skwierskoballa@microsoft.com>
Date: Thu, 1 Oct 2020 07:55:23 -0700
Subject: [PATCH 3/5] adding function to actual report

---
 images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 28a07dce..efc77354 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -119,6 +119,7 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-AWSSessionManagerVersion),
     (Get-AlibabaCLIVersion),
     (Get-CloudFoundryVersion),
+    (Get-DacFxVersion),
     (Get-HubVersion),
     (Get-GHVersion)
 )

From 1e8fd7a1087da3426c0fbebcb03753f7bcbe7770 Mon Sep 17 00:00:00 2001
From: Drew Skwiers-Koballa <drew.skwierskoballa@microsoft.com>
Date: Mon, 5 Oct 2020 08:11:58 -0700
Subject: [PATCH 4/5] moves dacfx to database tools in report

---
 images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 65727f0a..bcc74048 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -117,7 +117,6 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-AWSSessionManagerVersion),
     (Get-AlibabaCLIVersion),
     (Get-CloudFoundryVersion),
-    (Get-DacFxVersion),
     (Get-HubVersion),
     (Get-GHVersion)
 )
@@ -168,6 +167,7 @@ $markdown += New-MDNewLine
 $markdown += New-MDHeader "Database tools" -Level 3
 $markdown += New-MDList -Style Unordered -Lines @(
     (Get-AzCosmosDBEmulatorVersion),
+    (Get-DacFxVersion),
     (Get-SQLPSVersion),
     (Get-MySQLVersion)
 )

From f655897714b85514c426a9459384241f2d1b12a5 Mon Sep 17 00:00:00 2001
From: Drew Skwiers-Koballa <drew.skwierskoballa@microsoft.com>
Date: Fri, 9 Oct 2020 10:49:45 -0700
Subject: [PATCH 5/5] update to rerun checks

---
 images/win/scripts/Installers/Install-DACFx.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/win/scripts/Installers/Install-DACFx.ps1
index 32d617f5..a59466d7 100644
--- a/images/win/scripts/Installers/Install-DACFx.ps1
+++ b/images/win/scripts/Installers/Install-DACFx.ps1
@@ -1,6 +1,6 @@
 ####################################################################################
 ##  File:  Install-DACFx.ps1
-##  Desc:  Install SQL Server® Data-Tier Application Framework (DACFx) for Windows
+##  Desc:  Install SQL Server® Data-Tier Application Framework (DacFx) for Windows
 ####################################################################################
 
 $InstallerName = "DacFramework.msi"