Move server gc section for full framework to app.config

aspnet · Apr 26, 2016 · 289ac23 · 289ac23
1 parent 3ceaabf
commit 289ac23
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 24 deletions.
diff --git a/src/BaseTemplates/EmptyWeb/project.json b/src/BaseTemplates/EmptyWeb/project.json
@@ -30,13 +30,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "web.config"

diff --git a/src/BaseTemplates/StarterWeb/project.json b/src/BaseTemplates/StarterWeb/project.json
@@ -46,13 +46,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/BaseTemplates/WebAPI/project.json b/src/BaseTemplates/WebAPI/project.json
@@ -36,13 +36,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/Common/app.config b/src/Rules/Common/app.config
@@ -0,0 +1,5 @@
+<configuration>
+   <runtime>
+      <gcServer enabled="true"/>
+   </runtime>
+</configuration>
diff --git a/src/Rules/StarterWeb/AI/IndividualAuth/project.json b/src/Rules/StarterWeb/AI/IndividualAuth/project.json
@@ -79,13 +79,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/StarterWeb/AI/NoAuth/project.json b/src/Rules/StarterWeb/AI/NoAuth/project.json
@@ -48,13 +48,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json b/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
@@ -56,13 +56,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json b/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json
@@ -56,13 +56,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/StarterWeb/IndividualAuth/project.json b/src/Rules/StarterWeb/IndividualAuth/project.json
@@ -78,13 +78,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json b/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json
@@ -55,13 +55,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/WebAPI/AI/NoAuth/project.json b/src/Rules/WebAPI/AI/NoAuth/project.json
@@ -37,13 +37,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json b/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json
@@ -45,13 +45,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/Rules/WebAPI/OrganizationalAuth/Single/project.json b/src/Rules/WebAPI/OrganizationalAuth/Single/project.json
@@ -44,13 +44,13 @@
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-
+$if$ ($context$ == WebCore)
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true
     }
   },
-
+$endif$
   "content": [
     "wwwroot",
     "Views",

diff --git a/src/TemplateRules.csproj b/src/TemplateRules.csproj
@@ -191,6 +191,13 @@
       <TargetName>$(Rules)</TargetName>
       <SearchPath>.\</SearchPath>
     </LooseFiles>
+
+    <!-- Common Files -->
+    <LooseFiles Include="
+              Rules\Common\app.config">
+      <TargetName>$(Rules)</TargetName>
+      <SearchPath>.\</SearchPath>
+    </LooseFiles>
   </ItemGroup>
 
   <Target Name="BuildLooseFiles" Inputs="@(LooseFiles)" Outputs="$(TemplatesOutputPath)%(TargetName).zip" DependsOnTargets="SetupPackageSource;DeterminePackageVersions">

diff --git a/src/Templates.xml b/src/Templates.xml
@@ -124,6 +124,9 @@
     <BaseTemplate ID="Microsoft.DNX.CSharp.EmptyWeb"
               VSTemplatePath="DNXEmptyWeb.vstemplate"
               DefaultContext="WebCore">
+        <ApplyRules Option="WebDesktop">
+            <RunRule RuleID="ApplyAppConfig" />
+        </ApplyRules>
    </BaseTemplate>
 
     <BaseTemplate ID="Microsoft.DNX.CSharp.StarterWeb"
@@ -188,6 +191,9 @@
                   </ApplyRules>
             </ApplyRules>
         </ApplyRules>
+        <ApplyRules Option="WebDesktop">
+            <RunRule RuleID="ApplyAppConfig" />
+        </ApplyRules>
     </BaseTemplate>
 
     <BaseTemplate ID="Microsoft.DNX.CSharp.WebAPI"
@@ -222,6 +228,9 @@
                   </ApplyRules>
             </ApplyRules>
         </ApplyRules>
+        <ApplyRules Option="WebDesktop">
+            <RunRule RuleID="ApplyAppConfig" />
+        </ApplyRules>
     </BaseTemplate>
   </BaseTemplates>
 
@@ -378,5 +387,10 @@
           <ReplaceFile Destination="project.json" Source="Rules\WebAPI\AI\OrganizationalAuth\Single\project.json"/>
           <ReplaceFile Destination="Startup.cs" Source="Rules\WebAPI\AI\OrganizationalAuth\Single\Startup.cs"/>
       </Rule>
+
+      <!-- Apply app.config file for full FX -->
+      <Rule ID="ApplyAppConfig">
+          <AddFile Destination="app.config" Source="Rules\Common\app.config"/>
+      </Rule>
   </Rules>
 </TemplateDefinition>