2007-10-23 Marek Habersack <[email protected]>

	* AppResourcesAssemblyBuilder.cs: do not output preservation files
	for satellite assemblies, just for the main assembly. Also, don't
	add the satellite assemblies to the list of top-level assemblies.

svn path=/trunk/mcs/; revision=87964

mcs/class/System.Web/System.Web.Compilation/AppResourcesAssemblyBuilder.cs

@@ -118,16 +118,20 @@ namespace System.Web.Compilation
 			
 			if (results.NativeCompilerReturnValue == 0) {
 				ret = results.CompiledAssembly;
-				BuildManager.TopLevelAssemblies.Add (ret);
-				if (defaultAssembly)
+				if (defaultAssembly) {
+					BuildManager.TopLevelAssemblies.Add (ret);
 					mainAssembly = ret;
+				}
 			} else {
 				if (HttpContext.Current.IsCustomErrorEnabled)
 					throw new ApplicationException ("An error occurred while compiling global resources.");
 				throw new CompilationException (null, results.Errors, null);
 			}
-			HttpRuntime.WritePreservationFile (ret, canonicAssemblyName);
-			HttpRuntime.EnableAssemblyMapping (true);
+			
+			if (defaultAssembly) {
+				HttpRuntime.WritePreservationFile (ret, canonicAssemblyName);
+				HttpRuntime.EnableAssemblyMapping (true);
+			}
 		}
 
 		string BuildAssemblyPath (string cultureName, AssemblyBuilder abuilder)

mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,3 +1,9 @@
+2007-10-23  Marek Habersack  <[email protected]>
+
+	* AppResourcesAssemblyBuilder.cs: do not output preservation files
+	for satellite assemblies, just for the main assembly. Also, don't
+	add the satellite assemblies to the list of top-level assemblies.
+
 2007-10-17  Marek Habersack  <[email protected]>
 
 	* PageCompiler.cs: added code to set the AsyncMode and