提交 389cd718 编写于 作者: T Tomas Matousek

Use Microsoft.NetFX20 package in ResultProviders

上级 91449881
......@@ -12,22 +12,14 @@
<AuthenticodeCertificateName>MicrosoftSHA1Win8WinBlue</AuthenticodeCertificateName>
<RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</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>
<!--
We get warnings about missing XML comments for publicly visible members in Microsoft.CodeAnalysis.CSharp.SyntaxKind
-->
<NoWarn>1591</NoWarn>
<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>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\Compilers\CSharp\Portable\Parser\CharacterInfo.cs">
<Link>Compiler\Parser\CharacterInfo.cs</Link>
......@@ -52,6 +44,7 @@
</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>
......
......@@ -20,4 +20,4 @@ namespace System.Runtime.CompilerServices
internal class ExtensionAttribute : Attribute
{
}
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
</packages>
<package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />
</packages>
\ No newline at end of file
......@@ -113,7 +113,6 @@ private static DkmEvaluationResultFlags GetFlags(DkmClrValue value)
protected override void OnClose()
{
Debug.WriteLine("Closing " + FullName);
Value.Close();
}
}
......
......@@ -12,20 +12,16 @@
<AuthenticodeCertificateName>MicrosoftSHA1Win8WinBlue</AuthenticodeCertificateName>
<RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</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>
<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. -->
<RestorePackages>true</RestorePackages>
<NeedsPhoneCopy>true</NeedsPhoneCopy>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
<Link>Compiler\CaseInsensitiveComparison.cs</Link>
......@@ -69,8 +65,10 @@
<Compile Include="..\ExpressionCompiler\DateTimeUtilities.cs">
<Link>Helpers\DateTimeUtilities.cs</Link>
</Compile>
<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>
......@@ -133,5 +131,4 @@
<Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
// A few dependencies from System.dll, which we want to avoid when compiling against Desktop Framework 2.0.
namespace System.Linq
{
internal class Dummy { }
}
namespace System.Diagnostics
{
internal static class Debug
{
[Conditional("DEBUG")]
public static void Assert(bool condition, string message = null)
{
if (!condition)
{
throw new InvalidOperationException(message ?? "Assertion failed");
}
}
}
}
namespace System.CodeDom.Compiler
{
[AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = false)]
internal sealed class GeneratedCodeAttribute : Attribute
{
public GeneratedCodeAttribute(string tool, string version) { }
}
}
namespace System.ComponentModel
{
public enum EditorBrowsableState
{
Always = 0,
Never = 1,
Advanced = 2
}
[AttributeUsage(AttributeTargets.All)]
internal sealed class EditorBrowsableAttribute : Attribute
{
public EditorBrowsableAttribute(EditorBrowsableState state) { }
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />
</packages>
......@@ -13,11 +13,12 @@
<RootNamespace>
</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</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>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
<NoStdLib>true</NoStdLib>
<FrameworkPathOverride>..\..\..\..\..\packages\Microsoft.NetFX20.1.0.0-rc2\lib\net20</FrameworkPathOverride>
<NoStdLib>true</NoStdLib>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
<VBSyntaxGeneratorToolPath>$(OutDir)\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
<UseCommonOutputDirectory>True</UseCommonOutputDirectory>
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
</packages>
<package id="Microsoft.NetFX20" version="1.0.0-rc2" targetFramework="net20" />
</packages>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册