From 03c3ebc5282039060150e30f74eb401a76325f88 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 25 Feb 2018 20:38:35 +0700
Subject: [PATCH] Workaround for VS2013 / CoInitialize hack (see
 http://mail.openjdk.java.net/pipermail/swing-dev/2018-February/008323.html)

---
 build.xml                       | 7 +++++++
 installer/appx/AppxManifest.xml | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/build.xml b/build.xml
index 5b457742..2fd08146 100644
--- a/build.xml
+++ b/build.xml
@@ -616,6 +616,13 @@
 			<cutdirsmapper dirs="1" />
 		</untar>
 
+
+		<!-- Workaround for VS2013 / CoInitialize hack (see http://mail.openjdk.java.net/pipermail/swing-dev/2018-February/008323.html) -->
+		<delete verbose="yes">
+			<fileset dir="${dir.staging}/jre" includes="**/*120*.dll" />
+		</delete>
+
+
 		<!-- package APPX -->
 		<exec executable="makepri" dir="${dir.staging}" failonerror="yes">
 			<arg line="createconfig /o /pv 10.0.0 /cf priconfig.xml /dq en-US" />
diff --git a/installer/appx/AppxManifest.xml b/installer/appx/AppxManifest.xml
index cf12b3f5..126436d5 100644
--- a/installer/appx/AppxManifest.xml
+++ b/installer/appx/AppxManifest.xml
@@ -27,6 +27,9 @@
 
 	<Dependencies>
 		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.351" MaxVersionTested="10.0.16299.15" />
+
+		<!-- Workaround for VS2013 / CoInitialize hack (see http://mail.openjdk.java.net/pipermail/swing-dev/2018-February/008323.html) -->
+		<PackageDependency Name="Microsoft.VCLibs.120.00.UWPDesktop" MinVersion="12.0.40653.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
 	</Dependencies>
 
 	<Capabilities>