Fixed nightly build to include the deployable archives for docs and samples.

Also fixed up some build breaks that can occur when building certain project targets with explicit TFV properties, which seemed related to the problem.

6 files changed, 32 insertions, 148 deletions

diff --git a/build.proj b/build.proj
index c669718..4b6afc2 100644
--- a/build.proj
+++ b/build.proj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="TouchUpProjectsForDualFrameworks">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="EnlistmentInfo.props" />
 	<Import Project="$(MSBuildProjectDirectory)\tools\DotNetOpenAuth.automated.props"/>
 	<Import Project="$(ProjectRoot)tools\Translation.targets"/>
@@ -7,22 +7,16 @@
 		<!--Removed from NightlyProjects until it can be fixed up. samples\tools.proj;-->
 		<NightlyProjects Include="
 										nuget\nuget.proj;
-										" />
-		<NightlyProjects Include="
-										doc\doc.proj;
-										">
-			<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-		</NightlyProjects>
-		<NightlyProjects Include="
 										tools\drop.proj;
 										 ">
-			<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+			<Properties>TargetFrameworkVersion=v4.0</Properties>
 		</NightlyProjects>
 		<NightlyProjects Include="
+										doc\doc.proj;
 										samples\samples.proj;
 										">
 			<Targets>DeployableArchive</Targets>
-			<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+			<Properties>TargetFrameworkVersion=v4.0</Properties>
 		</NightlyProjects>
 
 		<ProjectsToClean Include="
@@ -30,12 +24,10 @@
 		                          projecttemplates\projecttemplates.proj;
 		                          vsi\vsi.proj;
 		                          vsix\vsix.proj;
-		                          "/>
-		<ProjectsToClean Include="
 		                          samples\samples.proj;
 		                          doc\doc.proj;
 		                          ">
-			<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+			<Properties>TargetFrameworkVersion=v4.0</Properties>
 		</ProjectsToClean>
 
 		<DirectoriesToClean Include="
@@ -63,31 +55,6 @@
 		</ProjectsToPublish>
 	</ItemGroup>
 
-	<Target Name="TouchUpProjectsForDualFrameworks">
-		<ItemGroup>
-			<!-- The point here is to duplicate all projects, once targeting each version of .NET that we support. -->
-			<NightlyProjects Condition=" '%(NightlyProjects.TargetFrameworkVersion)' != '' ">
-				<Properties>TargetFrameworkVersion=%(NightlyProjects.TargetFrameworkVersion)</Properties>
-			</NightlyProjects>
-			<NightlyProjects Condition=" '%(NightlyProjects.TargetFrameworkVersion)' == '' ">
-				<Properties>TargetFrameworkVersion=v3.5</Properties>
-			</NightlyProjects>
-			<NightlyProjects Include="@(NightlyProjects)" Condition=" '%(NightlyProjects.TargetFrameworkVersion)' == '' ">
-				<Properties>TargetFrameworkVersion=v4.0</Properties>
-			</NightlyProjects>
-
-			<ProjectsToClean Condition=" '%(ProjectsToClean.TargetFrameworkVersion)' != '' ">
-				<Properties>TargetFrameworkVersion=%(ProjectsToClean.TargetFrameworkVersion)</Properties>
-			</ProjectsToClean>
-			<ProjectsToClean Condition=" '%(ProjectsToClean.TargetFrameworkVersion)' == '' ">
-				<Properties>TargetFrameworkVersion=v3.5</Properties>
-			</ProjectsToClean>
-			<ProjectsToClean Include="@(ProjectsToClean)" Condition=" '%(ProjectsToClean.TargetFrameworkVersion)' == '' ">
-				<Properties>TargetFrameworkVersion=v4.0</Properties>
-			</ProjectsToClean>
-		</ItemGroup>
-	</Target>
-
 	<Target Name="BuildTests" DependsOnTargets="SkipVerification">
 		<MSBuild Projects="$(SolutionPath)" Targets="@(TestProjects)" BuildInParallel="$(BuildInParallel)" />
 	</Target>
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index 86f156a..c490814 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -5,7 +5,7 @@
 
 	<Target Name="BuildIntermediates">
 		<ItemGroup>
-			<ProductTargets Include="BuildUnifiedProduct;ReSignDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " />
+			<ProductTargets Include="BuildUnifiedProduct;ResignShippingDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " />
 			<ProductTargets Include="GetOutputPath" />
 			<AspNetTargets Include="Build;Sign" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " />
 			<AspNetTargets Include="GetOutputPath" />
diff --git a/projecttemplates/projecttemplates.proj b/projecttemplates/projecttemplates.proj
index 07b810f..9907d6b 100644
--- a/projecttemplates/projecttemplates.proj
+++ b/projecttemplates/projecttemplates.proj
@@ -8,7 +8,7 @@
 
 		<LayoutDependsOn>
 			BuildUnifiedProduct;
-			ReSignDelaySignedAssemblies;
+			ResignShippingDelaySignedAssemblies;
 			DeploySql;
 			LayoutProjects;
 		</LayoutDependsOn>
