From 0ad68abe12a3a0bb5c8a9ce618ac5502d6aa952b Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:28:37 +0100
Subject: [PATCH] Remove System.Text.Json.dll references from Bravo.xslt

This fixes a build error introduced in https://github.com/sql-bi/Bravo/pull/849 (https://github.com/sql-bi/DaxFormatter/pull/17) where `System.Text.Json.dll` is no longer a transitive dependency, as it is now used for the `netstandard2.0` target framework.
---
 installer/wix/src/Bravo/Bravo.xslt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/installer/wix/src/Bravo/Bravo.xslt b/installer/wix/src/Bravo/Bravo.xslt
index 2d85b8ab..d6d8b200 100644
--- a/installer/wix/src/Bravo/Bravo.xslt
+++ b/installer/wix/src/Bravo/Bravo.xslt
@@ -23,19 +23,17 @@
   <xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('BravoExeToRemove', @Id)]" />
 
   <!--
-  >> HACK to force MSI installer to downgrade a library during upgrade
+  >> HACK to allow MSI installer to downgrade a library during upgrade
   >> https://stackoverflow.com/questions/52993587/file-not-copied-only-during-upgrade
   >> https://stackoverflow.com/questions/44765707/how-to-exclude-files-in-wix-toolset
   -->
 
   <!-- Tag files with the "*ToRemove" key -->
   <xsl:key name="IdentityClientToRemove" match="wix:Component[wix:File/@Source='$(var.PublishFolder)\Microsoft.Identity.Client.dll']" use="@Id" />
-  <xsl:key name="SystemTextJsonToRemove" match="wix:Component[wix:File/@Source='$(var.PublishFolder)\System.Text.Json.dll']" use="@Id" />
   <xsl:key name="NewtonsoftJsonToRemove" match="wix:Component[wix:File/@Source='$(var.PublishFolder)\Newtonsoft.Json.dll']" use="@Id" />
   <xsl:key name="WebView2ToRemove" match="wix:Component[contains(wix:File/@Source, '\WebView2Loader.dll') or wix:File/@Source='$(var.PublishFolder)\Microsoft.Web.WebView2.Core.dll' or wix:File/@Source='$(var.PublishFolder)\Microsoft.Web.WebView2.WinForms.dll' or wix:File/@Source='$(var.PublishFolder)\Microsoft.Web.WebView2.Wpf.dll']" use="@Id" />
   <!-- Don't render anything tagged with "*ToRemove" key -->
   <xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('IdentityClientToRemove', @Id)]" />
-  <xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('SystemTextJsonToRemove', @Id)]" />
   <xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('NewtonsoftJsonToRemove', @Id)]" />
   <xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('WebView2ToRemove', @Id)]" />
   <!-- Reinserts as new components all files previously tagged and removed from the output -->
@@ -58,7 +56,6 @@
       <xsl:apply-templates select="@*|node()" />
       <Component Id="cmpRemovedFilesBundle" Directory="INSTALLFOLDER" Guid="C95A6D04-CE29-449D-B54F-D4EB6AA49D79">
         <File Id="fileIdentityClient" KeyPath="no" Source="$(var.PublishFolder)\Microsoft.Identity.Client.dll" />
-        <File Id="fileSystemTextJson" KeyPath="no" Source="$(var.PublishFolder)\System.Text.Json.dll" />
         <File Id="fileNewtonsoftJson" KeyPath="no" Source="$(var.PublishFolder)\Newtonsoft.Json.dll" />
         <File Id="fileWebView2Loader" KeyPath="no" Source="$(var.PublishFolder)\WebView2Loader.dll" />
         <File Id="fileWebView2Core" KeyPath="no" Source="$(var.PublishFolder)\Microsoft.Web.WebView2.Core.dll" />