Clean up projects building against FX 2.0

fb4444aa · Tomas Matousek · 85de7873 · fb4444aa · fb4444aa · fb4444aa
12 changed file
--- a/src/Dependencies/Microsoft.DiaSymReader/NetFX20/Microsoft.DiaSymReader.NetFX20.csproj
+++ b/src/Dependencies/Microsoft.DiaSymReader/NetFX20/Microsoft.DiaSymReader.NetFX20.csproj
 <?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. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
  <ImportGroup Label="Settings">
    <Import Project="..\Version.targets" />
    <Import Project="..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
@@ -15,17 +18,14 @@
    <AssemblyName>Microsoft.DiaSymReader</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>
-    <OutDir>..\..\..\..\Binaries\$(Configuration)\NetFX20</OutDir>
-    <DocumentationFile>..\..\..\..\Binaries\$(Configuration)\NetFX20\Microsoft.DiaSymReader.xml</DocumentationFile>
+    <OutDir>$(OutDir)NetFX20\</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>
-    <Reference Include="..\..\..\..\packages\Microsoft.NetFX20.1.0.0-rc2\lib\net20\mscorlib.dll" />
+    <Reference Include="..\..\..\..\packages\Microsoft.NetFX20.1.0.1-rc2\lib\net20\mscorlib.dll">
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />

--- a/src/Dependencies/Microsoft.DiaSymReader/NetFX20/packages.config
+++ b/src/Dependencies/Microsoft.DiaSymReader/NetFX20/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />  
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
 </packages>
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
  <ImportGroup Label="Settings">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -12,17 +15,6 @@
    <AuthenticodeCertificateName>MicrosoftSHA1Win8WinBlue</AuthenticodeCertificateName>
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
-
-    <!--
-       This project targets Framework 2.0 reference assemblies provided by Microsoft.NetFX20 nuget package.
-       Use the latest Framework toolset to build, but set msbuild properties below
-       so to avoid 4.5 specific artifacts to be added to the compilation (references, attributes).
-    -->    
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>
-    
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <NeedsPhoneCopy>true</NeedsPhoneCopy>
@@ -51,7 +43,6 @@
    </Compile>
  </ItemGroup>
  <ItemGroup Label="File References">
-    <Reference Include="..\..\..\..\..\packages\Microsoft.NetFX20.1.0.0-rc2\lib\net20\mscorlib.dll" />
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
  </ItemGroup>

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/packages.config
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />  
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
 </packages>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
  <ImportGroup Label="Settings">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -11,19 +14,13 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.Concord.DoNotUse</AssemblyName>
-    <!--
-      As a convenience for developer machines without .NET 2.0 installed, we'll allow building against v4.*.
-      However, "real" builds must still target v2.0, and we always want to target 2.0 if it's present.
-    -->
-    <TargetFrameworkVersion Condition="Exists('$(WinDir)\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll') OR '$(RealSignBuild)' == 'true'">v2.0</TargetFrameworkVersion>
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <ConcordDir>$(MSBuildThisFileDirectory)</ConcordDir>
 	  <NonShipping>true</NonShipping>
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
  <ItemGroup>
    <None Include="$(ConcordDir)Microsoft.VisualStudio.Debugger.Engine.xml">
        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -33,8 +30,6 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
  <ItemGroup>
    <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Metadata" />
    <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Engine" />
@@ -43,7 +38,7 @@
          AfterTargets="CoreCompile"
          Inputs="@(ConcordAssemblies->'$(ConcordDir)%(Identity).il')"
          Outputs="$(OutDir)%(Identity).dll">
-    <Exec Command="$(MSBuildFrameworkToolsPath)ilasm.exe /dll /quiet &quot;/output:$(OutDir)@(ConcordAssemblies).dll&quot; $(ConcordDir)@(ConcordAssemblies).il" />
+    <Exec Command="$(MSBuildFrameworkToolsPath)ilasm.exe /dll /quiet /mdv:v2.0.50727 &quot;/output:$(OutDir)@(ConcordAssemblies).dll&quot; $(ConcordDir)@(ConcordAssemblies).il" />
  </Target>
  <Target Name="CleanIlasmOutputs" AfterTargets="Clean">
    <Delete Files="@(ConcordAssemblies->'$(OutDir)%(Identity).dll')" />

--- a/src/ExpressionEvaluator/Core/Source/Concord/packages.config
+++ b/src/ExpressionEvaluator/Core/Source/Concord/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  </packages>
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />
+</packages>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
  <ImportGroup Label="Settings">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -12,17 +15,6 @@
    <AuthenticodeCertificateName>MicrosoftSHA1Win8WinBlue</AuthenticodeCertificateName>
    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
