From b797d91ec3d3997a375c872132f84163f45f1fe9 Mon Sep 17 00:00:00 2001
From: ptsurbeleu <devnull@localhost>
Date: Fri, 7 Dec 2012 16:52:53 -0800
Subject: [PATCH] BUILD: Fixed .NET v4 dependecy deployment on Windows Server
 2008/2012 in WebPI template

---
 WebsitePanel/WebsitePanelFeedTemplate.xml | 33 +++++++++--------------
 WebsitePanel/build.xml                    |  2 +-
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/WebsitePanel/WebsitePanelFeedTemplate.xml b/WebsitePanel/WebsitePanelFeedTemplate.xml
index f8d28646..fe551dd9 100644
--- a/WebsitePanel/WebsitePanelFeedTemplate.xml
+++ b/WebsitePanel/WebsitePanelFeedTemplate.xml
@@ -3,11 +3,6 @@
   <webpiFile version="4.0.0.0" />
 
   <title>WebsitePanel :: Web Platform Installer 4.0 Feed</title>
-  <link rel="enclosure" href="https://www.microsoft.com/web/webpi/4.0/webapplicationlist.xml" />
-  <link rel="enclosure" href="https://www.microsoft.com/web/webpi/4.0/mediaproductlist.xml" />
-  <link rel="enclosure" href="https://www.microsoft.com/web/webpi/4.0/toolsproductlist.xml" />
-  <link rel="enclosure" href="https://www.microsoft.com/web/webpi/4.0/enterpriseproductlist.xml" />
-  <link href="http://www.microsoft.com/web/webpi/4.0/WebProductList.xml" />
   <updated>${ReleaseDate}</updated>
   <author>
     <name>Outercurve Foundation</name>
@@ -60,27 +55,23 @@
           <productId>ManagementService</productId>
         </dependency>
         <dependency>
-          <or>
-            <dependency>
-              <productId>NETFramework4</productId>
-            </dependency>
-            <dependency>
-              <productId>NETFX4</productId>
-            </dependency>
-            <dependency>
-              <productId>NETFramework45</productId>
-            </dependency>
-            <!--the following two will install 4.5. We should remove the following when .Net 4.5 is a real installer-->
-            <dependency>
-              <productId>VWD11_Only_BaseLocale</productId>
-            </dependency>
-          </or>
+          <!-- This installs .NET v4 on Windows Server 2008 -->
+          <productId>NETFramework4</productId>
+        </dependency>
+        <dependency>
+          <!-- This enables IIS to host ASP.NET v4 content on Windows Server 2012 -->
+          <productId>ASPNET45</productId>
+        </dependency>
+        <dependency>
+          <!-- This enables IIS to host ASP.NET v4 content on Windows Server 2008/R2 -->
+          <productId>ASPNET_REGIIS_NET4</productId>
         </dependency>
         <dependency>
           <productId>SQLExpress</productId>
         </dependency>
         <dependency>
-          <productId>WDeploy_2_1</productId>
+          <!-- Installs Web Deploy 3.0 -->
+          <productId>WDeploy</productId>
         </dependency>
       </and>
     </dependency>
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index b702c327..832aa214 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -3,7 +3,7 @@
 		<Version>2.0.0</Version>
 		<FileVersion>$(BUILD_NUMBER)</FileVersion>
 		<VersionLabel>$(BUILD_NUMBER)</VersionLabel>
-		<ReleaseDate>2012-09-09</ReleaseDate>
+		<ReleaseDate>2012-12-07</ReleaseDate>
 		<BuildConfiguration></BuildConfiguration>
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>