Merge pull request #2124 from kohsuke/jenkins-21484

[FIXED JENKINS-21484]
jenkinsci · Mar 15, 2016 · 9fce1ee · 9fce1ee
2 parents 5a6c1eb + b08d7c7
commit 9fce1ee
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/resources/windows-service/jenkins.exe.config b/core/src/main/resources/windows-service/jenkins.exe.config
@@ -1,6 +1,11 @@
-<!-- see http://support.microsoft.com/kb/936707 -->
 <configuration>
   <runtime>
+    <!-- see http://support.microsoft.com/kb/936707 -->
     <generatePublisherEvidence enabled="false"/>
   </runtime>
+  <startup>
+    <!-- this can be hosted either on .NET 2.0 or 4.0 -->
+    <supportedRuntime version="v2.0.50727" />
+    <supportedRuntime version="v4.0" />
+  </startup>
 </configuration>