-    
-    <!--
-       This project targets Framework 2.0 reference assemblies provided by Microsoft.NetFX20 nuget package.
-       Use the latest Framework toolset to build, but set msbuild properties below
-       so to avoid 4.5 specific artifacts to be added to the compilation (references, attributes).
-    -->
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>
-    
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
@@ -75,7 +67,6 @@
    <Compile Include="SystemHelpers.cs" />
  </ItemGroup>
  <ItemGroup Label="File References">
-    <Reference Include="..\..\..\..\..\packages\Microsoft.NetFX20.1.0.0-rc2\lib\net20\mscorlib.dll" />
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
  </ItemGroup>

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/SystemHelpers.cs
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/SystemHelpers.cs
@@ -40,8 +40,3 @@ internal sealed class EditorBrowsableAttribute : Attribute
        public EditorBrowsableAttribute(EditorBrowsableState state) { }
    }
 }
+\ No newline at end of file
-
-namespace System.Linq
-{
-    internal class Dummy { }
-}
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/packages.config
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />  
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
 </packages>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.vbproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
  <ImportGroup Label="Settings">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -13,18 +16,6 @@
    <RootNamespace>
    </RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</AssemblyName>
-    
-     <!--
-       This project targets Framework 2.0 reference assemblies provided by Microsoft.NetFX20 nuget package.
-       Use the latest Framework toolset to build, but set msbuild properties below
-       so to avoid 4.5 specific artifacts to be added to the compilation (references, attributes).
-    -->     
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>    
-    <FrameworkPathOverride>..\..\..\..\..\packages\Microsoft.NetFX20.1.0.0-rc2\lib\net20</FrameworkPathOverride>
-    
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <VBSyntaxGeneratorToolPath>$(OutDir)\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
@@ -33,6 +24,25 @@
    <RestorePackages>true</RestorePackages>
    <NeedsPhoneCopy>true</NeedsPhoneCopy>
  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
+      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
+      <Name>Concord</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Core\Source\ResultProvider\ResultProvider.csproj">
+      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
+      <Name>ResultProvider</Name>
+    </ProjectReference>
+  </ItemGroup>
  <ItemGroup Label="Linked Files">
    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\Scanner\CharacterInfo.vb">
      <Link>Compiler\Scanner\CharacterInfo.vb</Link>
@@ -55,36 +65,11 @@
    </SyntaxGetTextDefinition>
    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
  </ItemGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
-  </ItemGroup>
-  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
-      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
-      <Name>Concord</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
  <ItemGroup>
    <VsdConfigXml Include="VisualBasicResultProvider.vsdconfigxml">
      <SubType>Designer</SubType>
    </VsdConfigXml>
  </ItemGroup>
-  <ItemGroup>
-    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="Helpers\Placeholders.vb" />
    <Compile Include="Helpers\TypeExtensions.vb" />
@@ -101,12 +86,6 @@
  <ItemGroup>
    <Import Include="IdentifierComparison=Microsoft.CodeAnalysis.CaseInsensitiveComparison" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Core\Source\ResultProvider\ResultProvider.csproj">
-      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
-      <Name>ResultProvider</Name>
-    </ProjectReference>
-  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
@@ -117,6 +96,9 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
+  </ItemGroup>
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/packages.config
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />  
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
 </packages>
\ No newline at end of file
--- a/src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Targets/VSL.Settings.targets
+++ b/src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Targets/VSL.Settings.targets
@@ -81,6 +81,24 @@
    <HighEntropyVA>true</HighEntropyVA>
  </PropertyGroup>

+  <!--
+    If TargetNetFX20 is true the project targets Framework 2.0 reference assemblies provided by Microsoft.NetFX20 nuget package.
+    Use the latest Framework toolset to build, but set msbuild properties below
+    so to avoid 4.5 specific artifacts to be added to the compilation (references, attributes).
+  -->
+  <PropertyGroup Condition="'$(TargetNetFX20)' == 'true'">
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+    <NoStdLib>true</NoStdLib>
+    <FrameworkPathOverride>$(NuGetPackagesPath)\Microsoft.NetFX20.1.0.2-rc2\lib\net20</FrameworkPathOverride>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(ProjectLanguage)' == 'CSharp' AND '$(TargetNetFX20)' == 'true'">
+    <Reference Include="$(FrameworkPathOverride)\mscorlib.dll">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+
  <PropertyGroup Condition="'$(OutDir)' == ''">
    <!-- If we don't already have an OutDir, set one-->
    <OutDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\..\..\Binaries\$(Configuration)'))\</OutDir>
@@ -121,7 +139,7 @@
        <Import Include="System.Collections.Generic" />
        <Import Include="System.Diagnostics" />
      </ItemGroup>
-      <ItemGroup Condition="'$(TargetFrameworkVersion)' != 'v2.0'">
+      <ItemGroup Condition="'$(TargetNetFX20)' != 'true'">
        <Import Include="System.Linq" />
      </ItemGroup>
      <PropertyGroup Condition="'$(Configuration)' == 'Debug'">