Merge pull request #18613 from dotnet/merges/dev15.1.x-to-dev15.2.x-n…

…ayewah Merge 15.1.x to 15.2.x
dotnet · Apr 12, 2017 · aa13d1a · aa13d1a
2 parents 0a75061 + b5b3633
commit aa13d1a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 0 deletions.
diff --git a/src/Compilers/CSharp/csc/App.config b/src/Compilers/CSharp/csc/App.config
@@ -2,6 +2,9 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 
 <configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
   <runtime>
     <gcServer enabled="true" />
     <gcConcurrent enabled="false"/>

diff --git a/src/Compilers/Server/VBCSCompiler/App.config b/src/Compilers/Server/VBCSCompiler/App.config
@@ -2,6 +2,9 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 
 <configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
   <runtime>
     <gcServer enabled="true"/>
     <gcConcurrent enabled="false"/>

diff --git a/src/Compilers/VisualBasic/vbc/App.config b/src/Compilers/VisualBasic/vbc/App.config
@@ -2,6 +2,9 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 
 <configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
   <runtime>
     <gcServer enabled="true" />
     <gcConcurrent enabled="false"/>

diff --git a/src/Interactive/csi/App.config b/src/Interactive/csi/App.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+</configuration>
diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj
@@ -34,6 +34,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="csi.rsp">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/src/Interactive/vbi/App.config b/src/Interactive/vbi/App.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+</configuration>
diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj
@@ -34,6 +34,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="project.json" />
     <None Include="vbi.rsp">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>