diff --git a/src/DotNetOpenAuth.TestWeb/Web.config b/src/DotNetOpenAuth.TestWeb/Web.config
index ad45e93..5d3174c 100644
--- a/src/DotNetOpenAuth.TestWeb/Web.config
+++ b/src/DotNetOpenAuth.TestWeb/Web.config
@@ -8,49 +8,23 @@
     \Windows\Microsoft.Net\Framework\v2.x\Config 
 -->
 <configuration>
-
-
-    <configSections>
-      <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-          <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-            <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-            <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-            <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-            <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          </sectionGroup>
-        </sectionGroup>
-      </sectionGroup>
-    </configSections>  
-
-
-    <appSettings/>
-    <connectionStrings/>
-    <system.web>
-        <!-- 
+  <appSettings/>
+  <connectionStrings/>
+  <system.web>
+    <!-- 
             Set compilation debug="true" to insert debugging 
             symbols into the compiled page. Because this 
             affects performance, set this value to true only 
             during development.
         -->
-        <compilation debug="true">
-
-          <assemblies>
-            <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-            <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-            <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-            <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-          </assemblies>
-
-        </compilation>
-        <!--
+    <compilation debug="true" targetFramework="4.0"/>
+    <!--
             The <authentication> section enables configuration 
             of the security authentication mode used by 
             ASP.NET to identify an incoming user. 
         -->
-        <authentication mode="Forms" />
-        <!--
+    <authentication mode="Forms"/>
+    <!--
             The <customErrors> section enables configuration 
             of what to do if/when an unhandled error occurs 
             during the execution of a request. Specifically, 
@@ -62,78 +36,13 @@
             <error statusCode="404" redirect="FileNotFound.htm" />
         </customErrors>
         -->
-
-
-      <pages>
-        <controls>
-          <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-          <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        </controls>
-      </pages>
-
-      <httpHandlers>
-        <remove verb="*" path="*.asmx"/>
-        <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
-      </httpHandlers>
-      <httpModules>
-        <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      </httpModules>
-
-
-    </system.web>
-
-    <system.codedom>
-      <compilers>
-        <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"
-                  type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <providerOption name="CompilerVersion" value="v3.5"/>
-          <providerOption name="WarnAsError" value="false"/>
-        </compiler>
-        <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4"
-                  type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <providerOption name="CompilerVersion" value="v3.5"/>
-          <providerOption name="OptionInfer" value="true"/>
-          <providerOption name="WarnAsError" value="false"/>
-        </compiler>
-      </compilers>
-    </system.codedom>
-
-    <!-- 
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+  </system.web>
+  <!-- 
         The system.webServer section is required for running ASP.NET AJAX under Internet
         Information Services 7.0.  It is not necessary for previous version of IIS.
     -->
-    <system.webServer>
-      <validation validateIntegratedModeConfiguration="false"/>
-      <modules>
-        <remove name="ScriptModule" />
-        <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      </modules>
-      <handlers>
-        <remove name="WebServiceHandlerFactory-Integrated"/>
-        <remove name="ScriptHandlerFactory" />
-        <remove name="ScriptHandlerFactoryAppServices" />
-        <remove name="ScriptResource" />
-        <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
-             type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
-             type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </handlers>
-    </system.webServer>
-
-    <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly>
-          <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-          <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-          <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-        </dependentAssembly>
-      </assemblyBinding>
-    </runtime>
-
-</configuration>
+  <system.webServer>
+    <modules runAllManagedModulesForAllRequests="true"/>
+  </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth.sln b/src/DotNetOpenAuth.sln
index 8e520a6..f4d0a29 100644
--- a/src/DotNetOpenAuth.sln
+++ b/src/DotNetOpenAuth.sln
@@ -77,7 +77,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DotNetOpenAuth.TestWeb", "D
 		Release.AspNetCompiler.Updateable = "false"
 		Release.AspNetCompiler.VirtualPath = "/DotNetOpenAuth.TestWeb"
 		StartServerOnDebug = "false"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv3.5"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		VWDPort = "5073"
 	EndProjectSection
 EndProject
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index bcf580f..ffbd9fd 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -110,7 +110,15 @@
 	</Target>
 
 	<Target Name="ResignDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)">
-		<MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)">
+		<MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)"
+						 Condition=" '%(DelaySignedProjects.TargetFrameworkVersion)' == '' or '%(DelaySignedProjects.TargetFrameworkVersion)' == '$(TargetFrameworkVersion)' ">
+			<Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/>
+		</MSBuild>
+	</Target>
+
+	<Target Name="ResignShippingDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)">
+		<MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)"
+						 Condition=" '%(DelaySignedProjects.Nonshipping)' != 'true' and ('%(DelaySignedProjects.TargetFrameworkVersion)' == '' or '%(DelaySignedProjects.TargetFrameworkVersion)' == '$(TargetFrameworkVersion)') ">
 			<Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/>
 		</MSBuild>
 	</Target>