提交 daec4f16 编写于 作者: T Tomáš Matoušek

Merge pull request #4528 from tmat/PortableRefs

Portable scripting tests
$NuGetExe = "$PSScriptRoot\NuGet.exe"
$NuGetV3Exe = "$PSScriptRoot\V3\NuGet.exe"
& $NuGetExe restore "$PSScriptRoot\packages.config" -PackagesDirectory "$PSScriptRoot\..\packages" -ConfigFile "$PSScriptRoot\NuGet.config"
& $NuGetV3Exe restore "$PSScriptRoot\V3\packages.config" -PackagesDirectory "$PSScriptRoot\..\packages" -ConfigFile "$PSScriptRoot\NuGet.config"
& $NuGetExe restore "$PSScriptRoot\..\Roslyn.sln" -ConfigFile "$PSScriptRoot\NuGet.config"
& $NuGetExe restore "$PSScriptRoot\..\src\Samples\Samples.sln" -ConfigFile "$PSScriptRoot\NuGet.config"
& $NuGetExe restore "$PSScriptRoot\..\src\Dependencies\Dependencies.sln" -ConfigFile "$PSScriptRoot\NuGet.config"
......
文件已添加
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Dynamic.Runtime" version="4.0.10" />
<package id="Microsoft.CSharp" version="4.0.0-beta-22816" />
<package id="System.Reflection.Emit.Lightweight" version="4.0.0-beta-22816" />
<package id="System.Linq.Expressions" version="4.0.10-beta-22816" />
</packages>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<packages>
<package id="Microsoft.Net.Compilers" version="1.1.0-beta1-20150727-01" targetFramework="net45" />
<package id="Microsoft.Net.RoslynDiagnostics" version="1.1.0-beta1-20150727-01" targetFramework="net45" />
......@@ -11,7 +10,36 @@
<package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
<package id="dnx-mono" version="1.0.0-beta5-12101" />
<package id="Microsoft.Build.Mono.Debug" version="14.1.0.0-prerelease" />
<!-- FX -->
<package id="System.IO" version="4.0.10-beta-22816" />
<package id="System.IO.FileSystem" version="4.0.0-beta-22816" />
<package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22816" />
<package id="System.Runtime" version="4.0.20-beta-22816" />
<package id="System.Runtime.Extensions" version="4.0.10-beta-22816" />
<package id="System.Runtime.InteropServices" version="4.0.20-beta-22816" />
<package id="System.Runtime.Loader" version="4.0.0-beta-22816" />
<package id="System.Text.RegularExpressions" version="4.0.10-beta-22816" />
<package id="System.Reflection" version="4.0.10-beta-22816" />
<package id="System.Reflection.Extensions" version="4.0.0-beta-22816" />
<package id="System.Reflection.Primitives" version="4.0.0-beta-22816" />
<package id="System.Resources.ResourceManager" version="4.0.0-beta-22816" />
<package id="System.Collections" version="4.0.10-beta-22816" />
<package id="System.Collections.Concurrent" version="4.0.10-beta-22816" />
<package id="System.Linq" version="4.0.0-beta-22816" />
<package id="System.Diagnostics.Debug" version="4.0.10-beta-22816" />
<package id="System.Diagnostics.Tools" version="4.0.0-beta-22816" />
<package id="System.Globalization" version="4.0.10-beta-22816" />
<package id="System.Text.Encoding" version="4.0.10-beta-22816" />
<package id="System.Threading" version="4.0.10-beta-22816" />
<package id="System.Threading.Tasks" version="4.0.10-beta-22816" />
<package id="System.Threading.Thread" version="4.0.0-beta-22816" />
<package id="System.Xml.XDocument" version="4.0.10-beta-22816" />
<package id="System.Xml.XmlDocument" version="4.0.0-beta-22816" />
<package id="System.IO.MemoryMappedFiles" version="4.0.0-beta-22816" />
<package id="System.Console" version="4.0.0-beta-22816" />
<package id="System.Xml.ReaderWriter" version="4.0.10-beta-22816" />
<!-- xunit -->
<package id="xunit" version="1.9.2" targetFramework="net45" />
<package id="xunit" version="2.1.0-beta4-build3109" />
<package id="xunit.abstractions" version="2.0.0" />
<package id="xunit.assert" version="2.1.0-beta4-build3109" />
......
......@@ -33,7 +33,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompilerTestResources", "src\Compilers\Test\Resources\Core\CompilerTestResources.csproj", "{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerTestUtilities", "src\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj", "{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}"
EndProject
......@@ -100,8 +100,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\Vi
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Portable\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Test\Utilities\Portable\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
src\Test\Utilities\Portable\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
src\Test\Utilities\Portable\TestUtilities.projitems*{f7712928-1175-47b3-8819-ee086753dee2}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
......@@ -713,6 +716,22 @@ Global
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|Any CPU
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.ActiveCfg = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.Build.0 = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.ActiveCfg = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.Build.0 = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.ActiveCfg = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.Build.0 = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.ActiveCfg = Release|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -758,5 +777,6 @@ Global
{E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
{8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{6FF42825-5464-4151-AC55-ED828168C192} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
EndGlobalSection
EndGlobal
......@@ -33,7 +33,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompilerTestResources", "src\Compilers\Test\Resources\Core\CompilerTestResources.csproj", "{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerTestUtilities", "src\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj", "{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}"
EndProject
......@@ -98,15 +98,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DiaSymReader.Port
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Portable\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Test\Utilities\Portable\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
src\Test\Utilities\Portable\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 4
src\Test\Utilities\Portable\TestUtilities.projitems*{f7712928-1175-47b3-8819-ee086753dee2}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
......@@ -664,6 +667,22 @@ Global
{F83343BA-B4EA-451C-B6DB-5D645E6171BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F83343BA-B4EA-451C-B6DB-5D645E6171BC}.Release|x64.ActiveCfg = Release|Any CPU
{F83343BA-B4EA-451C-B6DB-5D645E6171BC}.Release|x64.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.ActiveCfg = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.Build.0 = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.ActiveCfg = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.Build.0 = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.ActiveCfg = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.Build.0 = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.ActiveCfg = Release|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -708,5 +727,6 @@ Global
{21446697-E359-41D9-B39D-40ADA2B20823} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{F83343BA-B4EA-451C-B6DB-5D645E6171BC} = {5EFE4D73-9608-4E19-83A5-963B02413164}
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
EndGlobalSection
EndGlobal
......@@ -38,7 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompilerTestResources", "src\Compilers\Test\Resources\Core\CompilerTestResources.csproj", "{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerTestUtilities", "src\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj", "{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}"
EndProject
......@@ -139,11 +139,9 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicEditorServicesTest", "
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScripting", "src\Scripting\VisualBasic\BasicScripting.vbproj", "{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest", "src\Scripting\VisualBasicTest\BasicScriptingTest.vbproj", "{ABC7262E-1053-49F3-B846-E3091BB92E8C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scripting", "src\Scripting\Core\Scripting.csproj", "{12A68549-4E8C-42D6-8703-A09335F97997}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest", "src\Scripting\Test\ScriptingTest.csproj", "{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest", "src\Scripting\CoreTest\ScriptingTest.csproj", "{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScripting", "src\Scripting\CSharp\CSharpScripting.csproj", "{066F0DBD-C46C-4C20-AFEC-99829A172625}"
EndProject
......@@ -363,9 +361,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\Vi
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Portable\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest.Desktop", "src\Scripting\CoreTest.Desktop\ScriptingTest.Desktop.csproj", "{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScriptingTest.Desktop", "src\Scripting\CSharpTest.Desktop\CSharpScriptingTest.Desktop.csproj", "{286B01F3-811A-40A7-8C1F-10C9BB0597F7}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest.Desktop", "src\Scripting\VisualBasicTest.Desktop\BasicScriptingTest.Desktop.vbproj", "{24973B4C-FD09-4EE1-97F4-EA03E6B12040}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest", "src\Scripting\VisualBasicTest\BasicScriptingTest.vbproj", "{ABC7262E-1053-49F3-B846-E3091BB92E8C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 4
src\Test\Utilities\Portable\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{ace53515-482c-4c6a-e2d2-4242a687dfee}*SharedItemsImports = 4
src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{abdbac1e-350e-4dc3-bb45-3504404545ee}*SharedItemsImports = 4
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1842}*SharedItemsImports = 4
......@@ -383,8 +392,8 @@ Global
src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 4
src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bedc5a4a-809e-4017-9cfd-6c8d4e1847f0}*SharedItemsImports = 4
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
......@@ -1482,26 +1491,6 @@ Global
{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x64.Build.0 = Release|Any CPU
{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x86.ActiveCfg = Release|Any CPU
{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x86.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|ARM.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x64.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x64.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|ARM.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|ARM.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x64.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x64.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.Build.0 = Release|Any CPU
{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|ARM.ActiveCfg = Debug|ARM
......@@ -3142,6 +3131,106 @@ Global
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|Any CPU
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.ActiveCfg = Release|Any CPU
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.ActiveCfg = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.Build.0 = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.ActiveCfg = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.Build.0 = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x86.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x86.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.ActiveCfg = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.Build.0 = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.ActiveCfg = Release|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.Build.0 = Release|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x86.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x86.Build.0 = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|ARM.Build.0 = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|x64.ActiveCfg = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|x64.Build.0 = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|x86.ActiveCfg = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Debug|x86.Build.0 = Debug|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|Any CPU.Build.0 = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|ARM.ActiveCfg = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|ARM.Build.0 = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|x64.ActiveCfg = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|x64.Build.0 = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|x86.ActiveCfg = Release|Any CPU
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}.Release|x86.Build.0 = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|ARM.ActiveCfg = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|ARM.Build.0 = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|x64.ActiveCfg = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|x64.Build.0 = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|x86.ActiveCfg = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Debug|x86.Build.0 = Debug|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|Any CPU.Build.0 = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|ARM.ActiveCfg = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|ARM.Build.0 = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|x64.ActiveCfg = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|x64.Build.0 = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|x86.ActiveCfg = Release|Any CPU
{286B01F3-811A-40A7-8C1F-10C9BB0597F7}.Release|x86.Build.0 = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|ARM.ActiveCfg = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|ARM.Build.0 = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|x64.ActiveCfg = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|x64.Build.0 = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|x86.ActiveCfg = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Debug|x86.Build.0 = Debug|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|Any CPU.Build.0 = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|ARM.ActiveCfg = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|ARM.Build.0 = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|x64.ActiveCfg = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|x64.Build.0 = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|x86.ActiveCfg = Release|Any CPU
{24973B4C-FD09-4EE1-97F4-EA03E6B12040}.Release|x86.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|ARM.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x64.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x64.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.ActiveCfg = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.Build.0 = Debug|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|ARM.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|ARM.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x64.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x64.Build.0 = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.ActiveCfg = Release|Any CPU
{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -3207,7 +3296,6 @@ Global
{3CDEEAB7-2256-418A-BEB2-620B5CB16302} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
{0BE66736-CDAA-4989-88B1-B3F46EBDCA4A} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
{3E7DEA65-317B-4F43-A25D-62F18D96CFD7} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{ABC7262E-1053-49F3-B846-E3091BB92E8C} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{12A68549-4E8C-42D6-8703-A09335F97997} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{066F0DBD-C46C-4C20-AFEC-99829A172625} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
......@@ -3311,5 +3399,10 @@ Global
{E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
{8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{6FF42825-5464-4151-AC55-ED828168C192} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{6FD1CC3E-6A99-4736-9B8D-757992DDE75D} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{286B01F3-811A-40A7-8C1F-10C9BB0597F7} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{24973B4C-FD09-4EE1-97F4-EA03E6B12040} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{ABC7262E-1053-49F3-B846-E3091BB92E8C} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
EndGlobalSection
EndGlobal
......@@ -35,7 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompilerTestResources", "src\Compilers\Test\Resources\Core\CompilerTestResources.csproj", "{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "src\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerTestUtilities", "src\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj", "{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}"
EndProject
......@@ -55,12 +55,12 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicCompilerSyntaxTest", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdbUtilities", "src\Test\PdbUtilities\PdbUtilities.csproj", "{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\TestUtilities.csproj", "{76C6F005-C89D-4348-BB4A-391898DBEB52}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Workspaces", "src\Workspaces\Core\Portable\Workspaces.csproj", "{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Desktop", "src\Test\Utilities\Desktop\TestUtilities.Desktop.csproj", "{76C6F005-C89D-4348-BB4A-391898DBEB52}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C41FAB9A-D1D7-4253-B639-D72395B6BA37}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
......@@ -118,8 +118,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\Vi
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Portable\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Test\Utilities\Portable\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
src\Test\Utilities\Portable\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 4
src\Test\Utilities\Portable\TestUtilities.projitems*{f7712928-1175-47b3-8819-ee086753dee2}*SharedItemsImports = 4
......@@ -494,22 +497,6 @@ Global
{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x64.ActiveCfg = Release|x64
{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x64.Build.0 = Release|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|ARM.ActiveCfg = Debug|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|ARM.Build.0 = Debug|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x64.ActiveCfg = Debug|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x64.Build.0 = Debug|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Any CPU.Build.0 = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|ARM.ActiveCfg = Release|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|ARM.Build.0 = Release|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x64.ActiveCfg = Release|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x64.Build.0 = Release|x64
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|ARM.ActiveCfg = Debug|Any CPU
......@@ -526,6 +513,22 @@ Global
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|x64.ActiveCfg = Release|Any CPU
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|x64.Build.0 = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|ARM.ActiveCfg = Debug|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|ARM.Build.0 = Debug|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x64.ActiveCfg = Debug|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x64.Build.0 = Debug|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Any CPU.Build.0 = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|ARM.ActiveCfg = Release|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|ARM.Build.0 = Release|ARM
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x64.ActiveCfg = Release|x64
{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x64.Build.0 = Release|x64
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|ARM.ActiveCfg = Debug|Any CPU
......@@ -844,6 +847,22 @@ Global
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|Any CPU
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.ActiveCfg = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.Build.0 = Debug|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.ActiveCfg = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|x64.Build.0 = Debug|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.ActiveCfg = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|ARM.Build.0 = Release|ARM
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.ActiveCfg = Release|x64
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -874,8 +893,8 @@ Global
{BDA5D613-596D-4B61-837C-63554151C8F5} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{91F6F646-4F6E-449A-9AB4-2986348F329D} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{76C6F005-C89D-4348-BB4A-391898DBEB52} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
{76C6F005-C89D-4348-BB4A-391898DBEB52} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{02459936-CD2C-4F61-B671-5C518F2A3DDC} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
{288089C5-8721-458E-BE3E-78990DAB5E2E} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
{288089C5-8721-458E-BE3E-78990DAB5E2D} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
......@@ -899,5 +918,6 @@ Global
{E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
{8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{6FF42825-5464-4151-AC55-ED828168C192} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
EndGlobalSection
EndGlobal
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="Libraries">
<Reference Include="$(NuGetPackagesPath)\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll">
<Private>True</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup Label="Contracts">
<Reference Include="$(NuGetPackagesPath)\System.Console.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Console.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Diagnostics.Tools.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Tools.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.IO.FileSystem.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Linq.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.Extensions.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Resources.ResourceManager.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Resources.ResourceManager.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Runtime.Loader.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Collections.Concurrent.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.Concurrent.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.IO.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Runtime.Extensions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Collections.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Diagnostics.Debug.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Debug.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Globalization.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Globalization.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Text.Encoding.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.Encoding.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Text.RegularExpressions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.RegularExpressions.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Threading.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Threading.Tasks.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Tasks.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Threading.Thread.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Thread.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Xml.XDocument.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Xml.XDocument.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Xml.XmlDocument.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Xml.XmlDocument.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Runtime.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Runtime.InteropServices.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.InteropServices.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Xml.ReaderWriter.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Xml.ReaderWriter.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Label="Facades">
<Content Include="$(NuGetPackagesPath)\System.IO.FileSystem.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.Primitives.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Console.4.0.0-beta-22816\lib\net45\System.Console.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Runtime.Extensions.4.0.10-beta-22816\lib\net45\System.Runtime.Extensions.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Collections.Concurrent.4.0.10-beta-22816\lib\net45\System.Collections.Concurrent.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.IO.4.0.10-beta-22816\lib\net45\System.IO.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Runtime.Extensions.4.0.10-beta-22816\lib\net45\System.Runtime.Extensions.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Reflection.4.0.10-beta-22816\lib\net45\System.Reflection.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Collections.4.0.10-beta-22816\lib\net45\System.Collections.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Diagnostics.Debug.4.0.10-beta-22816\lib\net45\System.Diagnostics.Debug.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Globalization.4.0.10-beta-22816\lib\net45\System.Globalization.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Text.Encoding.4.0.10-beta-22816\lib\net45\System.Text.Encoding.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Text.RegularExpressions.4.0.10-beta-22816\lib\net45\System.Text.RegularExpressions.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Threading.4.0.10-beta-22816\lib\net45\System.Threading.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Threading.Tasks.4.0.10-beta-22816\lib\net45\System.Threading.Tasks.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Threading.Thread.4.0.0-beta-22816\lib\net45\System.Threading.Thread.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Xml.XmlDocument.4.0.0-beta-22816\lib\net45\System.Xml.XmlDocument.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Runtime.4.0.20-beta-22816\lib\net45\System.Runtime.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(NuGetPackagesPath)\System.Runtime.InteropServices.4.0.20-beta-22816\lib\net45\System.Runtime.InteropServices.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
</ItemGroup>
</Project>
\ No newline at end of file
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="PortableCompilerReferences.targets" />
<Import Project="PortableXUnitReferences.targets" />
</Project>
\ No newline at end of file
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="PortableCompilerReferences.targets" />
<ItemGroup Label="Contracts">
<Reference Include="$(NuGetPackagesPath)\System.Dynamic.Runtime.4.0.10\ref\dotnet\System.Dynamic.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Linq.Expressions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.Expressions.dll">
<Private>False</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\Microsoft.CSharp.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\Microsoft.CSharp.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Label="Facades">
</ItemGroup>
</Project>
\ No newline at end of file
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="PortableReferences.targets" />
<Import Project="PortableXUnitReferences.targets" />
</Project>
\ No newline at end of file
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(NuGetPackagesPath)\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props" />
<ItemGroup>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(NuGetPackagesPath)\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.1.0.3109, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(NuGetPackagesPath)\xunit.assert.2.1.0-beta4-build3109\lib\portable-net45+netcore45+wp8+wpa81\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3109, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(NuGetPackagesPath)\xunit.extensibility.core.2.1.0-beta4-build3109\lib\portable-net45+netcore45+wp8+wpa81\xunit.core.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -17,6 +17,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd
REM Build the compiler so we can self host it for the full build
.nuget\NuGet.exe restore .nuget/packages.config -packagesdirectory packages -Config .nuget/NuGet.Config
.nuget\NuGet.exe restore %RoslynRoot%/build/Toolset.sln -packagesdirectory packages
.nuget\V3\NuGet.exe restore .nuget/V3/packages.config -packagesdirectory packages -Config .nuget/NuGet.Config
msbuild /nologo /v:m /m %RoslynRoot%/build/Toolset.sln /p:Configuration=%BuildConfiguration%
mkdir %RoslynRoot%\Binaries\Bootstrap
......
......@@ -237,7 +237,10 @@ which mono
# Linux runs to fail frequently enough that we need to employ a
# temporary work around.
echo Restoring NuGet packages
run_nuget restore CrossPlatform.sln
run_nuget restore CrossPlatform.sln -PackagesDirectory packages
run_nuget restore .nuget/packages.config -PackagesDirectory packages
run_nuget install xunit.runners -PreRelease -Version $XUNIT_VERSION -OutputDirectory packages
compile_toolset
......
......@@ -882,7 +882,9 @@
<InternalsVisibleToTest Include="Roslyn.Test.Utilities.FX45" />
<InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.Destkop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests2" />
</ItemGroup>
......
......@@ -39,7 +39,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -34,7 +34,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -30,7 +30,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -30,7 +30,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -47,7 +47,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -38,7 +38,7 @@
<Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -56,7 +56,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -30,7 +30,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -705,8 +705,11 @@
<InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities" />
<InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Test.Utilities.Desktop" />
<InternalsVisibleToTest Include="Roslyn.Test.Utilities.FX45" />
<InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
......
......@@ -46,7 +46,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -34,7 +34,7 @@
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -38,7 +38,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -1006,7 +1006,9 @@
<InternalsVisibleToTest Include="Roslyn.Test.Utilities.FX45" />
<InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests2" />
......
......@@ -32,7 +32,7 @@
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -36,7 +36,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -32,7 +32,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -32,7 +32,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -46,7 +46,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -3,7 +3,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props" />
<Import Project="..\..\..\build\Targets\PortableTestReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
......@@ -36,97 +36,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="..\..\..\packages\Microsoft.DiaSymReader.1.0.5\lib\net45\Microsoft.DiaSymReader.dll" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Collections.Immutable, Version=$(SystemCollectionsImmutableAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=$(SystemReflectionMetadataAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="..\..\..\packages\System.IO.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Extensions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Loader.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Extensions.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Resources.ResourceManager.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Resources.ResourceManager.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.InteropServices.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.InteropServices.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Collections.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Linq.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Debug.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Debug.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Tools.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Tools.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Globalization.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Globalization.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Text.Encoding.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.Encoding.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.Tasks.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Tasks.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</Content>
<Content Include="..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.Primitives.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
</ItemGroup>
<ItemGroup>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.0.0.3109, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\xunit.assert.2.1.0-beta4-build3109\lib\portable-net45+netcore45+wp8+wpa81\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.0.0.3109, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<Reference Include="Microsoft.DiaSymReader">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\xunit.extensibility.core.2.1.0-beta4-build3109\lib\portable-net45+netcore45+wp8+wpa81\xunit.core.dll</HintPath>
<HintPath>$(NuGetPackagesPath)\Microsoft.DiaSymReader.1.0.5\lib\net45\Microsoft.DiaSymReader.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
......
......@@ -25,7 +25,7 @@
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -25,7 +25,7 @@
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -26,7 +26,7 @@
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -85,7 +85,7 @@
<Project>{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}</Project>
<Name>CSharpEditorFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......@@ -97,7 +97,7 @@
<Project>{76C6F005-C89D-4348-BB4A-39189DDBEB52}</Project>
<Name>ServicesTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\Test\ScriptingTest.csproj">
<ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj">
<Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
<Name>ScriptingTest</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
......@@ -48,7 +48,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -102,7 +102,7 @@
<Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}</Project>
<Name>BasicCompilerTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -79,7 +79,7 @@
<Project>{49BFAE50-1BCE-48AE-BC89-78B7D90A3ECD}</Project>
<Name>BasicEditorFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -18,7 +18,7 @@
<!-- Don't transitively copy output files, since everything builds to the same folder. -->
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -21,7 +21,7 @@
<Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......@@ -50,7 +50,7 @@
<Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
<Name>TestUtilities.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Scripting\Test\ScriptingTest.csproj">
<ProjectReference Include="..\..\..\..\Scripting\CoreTest\ScriptingTest.csproj">
<Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
<Name>ScriptingTest</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
......@@ -29,7 +29,7 @@
</Reference>
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -26,7 +26,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -30,7 +30,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -29,7 +29,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -22,7 +22,7 @@
<Reference Include="..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll" />
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\build\Targets\PortableReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -45,73 +46,6 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Collections.Immutable, Version=$(SystemCollectionsImmutableAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=$(SystemReflectionMetadataAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="..\..\..\packages\System.IO.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Extensions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Loader.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Extensions.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Resources.ResourceManager.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Resources.ResourceManager.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.InteropServices.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.InteropServices.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Collections.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Linq.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Debug.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Debug.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Tools.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Tools.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Globalization.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Globalization.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Text.Encoding.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.Encoding.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.Tasks.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Tasks.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CSharpObjectFormatter.cs" />
<Compile Include="CSharpScript.cs" />
......@@ -134,9 +68,6 @@
<LastGenOutput>CSharpScriptingResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{286B01F3-811A-40A7-8C1F-10C9BB0597F7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.CodeAnalysis.Scripting.CSharpTest</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup Label="Libraries">
<Reference Include="$(NuGetPackagesPath)\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll">
<Private>True</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll">
<Private>True</Private>
</Reference>
<Reference Include="xunit">
<HintPath>$(NuGetPackagesPath)\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\CoreTest.Desktop\ScriptingTest.Desktop.csproj">
<Project>{6fd1cc3e-6a99-4736-9b8d-757992dde75d}</Project>
<Name>ScriptingTest.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Scripting.csproj">
<Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
<Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
<Name>ScriptingTest</Name>
</ProjectReference>
<ProjectReference Include="..\CSharpTest\CSharpScriptingTest.csproj">
<Project>{2dae4406-7a89-4b5f-95c3-bc5422ce47ce}</Project>
<Name>CSharpScriptingTest</Name>
</ProjectReference>
<ProjectReference Include="..\CSharp\CSharpScripting.csproj">
<Project>{066F0DBD-C46C-4C20-AFEC-99829A172625}</Project>
<Name>CSharpScripting</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<Compile Include="InteractiveSessionTests.cs" />
<Compile Include="ObjectFormatterTests.cs" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
</Project>
\ No newline at end of file
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using Microsoft.CodeAnalysis.Scripting.UnitTests;
using Xunit;
using VB = Microsoft.CodeAnalysis.VisualBasic;
namespace Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests
{
public class ObjectFormatterTests : ObjectFormatterTestBase
{
[Fact]
public void DebuggerProxy_FrameworkTypes_ArrayList()
{
var obj = new ArrayList { 1, 2, true, "foo" };
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("ArrayList(4) { 1, 2, true, \"foo\" }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_Hashtable()
{
var obj = new Hashtable
{
{ new byte[] { 1, 2 }, new[] { 1,2,3 } },
};
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_memberList);
AssertMembers(str, "Hashtable(1)",
"{ byte[2] { 1, 2 }, int[3] { 1, 2, 3 } }"
);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_Queue()
{
var obj = new Queue();
obj.Enqueue(1);
obj.Enqueue(2);
obj.Enqueue(3);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("Queue(3) { 1, 2, 3 }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_Stack()
{
var obj = new Stack();
obj.Push(1);
obj.Push(2);
obj.Push(3);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("Stack(3) { 3, 2, 1 }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_SortedList()
{
SortedList obj = new SortedList();
obj.Add(3, 4);
obj.Add(1, 5);
obj.Add(2, 6);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("SortedList(3) { { 1, 5 }, { 2, 6 }, { 3, 4 } }", str);
obj = new SortedList();
obj.Add(new[] { 3 }, new int[] { 4 });
str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("SortedList(1) { { int[1] { 3 }, int[1] { 4 } } }", str);
}
// TODO: move to portable
[Fact]
public void VBBackingFields_DebuggerBrowsable()
{
string source = @"
Imports System
Class C
Public WithEvents WE As C
Public Event E As Action
Public Property A As Integer
End Class
";
var compilation = VB.VisualBasicCompilation.Create(
"foo",
new[] { VB.VisualBasicSyntaxTree.ParseText(source) },
new[] { MetadataReference.CreateFromAssemblyInternal(typeof(object).GetTypeInfo().Assembly) },
new VB.VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary, optimizationLevel: OptimizationLevel.Debug));
Assembly a;
using (var stream = new MemoryStream())
{
var result = compilation.Emit(stream);
a = Assembly.Load(stream.ToArray());
}
var c = a.GetType("C");
var obj = Activator.CreateInstance(c);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_memberList);
AssertMembers(str, "C",
"A: 0",
"WE: null"
);
var attrsA = c.GetField("_A", BindingFlags.Instance | BindingFlags.NonPublic).GetCustomAttributes(typeof(DebuggerBrowsableAttribute), true);
var attrsWE = c.GetField("_WE", BindingFlags.Instance | BindingFlags.NonPublic).GetCustomAttributes(typeof(DebuggerBrowsableAttribute), true);
var attrsE = c.GetField("EEvent", BindingFlags.Instance | BindingFlags.NonPublic).GetCustomAttributes(typeof(DebuggerBrowsableAttribute), true);
Assert.Equal(1, attrsA.Length);
Assert.Equal(1, attrsWE.Length);
Assert.Equal(1, attrsE.Length);
}
}
}
......@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\build\Targets\PortableTestReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
......@@ -15,7 +16,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ImplicitlyExpandTargetFramework>False</ImplicitlyExpandTargetFramework>
<NoStdLib>true</NoStdLib>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
......@@ -34,15 +40,15 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj">
<Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}</Project>
<Name>CSharpCompilerTestUtilities</Name>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Scripting.csproj">
<Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\Test\ScriptingTest.csproj">
<ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
<Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
<Name>ScriptingTest</Name>
</ProjectReference>
......@@ -50,46 +56,20 @@
<Project>{066F0DBD-C46C-4C20-AFEC-99829A172625}</Project>
<Name>CSharpScripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\CSharp\Test\Symbol\CSharpCompilerSymbolTest.csproj">
<Project>{28026D16-EB0C-40B0-BDA7-11CAA2B97CCC}</Project>
<Name>CSharpCompilerSymbolTest</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Collections.Immutable">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="xunit">
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="CSharpScriptEngine.cs" />
<Compile Include="InteractiveSessionFixtures.cs" />
<Compile Include="InteractiveSessionTests.cs" />
<Compile Include="ObjectFormatterTests.cs" />
<Compile Include="ScriptTests.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
......
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
public class InteractiveFixtures_TopLevelHostObject
{
public int X, Y, Z;
}
namespace InteractiveFixtures
{
namespace A
{
public class X { }
}
namespace B
{
public class X { }
}
namespace C
{
public interface System { }
}
}
......@@ -14,7 +14,6 @@
using ObjectFormatterFixtures;
using Roslyn.Test.Utilities;
using Xunit;
using VB = Microsoft.CodeAnalysis.VisualBasic;
namespace Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests
{
......@@ -468,15 +467,6 @@ public void DebuggerProxy_FrameworkTypes_IDictionary_Exception()
Assert.Equal("ThrowingDictionary(10) { { 1, 1 }, { 2, 2 }, !<Exception> ... }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_ArrayList()
{
var obj = new ArrayList { 1, 2, true, "foo" };
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("ArrayList(4) { 1, 2, true, \"foo\" }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_BitArray()
{
......@@ -486,43 +476,28 @@ public void DebuggerProxy_FrameworkTypes_BitArray()
Assert.Equal("BitArray(32) { true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_Hashtable()
{
var obj = new Hashtable
{
{ new byte[] { 1, 2 }, new[] { 1,2,3 } },
};
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_memberList);
AssertMembers(str, "Hashtable(1)",
"{ byte[2] { 1, 2 }, int[3] { 1, 2, 3 } }"
);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_Queue()
{
var obj = new Queue();
var obj = new Queue<int>();
obj.Enqueue(1);
obj.Enqueue(2);
obj.Enqueue(3);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("Queue(3) { 1, 2, 3 }", str);
Assert.Equal("Queue<int>(3) { 1, 2, 3 }", str);
}
[Fact]
public void DebuggerProxy_FrameworkTypes_Stack()
{
var obj = new Stack();
var obj = new Stack<int>();
obj.Push(1);
obj.Push(2);
obj.Push(3);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("Stack(3) { 3, 2, 1 }", str);
Assert.Equal("Stack<int>(3) { 3, 2, 1 }", str);
}
[Fact]
......@@ -577,19 +552,19 @@ public void DebuggerProxy_FrameworkTypes_LinkedList()
[Fact]
public void DebuggerProxy_FrameworkTypes_SortedList()
{
SortedList obj = new SortedList();
var obj = new SortedList<int, int>();
obj.Add(3, 4);
obj.Add(1, 5);
obj.Add(2, 6);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("SortedList(3) { { 1, 5 }, { 2, 6 }, { 3, 4 } }", str);
Assert.Equal("SortedList<int, int>(3) { { 1, 5 }, { 2, 6 }, { 3, 4 } }", str);
obj = new SortedList();
obj.Add(new[] { 3 }, new int[] { 4 });
var obj2 = new SortedList<int[], int[]>();
obj2.Add(new[] { 3 }, new int[] { 4 });
str = CSharpObjectFormatter.Instance.FormatObject(obj, s_inline);
Assert.Equal("SortedList(1) { { int[1] { 3 }, int[1] { 4 } } }", str);
str = CSharpObjectFormatter.Instance.FormatObject(obj2, s_inline);
Assert.Equal("SortedList<int[], int[]>(1) { { int[1] { 3 }, int[1] { 4 } } }", str);
}
[Fact]
......@@ -807,48 +782,5 @@ public void DebuggerProxy_ArrayBuilder()
"5"
);
}
[Fact]
public void VBBackingFields_DebuggerBrowsable()
{
string source = @"
Imports System
Class C
Public WithEvents WE As C
Public Event E As Action
Public Property A As Integer
End Class
";
var compilation = VB.VisualBasicCompilation.Create(
"foo",
new[] { VB.VisualBasicSyntaxTree.ParseText(source) },
new[] { MetadataReference.CreateFromAssemblyInternal(typeof(object).Assembly) },
new VB.VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary, optimizationLevel: OptimizationLevel.Debug));
Assembly a;
using (var stream = new MemoryStream())
{
var result = compilation.Emit(stream);
a = Assembly.Load(stream.ToArray());
}
var c = a.GetType("C");
var obj = Activator.CreateInstance(c);
var str = CSharpObjectFormatter.Instance.FormatObject(obj, s_memberList);
AssertMembers(str, "C",
"A: 0",
"WE: null"
);
var attrsA = c.GetField("_A", BindingFlags.Instance | BindingFlags.NonPublic).GetCustomAttributes(typeof(DebuggerBrowsableAttribute), true);
var attrsWE = c.GetField("_WE", BindingFlags.Instance | BindingFlags.NonPublic).GetCustomAttributes(typeof(DebuggerBrowsableAttribute), true);
var attrsE = c.GetField("EEvent", BindingFlags.Instance | BindingFlags.NonPublic).GetCustomAttributes(typeof(DebuggerBrowsableAttribute), true);
Assert.Equal(1, attrsA.Length);
Assert.Equal(1, attrsWE.Length);
Assert.Equal(1, attrsE.Length);
}
}
}
......@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Scripting;
using Microsoft.CodeAnalysis.Scripting.CSharp;
using Roslyn.Test.Utilities;
......@@ -25,6 +24,7 @@ public void TestCreateScript()
public void TestGetCompilation()
{
var script = CSharpScript.Create("1 + 2");
script.RunAsync(new ScriptTests());
var compilation = script.GetCompilation();
Assert.Equal(script.Code, compilation.SyntaxTrees.First().GetText().ToString());
}
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="1.9.2" targetFramework="net45" />
</packages>
......@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\build\Targets\PortableReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -11,6 +12,7 @@
<RootNamespace>Microsoft.CodeAnalysis.Scripting</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.Scripting</AssemblyName>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
......@@ -31,111 +33,24 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
<PlatformTarget>ARM</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
<PlatformTarget>ARM</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DogfoodDebug|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DogfoodDebug|ARM'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DogfoodRelease|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DogfoodRelease|ARM'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);SCRIPTING</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);SCRIPTING</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=$(SystemCollectionsImmutableAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=$(SystemReflectionMetadataAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="..\..\..\packages\System.IO.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Extensions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Loader.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Extensions.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Resources.ResourceManager.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Resources.ResourceManager.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.InteropServices.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.InteropServices.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Collections.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Linq.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Debug.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Debug.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Tools.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Tools.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Globalization.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Globalization.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Text.Encoding.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.Encoding.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.Tasks.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Tasks.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Emit.Lightweight.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Emit.Lightweight.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.Primitives.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Compilers\Helpers\GlobalAssemblyCacheHelpers\FusionAssemblyIdentity.cs">
<Link>FusionAssemblyIdentity.cs</Link>
......@@ -181,19 +96,14 @@
<InternalsVisibleTo Include="Microsoft.VisualStudio.InteractiveServices" />
<InternalsVisibleTo Include="csi" />
<InternalsVisibleTo Include="vbi" />
<!-- GAC helpers -->
<InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Test.Utilities.Desktop" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
<InternalsVisibleToTest Include="RoslynTaoActions" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="ScriptingResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.IO" version="4.0.10-beta-22816" />
<package id="System.IO.FileSystem" version="4.0.0-beta-22816" />
<package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22816" />
<package id="System.Runtime" version="4.0.20-beta-22816" />
<package id="System.Runtime.Extensions" version="4.0.10-beta-22816" />
<package id="System.Runtime.InteropServices" version="4.0.20-beta-22816" />
<package id="System.Runtime.Loader" version="4.0.0-beta-22816" />
<package id="System.Reflection" version="4.0.10-beta-22816" />
<package id="System.Reflection.Extensions" version="4.0.0-beta-22816" />
<package id="System.Reflection.Primitives" version="4.0.0-beta-22816" />
<package id="System.Resources.ResourceManager" version="4.0.0-beta-22816" />
<package id="System.Collections" version="4.0.10-beta-22816" />
<package id="System.Linq" version="4.0.0-beta-22816" />
<package id="System.Diagnostics.Debug" version="4.0.10-beta-22816" />
<package id="System.Diagnostics.Tools" version="4.0.0-beta-22816" />
<package id="System.Globalization" version="4.0.10-beta-22816" />
<package id="System.Text.Encoding" version="4.0.10-beta-22816" />
<package id="System.Threading" version="4.0.10-beta-22816" />
<package id="System.Threading.Tasks" version="4.0.10-beta-22816" />
<package id="System.Reflection.Emit.Lightweight" version="4.0.0-beta-22816" />
</packages>
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Linq;
using System.Collections.Generic;
......@@ -15,6 +14,8 @@
namespace Roslyn.Services.UnitTests
{
// TODO: clean up and move to portable tests
public class MetadataShadowCopyProviderTests : TestBase, IDisposable
{
private readonly MetadataShadowCopyProvider _provider;
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.CodeAnalysis.Scripting.Test</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
<Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project>
<Name>ScriptingTest</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Scripting.csproj">
<Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\CSharp\CSharpScripting.csproj">
<Project>{066F0DBD-C46C-4C20-AFEC-99829A172625}</Project>
<Name>CSharpScripting</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup Label="Libraries">
<Reference Include="$(NuGetPackagesPath)\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll">
<Private>True</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll">
<Private>True</Private>
</Reference>
<Reference Include="xunit">
<HintPath>$(NuGetPackagesPath)\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<Compile Include="GlobalAssemblyCacheTests.cs" />
<Compile Include="MetadataShadowCopyProviderTests.cs" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
</Project>
\ No newline at end of file
......@@ -25,7 +25,9 @@ internal abstract class ScriptEngine
static ScriptEngine()
{
#if TODO
DefaultReferenceSearchPaths = ImmutableArray.Create(RuntimeEnvironment.GetRuntimeDirectory());
#endif
}
internal ScriptEngine(ScriptOptions options, MetadataFileReferenceProvider metadataReferenceProvider)
......@@ -83,7 +85,7 @@ internal MetadataFileReferenceResolver MetadataReferenceResolver
internal abstract Script<T> Create<T>(string code, ScriptOptions options, Type globalsType);
#region Session
#region Session
public Session CreateSession() // TODO (tomat): bool isCancellable = false
{
......@@ -113,9 +115,9 @@ internal MetadataFileReferenceResolver MetadataReferenceResolver
}
Type actualType = hostObject.GetType();
if (!hostObjectType.IsAssignableFrom(actualType))
if (!hostObjectType.GetTypeInfo().IsAssignableFrom(actualType.GetTypeInfo()))
{
throw new ArgumentException(String.Format(ScriptingResources.CantAssignTo, actualType, hostObjectType), "hostObjectType");
throw new ArgumentException(string.Format(ScriptingResources.CantAssignTo, actualType, hostObjectType), "hostObjectType");
}
return new Session(this, _options, hostObject, hostObjectType);
......@@ -132,9 +134,9 @@ internal MetadataFileReferenceResolver MetadataReferenceResolver
return new Session(this, _options, hostObject, typeof(THostObject));
}
#endregion
#endregion
#region State
#region State
/// <summary>
/// The base directory used to resolve relative paths to assembly references and
......@@ -278,6 +280,6 @@ internal static void ValidateNamespace(string @namespace)
}
}
#endregion
#endregion
}
}
......@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\build\Targets\PortableTestReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
......@@ -15,7 +16,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ImplicitlyExpandTargetFramework>False</ImplicitlyExpandTargetFramework>
<NoStdLib>true</NoStdLib>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
......@@ -30,14 +36,14 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Scripting.csproj">
<Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
<Name>Scripting</Name>
......@@ -52,21 +58,6 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="xunit">
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="GlobalAssemblyCacheTests.cs" />
<Compile Include="MetadataShadowCopyProviderTests.cs" />
<Compile Include="ObjectFormatterTestBase.cs" />
<Compile Include="ObjectFormatterTests.Fixtures.cs" />
<Compile Include="ScriptEngine.cs" />
......@@ -75,14 +66,11 @@
<Compile Include="Submission.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="1.9.2" targetFramework="net45" />
</packages>
......@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\build\Targets\PortableReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
......@@ -14,9 +15,9 @@
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
<RestorePackages>true</RestorePackages>
<ImplicitlyExpandTargetFramework>False</ImplicitlyExpandTargetFramework>
<NoStdLib>true</NoStdLib>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
......@@ -42,73 +43,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
<PlatformTarget>ARM</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Collections.Immutable, Version=$(SystemCollectionsImmutableAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=$(SystemReflectionMetadataAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="..\..\..\packages\System.IO.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Extensions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.Loader.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Reflection.Extensions.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Resources.ResourceManager.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Resources.ResourceManager.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Runtime.InteropServices.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.InteropServices.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Collections.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Linq.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Debug.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Debug.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Diagnostics.Tools.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Tools.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Globalization.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Globalization.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Text.Encoding.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.Encoding.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\packages\System.Threading.Tasks.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Tasks.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="VBScriptingResources.Designer.vb">
<AutoGen>True</AutoGen>
......@@ -118,12 +52,6 @@
<Compile Include="VisualBasicObjectFormatter.vb" />
<Compile Include="VisualBasicScript.vb" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Emit.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="VBScriptingResources.resx">
<CustomToolNamespace>Microsoft.CodeAnalysis.Scripting.VisualBasic</CustomToolNamespace>
......@@ -132,10 +60,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="My Project\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Emit.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.IO" version="4.0.10-beta-22816" />
<package id="System.IO.FileSystem" version="4.0.0-beta-22816" />
<package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22816" />
<package id="System.Runtime" version="4.0.20-beta-22816" />
<package id="System.Runtime.Extensions" version="4.0.10-beta-22816" />
<package id="System.Runtime.InteropServices" version="4.0.20-beta-22816" />
<package id="System.Runtime.Loader" version="4.0.0-beta-22816" />
<package id="System.Reflection" version="4.0.10-beta-22816" />
<package id="System.Reflection.Extensions" version="4.0.0-beta-22816" />
<package id="System.Reflection.Primitives" version="4.0.0-beta-22816" />
<package id="System.Resources.ResourceManager" version="4.0.0-beta-22816" />
<package id="System.Collections" version="4.0.10-beta-22816" />
<package id="System.Linq" version="4.0.0-beta-22816" />
<package id="System.Diagnostics.Debug" version="4.0.10-beta-22816" />
<package id="System.Diagnostics.Tools" version="4.0.0-beta-22816" />
<package id="System.Globalization" version="4.0.10-beta-22816" />
<package id="System.Text.Encoding" version="4.0.10-beta-22816" />
<package id="System.Threading" version="4.0.10-beta-22816" />
<package id="System.Threading.Tasks" version="4.0.10-beta-22816" />
</packages>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{24973B4C-FD09-4EE1-97F4-EA03E6B12040}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\Test\Utilities\VisualBasic\BasicCompilerTestUtilities.vbproj">
<Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}</Project>
<Name>BasicCompilerTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Scripting.csproj">
<Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
<Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
<Name>ScriptingTest</Name>
</ProjectReference>
<ProjectReference Include="..\VisualBasicTest\BasicScriptingTest.vbproj">
<Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
<Name>BasicScriptingTest</Name>
</ProjectReference>
<ProjectReference Include="..\VisualBasic\BasicScripting.vbproj">
<Project>{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}</Project>
<Name>BasicScripting</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup Label="Libraries">
<Reference Include="$(NuGetPackagesPath)\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll">
<Private>True</Private>
</Reference>
<Reference Include="$(NuGetPackagesPath)\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll">
<Private>True</Private>
</Reference>
<Reference Include="xunit">
<HintPath>$(NuGetPackagesPath)\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="InteractiveSessionTests.vb" />
<Compile Include="ObjectFormatterTests.vb" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
</Project>
\ No newline at end of file
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports Microsoft.CodeAnalysis.Scripting.Test
Imports Microsoft.CodeAnalysis.VisualBasic
Imports Roslyn.Test.Utilities
Imports Xunit
Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests
Public Class InteractiveSessionTests
Inherits TestBase
' TODO: port tests from C#
End Class
End Namespace
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports Microsoft.CodeAnalysis.Scripting.UnitTests
Imports ObjectFormatterFixtures
Imports Xunit
Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests
Public Class ObjectFormatterTests
Inherits ObjectFormatterTestBase
<Fact>
Public Sub DebuggerProxy_FrameworkTypes_ArrayList()
Dim obj = New ArrayList From {1, 2, True, "foo"}
Dim str = VisualBasicObjectFormatter.Instance.FormatObject(obj, s_inline)
Assert.Equal("ArrayList(4) { 1, 2, True, ""foo"" }", str)
End Sub
<Fact>
Public Sub DebuggerProxy_FrameworkTypes_Hashtable()
Dim obj = New Hashtable From {{New Byte() {1, 2}, {1, 2, 3}}}
Dim str = VisualBasicObjectFormatter.Instance.FormatObject(obj, s_memberList)
AssertMembers(str, "Hashtable(1)", "{ Byte(2) { 1, 2 }, Integer(3) { 1, 2, 3 } }")
End Sub
<Fact>
Public Sub DebuggerProxy_FrameworkTypes_Queue()
Dim obj = New Queue()
obj.Enqueue(1)
obj.Enqueue(2)
obj.Enqueue(3)
Dim str = VisualBasicObjectFormatter.Instance.FormatObject(obj, s_inline)
Assert.Equal("Queue(3) { 1, 2, 3 }", str)
End Sub
<Fact>
Public Sub DebuggerProxy_FrameworkTypes_Stack()
Dim obj = New Stack()
obj.Push(1)
obj.Push(2)
obj.Push(3)
Dim str = VisualBasicObjectFormatter.Instance.FormatObject(obj, s_inline)
Assert.Equal("Stack(3) { 3, 2, 1 }", str)
End Sub
<Fact>
Public Sub DebuggerProxy_FrameworkTypes_SortedList()
Dim obj As SortedList = New SortedList()
obj.Add(3, 4)
obj.Add(1, 5)
obj.Add(2, 6)
Dim str = VisualBasicObjectFormatter.Instance.FormatObject(obj, s_inline)
Assert.Equal("SortedList(3) { { 1, 5 }, { 2, 6 }, { 3, 4 } }", str)
obj = New SortedList()
obj.Add({3}, New Integer() {4})
str = VisualBasicObjectFormatter.Instance.FormatObject(obj, s_inline)
Assert.Equal("SortedList(1) { { Integer(1) { 3 }, Integer(1) { 4 } } }", str)
End Sub
End Class
End Namespace
......@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\build\Targets\PortableTestReferences.targets" />
</ImportGroup>
<PropertyGroup>
<Nonshipping>true</Nonshipping>
......@@ -9,24 +10,27 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{ABC7262E-1053-49F3-B846-E3091BB92E8C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
<ImplicitlyExpandTargetFramework>False</ImplicitlyExpandTargetFramework>
<NoStdLib>true</NoStdLib>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name>
......@@ -35,15 +39,15 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\Test\Utilities\VisualBasic\BasicCompilerTestUtilities.vbproj">
<Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}</Project>
<Name>BasicCompilerTestUtilities</Name>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Scripting.csproj">
<Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\Test\ScriptingTest.csproj">
<ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
<Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
<Name>ScriptingTest</Name>
</ProjectReference>
......@@ -52,37 +56,14 @@
<Name>BasicScripting</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="xunit">
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="VisualBasicScriptEngine.vb" />
<Compile Include="InteractiveSessionTests.vb" />
<Compile Include="ObjectFormatterTests.vb" />
<Compile Include="ScriptTests.vb" />
<Compile Include="VisualBasicScriptEngine.vb" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
</ItemGroup>
<ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
......
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports System.Reflection
Imports Microsoft.CodeAnalysis.Scripting.Test
Imports Microsoft.CodeAnalysis.VisualBasic
Imports Roslyn.Test.Utilities
......@@ -85,7 +86,7 @@ End If
Public Sub DiagnosticsPass()
Dim engine = New VisualBasicScriptEngine()
Dim session = engine.CreateSession()
session.AddReference(GetType(Expressions.Expression).Assembly)
session.AddReference(GetType(Expressions.Expression).GetTypeInfo().Assembly)
session.Execute(
"Function F(e As System.Linq.Expressions.Expression(Of System.Func(Of Object))) As Object
Return e.Compile()()
......
......@@ -66,6 +66,7 @@ Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests
str = VisualBasicObjectFormatter.Instance.FormatObject(sort, New ObjectFormattingOptions(maxLineLength:=80, memberFormat:=MemberDisplayFormat.Inline))
Assert.Equal("Sort { aB=-1, ab=1, Ac=-1, Ad=1, ad=-1, aE=1, aF=-1, AG=1 }", str)
End Sub
End Class
' TODO: port tests from C#
End Class
End Namespace
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests
Imports Roslyn.Test.Utilities
Imports Xunit
......
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests
Imports Roslyn.Test.Utilities
Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="1.9.2" targetFramework="net45" />
</packages>
......@@ -29,7 +29,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -3,7 +3,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="TestUtilities.projitems" Label="Shared" />
<Import Project="..\Portable\TestUtilities.projitems" Label="Shared" />
</ImportGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
......
......@@ -37,8 +37,11 @@ public EnsureEnglishUICulture()
_threadUICulture = CultureInfo.CurrentUICulture;
_needToRestore = true;
// TODO: Should use CultureInfo.CurrentUICulture on 4.6
#if DNX
CultureInfo.CurrentUICulture = preferred;
#else
System.Threading.Thread.CurrentThread.CurrentUICulture = preferred;
#endif
}
}
......@@ -49,8 +52,11 @@ public void Dispose()
if (_needToRestore && _threadId == Thread.CurrentThread.ManagedThreadId)
{
_needToRestore = false;
// TODO: Should use CultureInfo.CurrentUICulture on 4.6
#if DNX
CultureInfo.CurrentUICulture = _threadUICulture;
#else
System.Threading.Thread.CurrentThread.CurrentUICulture = _threadUICulture;
#endif
}
}
}
......
......@@ -3,6 +3,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="Settings">
<Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
<Import Project="..\..\..\..\build\Targets\PortableCompilerTestReferences.targets" />
<Import Project="TestUtilities.projitems" Label="Shared" />
</ImportGroup>
<PropertyGroup>
......@@ -21,6 +22,7 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ImplicitlyExpandTargetFramework>False</ImplicitlyExpandTargetFramework>
<NoStdLib>true</NoStdLib>
<DefineConstants>$(DefineConstants);DNX</DefineConstants>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\PdbUtilities\PdbUtilities.csproj">
......@@ -47,88 +49,12 @@
<ItemGroup>
<Reference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Test.Resources.Proprietary.1.1.0-beta1-20150716-08\lib\net45\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata">
<HintPath>..\..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>..\..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(NuGetPackagesPath)\Microsoft.CodeAnalysis.Test.Resources.Proprietary.1.1.0-beta1-20150716-08\lib\net45\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll</HintPath>
</Reference>
<Reference Include="Microsoft.DiaSymReader">
<HintPath>..\..\..\..\packages\Microsoft.DiaSymReader.1.0.5\lib\net45\Microsoft.DiaSymReader.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.0.0.3109, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\xunit.assert.2.1.0-beta4-build3109\lib\portable-net45+netcore45+wp8+wpa81\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="..\..\..\..\packages\System.IO.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.IO.FileSystem.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Runtime.Extensions.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Extensions.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Runtime.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Runtime.Loader.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Reflection.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Reflection.Primitives.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Primitives.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Reflection.Extensions.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Reflection.Extensions.dll">
<Private>False</Private>
<HintPath>$(NuGetPackagesPath)\Microsoft.DiaSymReader.1.0.5\lib\net45\Microsoft.DiaSymReader.dll</HintPath>
</Reference>
<Reference Include="..\..\..\..\packages\System.Resources.ResourceManager.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Resources.ResourceManager.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Runtime.InteropServices.4.0.20-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Runtime.InteropServices.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Collections.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Collections.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Linq.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Linq.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Diagnostics.Debug.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Debug.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Diagnostics.Tools.4.0.0-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Diagnostics.Tools.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Globalization.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Globalization.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Text.Encoding.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Text.Encoding.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Threading.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.dll">
<Private>False</Private>
</Reference>
<Reference Include="..\..\..\..\packages\System.Threading.Tasks.4.0.10-beta-22816\lib\portable-wpa81+wp80+win80+net45+aspnetcore50\System.Threading.Tasks.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\..\packages\System.IO.FileSystem.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</Content>
<Content Include="..\..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0-beta-22816\lib\net45\System.IO.FileSystem.Primitives.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
<PlatformTarget>ARM</PlatformTarget>
......@@ -177,8 +103,11 @@
<InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
<InternalsVisibleToTest Include="Roslyn.Services.Test.Utilities" />
<InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />
......
......@@ -30,7 +30,7 @@
</Reference>
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -42,7 +42,7 @@
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -29,7 +29,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -32,7 +32,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
......@@ -26,7 +26,7 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.FX45.csproj">
<ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册