move reducesize property before Microsoft.SPOT.System.Settings in tem…

…plates
nealjack · Mar 30, 2015 · 2f60c50 · 2f60c50
1 parent 1aaac29
commit 2f60c50
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/MsBuildWrapper.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/MsBuildWrapper.cs
@@ -3138,13 +3138,12 @@ internal void SaveProjectProj(MFProject mfproj)
 
                     ProjectPropertyGroupElement bpg = SaveStringProps(proj, mfproj, tbl);
 
-                    if (mfproj.Properties.Any(p => p.Name == "reducesize"))
+                    var reducesizeProp = mfproj.Properties.FirstOrDefault(p => p.Name == "reducesize");
+                    if (reducesizeProp != null)
                     {
-                        var prop = mfproj.Properties.First(p => p.Name == "reducesize");
-                        bpg.AddProperty("reducesize", prop.Value);
+                        bpg.AddProperty("reducesize", reducesizeProp.Value);
                     }
 
-
                     ProjectImportElement pi = proj.Xml.AddImport(@"$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings");
 
                     if (mfproj.IsClrProject)

diff --git a/ProjectTemplates/TinyBooter/TinyBooter.proj b/ProjectTemplates/TinyBooter/TinyBooter.proj
@@ -16,12 +16,12 @@
     <ProjectPath>$(SPOCLIENT)\ProjectTemplates\TinyBooter\TinyBooter.proj</ProjectPath>
     <MFSettingsFile>
     </MFSettingsFile>
+    <reducesize>true</reducesize>
   </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.Build.Targets" />
   <PropertyGroup>
     <OutputType>Executable</OutputType>
-    <reducesize>true</reducesize>
     <MultipleOutputSections>false</MultipleOutputSections>
     <CustomAssemblyName>TinyBooter</CustomAssemblyName>
 

diff --git a/ProjectTemplates/TinyBooter/TinyBooterDecompressor.proj b/ProjectTemplates/TinyBooter/TinyBooterDecompressor.proj
@@ -16,12 +16,12 @@
     <ProjectPath>$(SPOCLIENT)\ProjectTemplates\TinyBooter\TinyBooterDecompressor.proj</ProjectPath>
     <MFSettingsFile>
     </MFSettingsFile>
+    <reducesize>true</reducesize>
   </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.Build.Targets" />
   <PropertyGroup>
     <OutputType>Executable</OutputType>
-    <reducesize>true</reducesize>
     <MultipleOutputSections>false</MultipleOutputSections>
     <ExtraTargets>BuildSigFiles</ExtraTargets>
     <ScatterFileDefinition>scatterfile_bootloader_decompressor_$(COMPILER_TOOL).$(SCATTER_EXT)</ScatterFileDefinition>

diff --git a/ProjectTemplates/TinyCLR/TinyCLR.proj b/ProjectTemplates/TinyCLR/TinyCLR.proj
@@ -5,6 +5,7 @@
     <Directory>Solutions\$(PLATFORM)\TinyCLR</Directory>
     <IsClrProject>True</IsClrProject>
     <ProjectPath>$(SPOCLIENT)\ProjectTemplates\TinyCLR\TinyCLR.proj</ProjectPath>
+    <reducesize>false</reducesize>
   </PropertyGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
   <Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.Build.Targets" />