From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 2 Oct 2015 01:50:02 +0000 (+1000)
Subject: Update for (in-progress) Atmel Studio 7 support, via new integration DLL and help... 
X-Git-Tag: LUFA-151115~19
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/2fa6cbdb108a55a074c32990ffaa73755a17ae3a?ds=sidebyside

Update for (in-progress) Atmel Studio 7 support, via new integration DLL and help content fixes.
---

diff --git a/LUFA/StudioIntegration/HV1/helpcontentsetup.msha b/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
index cb1c4b9eb..28d6829ab 100644
--- a/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
+++ b/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
@@ -19,7 +19,7 @@
 		</div>
 		<div class="package-list">
 			<div class="package">
-				<span class="name">LUFA</span>
+				<span class="name">lufa_studio_help.mshc</span>
 				<a class="current-link" href="lufa_studio_help.mshc">lufa_studio_help.mshc</a>
 			</div>
 		</div>
diff --git a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
index b43354f8d..e1099887e 100644
--- a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
+++ b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
@@ -25,6 +25,16 @@
 	</xsl:template>
 
 	<!-- Update the LUFA help package file name -->
+	<xsl:template match="xhtml:div[@class='package']/xhtml:span">
+		<xsl:copy>
+			<xsl:copy-of select="@class"/>
+
+			<xsl:text>lufa_help_</xsl:text>
+			<xsl:value-of select="$extension-version"/>
+			<xsl:text>.mshc</xsl:text>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="xhtml:div[@class='package']/xhtml:a">
 		<xsl:copy>
 			<xsl:copy-of select="@class"/>
diff --git a/LUFA/StudioIntegration/VSIX/LUFA.dll b/LUFA/StudioIntegration/VSIX/LUFA.dll
index 26ba83d1b..cc4b8ed5c 100644
Binary files a/LUFA/StudioIntegration/VSIX/LUFA.dll and b/LUFA/StudioIntegration/VSIX/LUFA.dll differ
diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index cfb82ed12..f155618b7 100644
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -13,8 +13,6 @@
 		<PreviewImage>LUFA.png</PreviewImage>
 
 		<SupportedProducts>
-			<IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>
-			<IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>
 			<IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>
 		</SupportedProducts>