diff --git a/build/_k-generate-projects.shade b/build/_k-generate-projects.shade
index 836ab15d18..8a50d94abb 100644
--- a/build/_k-generate-projects.shade
+++ b/build/_k-generate-projects.shade
@@ -193,20 +193,35 @@ functions
                     configs["k10"] = new Dictionary<string, object>();
                     configs["net45"] = new Dictionary<string, object>();
                 }
+                
+                // Templates
+                const string csTemplate = @"<Compile Include=""{0}"" />";
+                const string resxDesignerTemplate = @"<Compile Include=""{0}"">
+      <DependentUpon>{1}</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>";
+                const string resxTemplate = @"<EmbeddedResource Include=""{0}"">
+    <LogicalName>{1}.{2}.resources</LogicalName>
+    <Generator>ResXFileCodeGenerator</Generator>
+    <LastGenOutput>{2}.Designer.cs</LastGenOutput>
+    <CustomToolNamespace>{1}.Resources</CustomToolNamespace>
+</EmbeddedResource>";
 
+                // Build the list of resx files
+                var resxFileNames = FindFilesOfType(projectDir, "*.resx");
+                var resxDesignerFiles = new HashSet<string>(resxFileNames.Select(f => Path.ChangeExtension(f, "Designer.cs")), 
+                                                            StringComparer.OrdinalIgnoreCase);
+                
+                var resxFiles = String.Join(Environment.NewLine,
+                                            resxFileNames.Select(p => String.Format(resxTemplate, p, projectName, Path.GetFileNameWithoutExtension(p))));
+                
                 // Build the list of cs files
                 var csFiles 
                     = String.Join(Environment.NewLine,
                         FindFilesOfType(projectDir, "*.cs")
-                            .Select(p => String.Format(@"<Compile Include=""{0}"" />", p)));
-
-                // Build the list of resx files
-                var resxFiles
-                    = String.Join(Environment.NewLine,
-                        FindFilesOfType(projectDir, "*.resx")
-                            .Select(p => String.Format(@"<EmbeddedResource Include=""{0}"">
-    <LogicalName>{1}.{2}.resources</LogicalName>
-</EmbeddedResource>", p, projectName, Path.GetFileNameWithoutExtension(p))));
+                            .Select(p => resxDesignerFiles.Contains(p) ? String.Format(resxDesignerTemplate, p, Path.ChangeExtension(Path.GetFileNameWithoutExtension(p), "resx")) :
+                                                                         String.Format(csTemplate, p)));
                 
                 bool isSample = Path.GetDirectoryName(projectDir)
                                     .TrimEnd(Path.DirectorySeparatorChar)