Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 7fe93934 编写于 作者: J Jared Parsons 提交者： GitHub
浏览文件
操作

Merge pull request #15030 from jaredpar/fix-dir2 

Fully separate out tests to separate directories
上级 2edfa366 29f85808
展开全部 显示空白变更内容
内联 并排
Showing with 801 addition and 91 deletion
build/Targets/Imports.targets
浏览文件 @ 7fe93934
...@@ -8,19 +8,16 @@ ...@@ -8,19 +8,16 @@
<OutDir>$(OutDir)Exes\$(MSBuildProjectName)\</OutDir> <OutDir>$(OutDir)Exes\$(MSBuildProjectName)\</OutDir>
</PropertyGroup> </PropertyGroup>
</When> </When>
<When Condition="'$(RoslynProjectType)' == 'UnitTestFixed'">
<PropertyGroup>
<OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
</PropertyGroup>
</When>
<When Condition="'$(RoslynProjectType)' == 'UnitTest'"> <When Condition="'$(RoslynProjectType)' == 'UnitTest'">
<PropertyGroup> <PropertyGroup>
<OutDir>$(OutDir)UnitTests\Current\</OutDir> <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
</PropertyGroup> </PropertyGroup>
</When> </When>
<When Condition="'$(RoslynProjectType)' == 'UnitTestNext'"> <When Condition="'$(RoslynProjectType)' == 'UnitTestPortable' or '$(RoslynProjectType)' == 'UnitTestDesktop'">
<PropertyGroup> <PropertyGroup>
<OutDir>$(OutDir)UnitTests\Next\</OutDir> <_CopyReferences>false</_CopyReferences>
<_CopyProjectReferences>false</_CopyProjectReferences>
<OutDir>$(OutDir)Dlls\$(MSBuildProjectName)\</OutDir>
</PropertyGroup> </PropertyGroup>
</When> </When>
<When Condition="'$(RoslynProjectType)' == 'CompilerGeneratorTool'"> <When Condition="'$(RoslynProjectType)' == 'CompilerGeneratorTool'">
...@@ -51,7 +48,14 @@ ...@@ -51,7 +48,14 @@
<OutDir>$(OutDir)Ignore\$(MSBuildProjectName)\</OutDir> <OutDir>$(OutDir)Ignore\$(MSBuildProjectName)\</OutDir>
</PropertyGroup> </PropertyGroup>
</When> </When>
<When Condition="'$(RoslynProjectType)' == 'Custom'"> <When Condition="'$(RoslynProjectType)' == 'DeploymentTest'">
<!-- Need to include PDB in deployment directory for debugging, and in some cases correctness when
stack traces are involved -->
<PropertyGroup>
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
</PropertyGroup>
</When>
<When Condition="'$(RoslynProjectType)' == 'Custom' or $(RoslynProjectType) == 'DeploymentTest'">
<!-- Do nothing --> <!-- Do nothing -->
</When> </When>
<When Condition="'$(RoslynProjectType)' == '' and '$(OutputType)' == 'Library'"> <When Condition="'$(RoslynProjectType)' == '' and '$(OutputType)' == 'Library'">
......
build/Targets/Settings.props
浏览文件 @ 7fe93934
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
<CompilerGeneratorToolsDir>$(OutDir)CompilerGeneratorTools\</CompilerGeneratorToolsDir> <CompilerGeneratorToolsDir>$(OutDir)CompilerGeneratorTools\</CompilerGeneratorToolsDir>
<MSBuildAssemblyNameFragment>Core</MSBuildAssemblyNameFragment> <MSBuildAssemblyNameFragment>Core</MSBuildAssemblyNameFragment>
<!-- To copy .dll.config and .exe.config files of the referenced projects to the output dir
(see https://github.com/Microsoft/msbuild/issues/1307) -->
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.dll.config;.exe.config</AllowedReferenceRelatedFileExtensions>
</PropertyGroup> </PropertyGroup>
<!-- Windows specific settings --> <!-- Windows specific settings -->
......
src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj
浏览文件 @ 7fe93934
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion> <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<NoStdLib>true</NoStdLib> <NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RoslynProjectType>UnitTest</RoslynProjectType> <RoslynProjectType>UnitTestPortable</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Build Items"> <ItemGroup Label="Build Items">
<SyntaxTestDefinition Include="..\..\Portable\Syntax\Syntax.xml" /> <SyntaxTestDefinition Include="..\..\Portable\Syntax\Syntax.xml" />
......
src/EditorFeatures/CSharpTest/project.json
浏览文件 @ 7fe93934
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
"dependencies": { "dependencies": {
"Microsoft.VisualStudio.Composition": "14.2.19-pre", "Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407", "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": {
"version": "2.0.0-beta5-60820-04",
"suppressParent": "all"
},
"Microsoft.VisualStudio.Language.Intellisense": { "Microsoft.VisualStudio.Language.Intellisense": {
"version": "14.3.25407", "version": "14.3.25407",
"suppressParent": "all" "suppressParent": "all"
......
src/EditorFeatures/Test/project.json
浏览文件 @ 7fe93934
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
"BasicUndo": "0.9.3", "BasicUndo": "0.9.3",
"Microsoft.VisualStudio.Composition": "14.2.19-pre", "Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407", "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": {
"version": "2.0.0-beta5-60820-04",
"suppressParent": "all"
},
"Microsoft.VisualStudio.Language.Intellisense": { "Microsoft.VisualStudio.Language.Intellisense": {
"version": "14.3.25407", "version": "14.3.25407",
"suppressParent": "all" "suppressParent": "all"
......
src/EditorFeatures/Test2/project.json
浏览文件 @ 7fe93934
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"dependencies": { "dependencies": {
"Microsoft.VisualStudio.Composition": "14.2.19-pre", "Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407", "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": { "Microsoft.VisualStudio.InteractiveWindow": {
"version": "2.0.0-beta5-60820-04", "version": "2.0.0-beta5-60820-04",
"suppressParent": "all" "suppressParent": "all"
......
src/EditorFeatures/VisualBasicTest/project.json
浏览文件 @ 7fe93934
{ {
"dependencies": { "dependencies": {
"Microsoft.VisualStudio.Composition": "14.2.19-pre", "Microsoft.VisualStudio.Composition": "14.2.19-pre",
"BasicUndo": "0.9.3",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407", "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.InteractiveWindow": {
"version": "2.0.0-beta5-60820-04",
"suppressParent": "all"
},
"Microsoft.VisualStudio.Language.Intellisense": { "Microsoft.VisualStudio.Language.Intellisense": {
"version": "14.3.25407", "version": "14.3.25407",
"suppressParent": "all" "suppressParent": "all"
......
src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj
浏览文件 @ 7fe93934
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CSharpAnalyzers.Test</RootNamespace> <RootNamespace>CSharpAnalyzers.Test</RootNamespace>
<AssemblyName>CSharpAnalyzers.UnitTests</AssemblyName> <AssemblyName>CSharpAnalyzers.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<RoslynProjectType>UnitTest</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj
浏览文件 @ 7fe93934
...@@ -37,6 +37,22 @@ ...@@ -37,6 +37,22 @@
<Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project> <Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project>
<Name>Microsoft.CodeAnalysis.EditorFeatures</Name> <Name>Microsoft.CodeAnalysis.EditorFeatures</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj">
<Project>{ef986d9b-8cfc-4ecb-9729-e260a1f84aff}</Project>
<Name>VisualStudioEditor</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
<Project>{18f5fbb8-7570-4412-8cc7-0a86ff13b7ba}</Project>
<Name>TextEditorFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj"> <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
<Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project> <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
<Name>UnitTestFramework</Name> <Name>UnitTestFramework</Name>
...@@ -46,8 +62,10 @@ ...@@ -46,8 +62,10 @@
<Name>ConvertToConditionalCS</Name> <Name>ConvertToConditionalCS</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
......
src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj
浏览文件 @ 7fe93934
...@@ -33,6 +33,26 @@ ...@@ -33,6 +33,26 @@
<Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project> <Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>
<Name>Microsoft.CodeAnalysis.CSharp.Workspaces</Name> <Name>Microsoft.CodeAnalysis.CSharp.Workspaces</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Dependencies\VisualStudioText\VisualStudioText.csproj">
<Project>{c25768b3-2fe1-4d6d-8c17-a6acd56f8389}</Project>
<Name>VisualStudioText</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Dependencies\VisualStudio\VisualStudio.csproj">
<Project>{8da861d8-0cce-4334-b6c0-01a846c881ec}</Project>
<Name>VisualStudio</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
<Name>BasicWorkspace</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj"> <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
<Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project> <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
<Name>UnitTestFramework</Name> <Name>UnitTestFramework</Name>
...@@ -42,8 +62,10 @@ ...@@ -42,8 +62,10 @@
<Name>ImplementNotifyPropertyChangedCS</Name> <Name>ImplementNotifyPropertyChangedCS</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System" /> <Reference Include="System" />
......
src/Samples/Samples.sln
浏览文件 @ 7fe93934
此差异已折叠。
src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/BasicAnalyzers.Test.vbproj
浏览文件 @ 7fe93934
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}</ProjectGuid> <ProjectGuid>{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AssemblyName>BasicAnalyzers.UnitTests</AssemblyName> <AssemblyName>BasicAnalyzers.Tests</AssemblyName>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<RoslynProjectType>UnitTest</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj
浏览文件 @ 7fe93934
...@@ -14,6 +14,34 @@ ...@@ -14,6 +14,34 @@
<RoslynProjectType>UnitTest</RoslynProjectType> <RoslynProjectType>UnitTest</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<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="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
<Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
<Name>TestUtilities.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
<Name>BasicWorkspace</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj"> <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
<Project>{D571F126-F0B6-487E-BB79-E91EAEE46F4F}</Project> <Project>{D571F126-F0B6-487E-BB79-E91EAEE46F4F}</Project>
<Name>UnitTestFramework</Name> <Name>UnitTestFramework</Name>
......
src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj
浏览文件 @ 7fe93934
...@@ -32,6 +32,38 @@ ...@@ -32,6 +32,38 @@
<Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project> <Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project>
<Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name> <Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name>
</ProjectReference> </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="..\..\..\..\Dependencies\VisualStudioText\VisualStudioText.csproj">
<Project>{c25768b3-2fe1-4d6d-8c17-a6acd56f8389}</Project>
<Name>VisualStudioText</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Dependencies\VisualStudio\VisualStudio.csproj">
<Project>{8da861d8-0cce-4334-b6c0-01a846c881ec}</Project>
<Name>VisualStudio</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
<Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
<Name>TestUtilities.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
<Name>BasicWorkspace</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj"> <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
<Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project> <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
<Name>UnitTestFramework</Name> <Name>UnitTestFramework</Name>
...@@ -41,8 +73,10 @@ ...@@ -41,8 +73,10 @@
<Name>ImplementNotifyPropertyChangedVB</Name> <Name>ImplementNotifyPropertyChangedVB</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj
浏览文件 @ 7fe93934
...@@ -38,6 +38,42 @@ ...@@ -38,6 +38,42 @@
<Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project> <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
<Name>UnitTestFramework</Name> <Name>UnitTestFramework</Name>
</ProjectReference> </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="..\..\..\..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj">
<Project>{ef986d9b-8cfc-4ecb-9729-e260a1f84aff}</Project>
<Name>VisualStudioEditor</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
<Project>{18f5fbb8-7570-4412-8cc7-0a86ff13b7ba}</Project>
<Name>TextEditorFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
<Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
<Name>TestUtilities.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
<Name>BasicWorkspace</Name>
</ProjectReference>
<ProjectReference Include="..\Impl\RemoveByValVB.vbproj"> <ProjectReference Include="..\Impl\RemoveByValVB.vbproj">
<Project>{4900921D-C548-4FBB-9681-BAF88E09DB3C}</Project> <Project>{4900921D-C548-4FBB-9681-BAF88E09DB3C}</Project>
<Name>RemoveByValVB</Name> <Name>RemoveByValVB</Name>
......
src/Scripting/CSharpTest/CSharpScriptingTest.csproj
浏览文件 @ 7fe93934
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<TargetFrameworkProfile></TargetFrameworkProfile> <TargetFrameworkProfile></TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<RoslynProjectType>UnitTest</RoslynProjectType> <RoslynProjectType>UnitTestDesktop</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj"> <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests" /> <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <Content Include="app.config" />
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
src/Scripting/CSharpTest/InteractiveSessionTests.cs
浏览文件 @ 7fe93934
...@@ -41,7 +41,7 @@ public class InteractiveSessionTests : TestBase ...@@ -41,7 +41,7 @@ public class InteractiveSessionTests : TestBase
#region Namespaces, Types #region Namespaces, Types
[Fact] [Fact]
public void CompilationChain_NestedTypesClass() public async Task CompilationChain_NestedTypesClass()
{ {
var script = CSharpScript.Create(@" var script = CSharpScript.Create(@"
static string outerStr = null; static string outerStr = null;
...@@ -60,13 +60,13 @@ class InnerClass ...@@ -60,13 +60,13 @@ class InnerClass
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture)) using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{ {
script.RunAsync().Wait(); await script.RunAsync();
Assert.Equal("test", redirect.Output.Trim()); Assert.Equal("test", redirect.Output.Trim());
} }
} }
[Fact] [Fact]
public void CompilationChain_NestedTypesStruct() public async Task CompilationChain_NestedTypesStruct()
{ {
var script = CSharpScript.Create(@" var script = CSharpScript.Create(@"
static string outerStr = null; static string outerStr = null;
...@@ -85,13 +85,13 @@ struct InnerStruct ...@@ -85,13 +85,13 @@ struct InnerStruct
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture)) using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{ {
script.RunAsync().Wait(); await script.RunAsync();
Assert.Equal("test", redirect.Output.Trim()); Assert.Equal("test", redirect.Output.Trim());
} }
} }
[Fact] [Fact]
public void CompilationChain_InterfaceTypes() public async Task CompilationChain_InterfaceTypes()
{ {
var script = CSharpScript.Create(@" var script = CSharpScript.Create(@"
interface I1 { int Goo();} interface I1 { int Goo();}
...@@ -104,7 +104,7 @@ class InnerClass : I1 ...@@ -104,7 +104,7 @@ class InnerClass : I1
iC.Goo() iC.Goo()
"); ");
Assert.Equal(1, script.EvaluateAsync().Result); Assert.Equal(1, await script.EvaluateAsync());
} }
[Fact] [Fact]
......
src/Scripting/CSharpTest/ScriptTests.cs
浏览文件 @ 7fe93934
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
using Roslyn.Utilities; using Roslyn.Utilities;
using Xunit; using Xunit;
using System.IO; using System.IO;
using System.Globalization;
namespace Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests namespace Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests
{ {
...@@ -91,10 +92,13 @@ public async Task TestRunScriptWithSpecifiedReturnType() ...@@ -91,10 +92,13 @@ public async Task TestRunScriptWithSpecifiedReturnType()
[Fact] [Fact]
public async Task TestRunVoidScript() public async Task TestRunVoidScript()
{
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{ {
var state = await CSharpScript.RunAsync("System.Console.WriteLine(0);"); var state = await CSharpScript.RunAsync("System.Console.WriteLine(0);");
Assert.Null(state.ReturnValue); Assert.Null(state.ReturnValue);
} }
}
[WorkItem(5279, "https://github.com/dotnet/roslyn/issues/5279")] [WorkItem(5279, "https://github.com/dotnet/roslyn/issues/5279")]
[Fact] [Fact]
...@@ -331,11 +335,14 @@ public async Task ReturnIntAsObject() ...@@ -331,11 +335,14 @@ public async Task ReturnIntAsObject()
[Fact] [Fact]
public async Task NoReturn() public async Task NoReturn()
{
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{ {
var script = CSharpScript.Create<object>("System.Console.WriteLine();"); var script = CSharpScript.Create<object>("System.Console.WriteLine();");
var result = await script.EvaluateAsync(); var result = await script.EvaluateAsync();
Assert.Null(result); Assert.Null(result);
} }
}
[Fact] [Fact]
public async Task ReturnAwait() public async Task ReturnAwait()
...@@ -378,9 +385,13 @@ public async Task ReturnInNestedScopeWithTrailingVoidExpression() ...@@ -378,9 +385,13 @@ public async Task ReturnInNestedScopeWithTrailingVoidExpression()
return 1; return 1;
} }
System.Console.WriteLine();"); System.Console.WriteLine();");
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{
result = await script.EvaluateAsync(); result = await script.EvaluateAsync();
Assert.Equal(1, result); Assert.Equal(1, result);
} }
}
[Fact] [Fact]
public async Task ReturnInNestedScopeWithTrailingVoidExpressionAsInt() public async Task ReturnInNestedScopeWithTrailingVoidExpressionAsInt()
...@@ -402,9 +413,13 @@ public async Task ReturnInNestedScopeWithTrailingVoidExpressionAsInt() ...@@ -402,9 +413,13 @@ public async Task ReturnInNestedScopeWithTrailingVoidExpressionAsInt()
return 1; return 1;
} }
System.Console.WriteLine()"); System.Console.WriteLine()");
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{
result = await script.EvaluateAsync(); result = await script.EvaluateAsync();
Assert.Equal(0, result); Assert.Equal(0, result);
} }
}
[Fact] [Fact]
public async Task ReturnIntWithTrailingDoubleExpression() public async Task ReturnIntWithTrailingDoubleExpression()
...@@ -513,6 +528,8 @@ public async Task ReturnInLoadedFileTrailingExpression() ...@@ -513,6 +528,8 @@ public async Task ReturnInLoadedFileTrailingExpression()
[Fact] [Fact]
public async Task ReturnInLoadedFileTrailingVoidExpression() public async Task ReturnInLoadedFileTrailingVoidExpression()
{
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{ {
var resolver = TestSourceReferenceResolver.Create( var resolver = TestSourceReferenceResolver.Create(
KeyValuePair.Create("a.csx", @" KeyValuePair.Create("a.csx", @"
...@@ -533,6 +550,7 @@ public async Task ReturnInLoadedFileTrailingVoidExpression() ...@@ -533,6 +550,7 @@ public async Task ReturnInLoadedFileTrailingVoidExpression()
result = await script.EvaluateAsync(); result = await script.EvaluateAsync();
Assert.Equal(2, result); Assert.Equal(2, result);
} }
}
[Fact] [Fact]
public async Task MultipleLoadedFilesWithTrailingExpression() public async Task MultipleLoadedFilesWithTrailingExpression()
...@@ -676,8 +694,11 @@ public async Task StreamWithOffset() ...@@ -676,8 +694,11 @@ public async Task StreamWithOffset()
var resolver = new StreamOffsetResolver(); var resolver = new StreamOffsetResolver();
var options = ScriptOptions.Default.WithSourceResolver(resolver); var options = ScriptOptions.Default.WithSourceResolver(resolver);
var script = CSharpScript.Create(@"#load ""a.csx""", options); var script = CSharpScript.Create(@"#load ""a.csx""", options);
using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
{
await script.EvaluateAsync(); await script.EvaluateAsync();
} }
}
private class StreamOffsetResolver : SourceReferenceResolver private class StreamOffsetResolver : SourceReferenceResolver
{ {
......
src/Scripting/CSharpTest/project.json
浏览文件 @ 7fe93934
{ {
"dependencies": { "dependencies": {
"System.AppContext": "4.1.0" "System.AppContext": "4.1.0",
"System.ValueTuple": "4.0.1-beta-24425-02"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj
浏览文件 @ 7fe93934
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project> <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name> <Name>BasicCodeAnalysis</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj"> <ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project> <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name> <Name>TestUtilities</Name>
......
src/Scripting/CoreTest/ScriptingTest.csproj
浏览文件 @ 7fe93934
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<TargetFrameworkProfile></TargetFrameworkProfile> <TargetFrameworkProfile></TargetFrameworkProfile>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<RoslynProjectType>UnitTest</RoslynProjectType> <RoslynProjectType>UnitTestPortable</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj"> <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
......
src/Scripting/CoreTestUtilities/RedirectedOutput.cs
浏览文件 @ 7fe93934
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
namespace Microsoft.CodeAnalysis.Scripting namespace Microsoft.CodeAnalysis.Scripting
{ {
public struct OutputRedirect : IDisposable public sealed class OutputRedirect : IDisposable
{ {
private readonly TextWriter _oldOut; private readonly TextWriter _oldOut;
private readonly StringWriter _newOut; private readonly StringWriter _newOut;
......
src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
浏览文件 @ 7fe93934
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion> <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids> <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
<RoslynProjectType>UnitTest</RoslynProjectType> <RoslynProjectType>UnitTestDesktop</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
......
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
浏览文件 @ 7fe93934
...@@ -830,6 +830,7 @@ Public Class BuildDevDivInsertionFiles ...@@ -830,6 +830,7 @@ Public Class BuildDevDivInsertionFiles
add("Vsix\VisualStudioSetup\System.Composition.Convention.dll") add("Vsix\VisualStudioSetup\System.Composition.Convention.dll")
add("Vsix\VisualStudioSetup\System.Composition.Hosting.dll") add("Vsix\VisualStudioSetup\System.Composition.Hosting.dll")
add("Vsix\VisualStudioSetup\System.Composition.TypedParts.dll") add("Vsix\VisualStudioSetup\System.Composition.TypedParts.dll")
add("Vsix\VisualStudioSetup.Next\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll")
add("Dlls\BasicExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.vsdconfig") add("Dlls\BasicExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.vsdconfig")
add("Dlls\BasicResultProvider.Portable\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig") add("Dlls\BasicResultProvider.Portable\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig")
add("Dlls\CSharpExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig") add("Dlls\CSharpExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig")
...@@ -847,15 +848,14 @@ Public Class BuildDevDivInsertionFiles ...@@ -847,15 +848,14 @@ Public Class BuildDevDivInsertionFiles
add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll") add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll")
add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll.config") add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll.config")
add("Dlls\TestUtilities.FX45\Roslyn.Test.Utilities.FX45.dll") add("Dlls\TestUtilities.FX45\Roslyn.Test.Utilities.FX45.dll")
add("UnitTests\Current\BasicUndo.dll") add("UnitTests\EditorServicesTest\BasicUndo.dll")
add("UnitTests\Current\Esent.Interop.dll") add("UnitTests\EditorServicesTest\Esent.Interop.dll")
add("UnitTests\Current\Moq.dll") add("UnitTests\EditorServicesTest\Moq.dll")
add("UnitTests\Current\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll") add("UnitTests\EditorServicesTest\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll")
add("UnitTests\Current\Microsoft.DiaSymReader.dll") add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.dll")
add("UnitTests\Current\Microsoft.DiaSymReader.Native.amd64.dll") add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.amd64.dll")
add("UnitTests\Current\Microsoft.DiaSymReader.Native.x86.dll") add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.x86.dll")
add("UnitTests\Current\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll") add("UnitTests\EditorServicesTest\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll")
add("Vsix\VisualStudioSetup.Next\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll")
add("Dlls\Concord\Microsoft.VisualStudio.Debugger.Engine.dll") add("Dlls\Concord\Microsoft.VisualStudio.Debugger.Engine.dll")
add("Vsix\VisualStudioTestSetup\Microsoft.Diagnostics.Runtime.dll") add("Vsix\VisualStudioTestSetup\Microsoft.Diagnostics.Runtime.dll")
add("Vsix\VisualStudioTestSetup\Roslyn.VisualStudio.Test.Setup.vsix") add("Vsix\VisualStudioTestSetup\Roslyn.VisualStudio.Test.Setup.vsix")
......
src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
浏览文件 @ 7fe93934
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<RuntimeIndentifier>x64</RuntimeIndentifier> <RuntimeIndentifier>x64</RuntimeIndentifier>
<NuGetRuntimeIdentifier>$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)</NuGetRuntimeIdentifier> <NuGetRuntimeIdentifier>$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)</NuGetRuntimeIdentifier>
<NoStdLib>true</NoStdLib> <NoStdLib>true</NoStdLib>
<RoslynProjectType>Custom</RoslynProjectType> <RoslynProjectType>DeploymentTest</RoslynProjectType>
<OutDir>$(OutDir)CoreClrTest</OutDir> <OutDir>$(OutDir)CoreClrTest</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
...@@ -29,18 +29,62 @@ ...@@ -29,18 +29,62 @@
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<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\CSharp\Test\Syntax\CSharpCompilerSyntaxTest.csproj"> <ProjectReference Include="..\..\Compilers\CSharp\Test\Syntax\CSharpCompilerSyntaxTest.csproj">
<Project>{50d26304-0961-4a51-abf6-6cad1a56d202}</Project> <Project>{50d26304-0961-4a51-abf6-6cad1a56d202}</Project>
<Name>CSharpCompilerSyntaxTest</Name> <Name>CSharpCompilerSyntaxTest</Name>
</ProjectReference> </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\CSharp\CSharpCompilerTestUtilities.csproj">
<Project>{4371944a-d3ba-4b5b-8285-82e5ffc6d1f9}</Project>
<Name>CSharpCompilerTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\CoreTestUtilities\ScriptingTestUtilities.csproj">
<Project>{21a01c2d-2501-4619-8144-48977dd22d9c}</Project>
<Name>ScriptingTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj"> <ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj">
<Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project> <Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project>
<Name>ScriptingTest</Name> <Name>ScriptingTest</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
<Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\CSharp\CSharpScripting.csproj">
<Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
<Name>CSharpScripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\VisualBasic\BasicScripting.vbproj">
<Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
<Name>BasicScripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Tools\CommonNetCoreReferences\CommonNetCoreReferences.csproj"> <ProjectReference Include="..\..\Tools\CommonNetCoreReferences\CommonNetCoreReferences.csproj">
<Project>{b5a6057a-eb4c-49fb-987d-943137e72e47}</Project> <Project>{b5a6057a-eb4c-49fb-987d-943137e72e47}</Project>
<Name>CommonNetCoreReferences</Name> <Name>CommonNetCoreReferences</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" /> <Import Project="..\..\..\build\Targets\Imports.targets" />
</Project> </Project>
src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj
浏览文件 @ 7fe93934
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<TargetFrameworkIdentifier /> <TargetFrameworkIdentifier />
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<CopyNuGetImplementations>true</CopyNuGetImplementations> <CopyNuGetImplementations>true</CopyNuGetImplementations>
<RoslynProjectType>Deployment</RoslynProjectType> <RoslynProjectType>DeploymentTest</RoslynProjectType>
<OutDir>$(OutDir)UnitTests\Portable\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
...@@ -21,18 +22,62 @@ ...@@ -21,18 +22,62 @@
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<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\CSharp\Test\Syntax\CSharpCompilerSyntaxTest.csproj">
<Project>{50d26304-0961-4a51-abf6-6cad1a56d202}</Project>
<Name>CSharpCompilerSyntaxTest</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\CSharp\CSharpCompilerTestUtilities.csproj">
<Project>{4371944a-d3ba-4b5b-8285-82e5ffc6d1f9}</Project>
<Name>CSharpCompilerTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\CoreTestUtilities\ScriptingTestUtilities.csproj">
<Project>{21a01c2d-2501-4619-8144-48977dd22d9c}</Project>
<Name>ScriptingTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj"> <ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj">
<Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project> <Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project>
<Name>ScriptingTest</Name> <Name>ScriptingTest</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
<Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\CSharpTest\CSharpScriptingTest.csproj"> <ProjectReference Include="..\..\Scripting\CSharpTest\CSharpScriptingTest.csproj">
<Project>{2dae4406-7a89-4b5f-95c3-bc5422ce47ce}</Project> <Project>{2dae4406-7a89-4b5f-95c3-bc5422ce47ce}</Project>
<Name>CSharpScriptingTest</Name> <Name>CSharpScriptingTest</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Scripting\CSharp\CSharpScripting.csproj">
<Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
<Name>CSharpScripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\Scripting\VisualBasicTest\BasicScriptingTest.vbproj"> <ProjectReference Include="..\..\Scripting\VisualBasicTest\BasicScriptingTest.vbproj">
<Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project> <Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
<Name>BasicScriptingTest</Name> <Name>BasicScriptingTest</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Scripting\VisualBasic\BasicScripting.vbproj">
<Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
<Name>BasicScripting</Name>
</ProjectReference>
<ProjectReference Include="..\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Utilities\Portable\TestUtilities.csproj"> <ProjectReference Include="..\Utilities\Portable\TestUtilities.csproj">
<Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project> <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
<Name>TestUtilities</Name> <Name>TestUtilities</Name>
......
src/Tools/BuildBoss/ProjectCheckerUtil.cs
浏览文件 @ 7fe93934
...@@ -49,6 +49,8 @@ internal bool CheckAll(TextWriter textWriter) ...@@ -49,6 +49,8 @@ internal bool CheckAll(TextWriter textWriter)
allGood &= CheckProjectReferences(textWriter); allGood &= CheckProjectReferences(textWriter);
} }
allGood &= CheckTestDeploymentProjects(textWriter);
return allGood; return allGood;
} }
...@@ -295,5 +297,60 @@ private bool IsUnitTestCorrectlySpecified(TextWriter textWriter, RoslynProjectDa ...@@ -295,5 +297,60 @@ private bool IsUnitTestCorrectlySpecified(TextWriter textWriter, RoslynProjectDa
return true; return true;
} }
/// <summary>
/// Verify our test deployment projects properly reference everything which is labeled as a portable
/// unit test. This ensurse they are properly deployed during build and test.
/// </summary>
private bool CheckTestDeploymentProjects(TextWriter textWriter)
{
var fileName = Path.GetFileNameWithoutExtension(_data.FileName);
var isDesktop = fileName == "DeployDesktopTestRuntime";
var isCoreClr = fileName == "DeployCoreClrTestRuntime";
if (!isDesktop && !isCoreClr)
{
return true;
}
var allGood = true;
var data = _projectUtil.GetRoslynProjectData();
if (data.DeclaredKind != RoslynProjectKind.DeploymentTest)
{
textWriter.WriteLine("Test deployment project must be marked as <RoslynProjectKind>DeploymentTest</RoslynProjectKind>");
allGood = false;
}
var set = new HashSet<ProjectKey>(_projectUtil.GetDeclaredProjectReferences());
foreach (var projectData in _solutionMap.Values)
{
var rosData = projectData.ProjectUtil.TryGetRoslynProjectData();
if (rosData == null)
{
continue;
}
var kind = rosData.Value.DeclaredKind;
bool include;
switch (kind)
{
case RoslynProjectKind.UnitTestPortable:
include = true;
break;
case RoslynProjectKind.UnitTestDesktop:
include = isDesktop;
break;
default:
include = false;
break;
}
if (include && !set.Contains(projectData.Key))
{
textWriter.WriteLine($"Portable unit test {projectData.FileName} must be referenced");
allGood = false;
}
}
return allGood;
}
} }
} }
src/Tools/BuildBoss/RoslynProjectData.cs
浏览文件 @ 7fe93934
...@@ -13,11 +13,12 @@ internal enum RoslynProjectKind ...@@ -13,11 +13,12 @@ internal enum RoslynProjectKind
Exe, Exe,
ExeCoreClr, ExeCoreClr,
UnitTest, UnitTest,
UnitTestFixed, UnitTestDesktop,
UnitTestNext, UnitTestPortable,
CompilerGeneratorTool, CompilerGeneratorTool,
DeploymentCompilerGeneratorTools, DeploymentCompilerGeneratorTools,
Deployment, Deployment,
DeploymentTest,
Vsix, Vsix,
Depedency, Depedency,
Custom Custom
...@@ -35,18 +36,20 @@ internal static class RoslynProjectKindUtil ...@@ -35,18 +36,20 @@ internal static class RoslynProjectKindUtil
{ {
case "ExeCoreClr": case "ExeCoreClr":
return RoslynProjectKind.Exe; return RoslynProjectKind.Exe;
case "UnitTestFixed": case "UnitTestPortable":
return RoslynProjectKind.UnitTestFixed; return RoslynProjectKind.UnitTestPortable;
case "UnitTestDesktop":
return RoslynProjectKind.UnitTestDesktop;
case "UnitTest": case "UnitTest":
return RoslynProjectKind.UnitTest; return RoslynProjectKind.UnitTest;
case "UnitTestNext":
return RoslynProjectKind.UnitTestNext;
case "CompilerGeneratorTool": case "CompilerGeneratorTool":
return RoslynProjectKind.CompilerGeneratorTool; return RoslynProjectKind.CompilerGeneratorTool;
case "DeploymentCompilerGeneratorTools": case "DeploymentCompilerGeneratorTools":
return RoslynProjectKind.DeploymentCompilerGeneratorTools; return RoslynProjectKind.DeploymentCompilerGeneratorTools;
case "Deployment": case "Deployment":
return RoslynProjectKind.Deployment; return RoslynProjectKind.Deployment;
case "DeploymentTest":
return RoslynProjectKind.DeploymentTest;
case "Vsix": case "Vsix":
return RoslynProjectKind.Vsix; return RoslynProjectKind.Vsix;
case "Dependency": case "Dependency":
...@@ -62,15 +65,16 @@ internal static bool IsAnyUnitTest(RoslynProjectKind kind) ...@@ -62,15 +65,16 @@ internal static bool IsAnyUnitTest(RoslynProjectKind kind)
{ {
return return
kind == RoslynProjectKind.UnitTest || kind == RoslynProjectKind.UnitTest ||
kind == RoslynProjectKind.UnitTestFixed || kind == RoslynProjectKind.UnitTestDesktop ||
kind == RoslynProjectKind.UnitTestNext; kind == RoslynProjectKind.UnitTestPortable;
} }
internal static bool IsDeploymentProject(RoslynProjectKind kind) internal static bool IsDeploymentProject(RoslynProjectKind kind)
{ {
return return
kind == RoslynProjectKind.Exe || kind == RoslynProjectKind.Exe ||
kind == RoslynProjectKind.UnitTestFixed; kind == RoslynProjectKind.DeploymentTest ||
IsAnyUnitTest(kind);
} }
} }
......
src/Tools/MicroBuild/RunSignTool.proj
浏览文件 @ 7fe93934
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Settings.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Settings.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Dependencies.props" />
<Target Name="Build"> <Target Name="Build">
<Exec Command="$(NuGetPackageRoot)\RoslynTools.Microsoft.SignTool\$(RoslynToolsMicrosoftSignToolVersion)\tools\SignTool.exe $(SignRoslynArgs) &quot;$(OutDir.TrimEnd('\'))&quot;" WorkingDirectory="$(ProjectDir)" /> <Exec Command="$(NuGetPackageRoot)\RoslynTools.Microsoft.SignTool\$(RoslynToolsMicrosoftSignToolVersion)\tools\SignTool.exe $(SignRoslynArgs) &quot;$(OutDir.TrimEnd('\'))&quot;" WorkingDirectory="$(ProjectDir)" />
......
src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj
浏览文件 @ 7fe93934
...@@ -14,10 +14,38 @@ ...@@ -14,10 +14,38 @@
<RoslynProjectType>UnitTest</RoslynProjectType> <RoslynProjectType>UnitTest</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<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="..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
<Name>BasicCodeAnalysis</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj">
<Project>{ef986d9b-8cfc-4ecb-9729-e260a1f84aff}</Project>
<Name>VisualStudioEditor</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Dependencies\VisualStudio\VisualStudio.csproj">
<Project>{8da861d8-0cce-4334-b6c0-01a846c881ec}</Project>
<Name>VisualStudio</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\EditorFeatures\TestUtilities2\ServicesTestUtilities2.vbproj"> <ProjectReference Include="..\..\..\EditorFeatures\TestUtilities2\ServicesTestUtilities2.vbproj">
<Project>{3dfb4701-e3d6-4435-9f70-a6e35822c4f2}</Project> <Project>{3dfb4701-e3d6-4435-9f70-a6e35822c4f2}</Project>
<Name>ServicesTestUtilities2</Name> <Name>ServicesTestUtilities2</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\EditorFeatures\VisualBasic\BasicEditorFeatures.vbproj">
<Project>{49bfae50-1bce-48ae-bc89-78b7d90a3ecd}</Project>
<Name>BasicEditorFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Features\VisualBasic\Portable\BasicFeatures.vbproj">
<Project>{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}</Project>
<Name>BasicFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Interactive\EditorFeatures\Core\InteractiveEditorFeatures.csproj"> <ProjectReference Include="..\..\..\Interactive\EditorFeatures\Core\InteractiveEditorFeatures.csproj">
<Project>{92412d1a-0f23-45b5-b196-58839c524917}</Project> <Project>{92412d1a-0f23-45b5-b196-58839c524917}</Project>
<Name>InteractiveEditorFeatures</Name> <Name>InteractiveEditorFeatures</Name>
...@@ -26,10 +54,42 @@ ...@@ -26,10 +54,42 @@
<Project>{fe2cbea6-d121-4faa-aa8b-fc9900bf8c83}</Project> <Project>{fe2cbea6-d121-4faa-aa8b-fc9900bf8c83}</Project>
<Name>CSharpInteractiveEditorFeatures</Name> <Name>CSharpInteractiveEditorFeatures</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Interactive\EditorFeatures\VisualBasic\BasicInteractiveEditorFeatures.vbproj">
<Project>{849e516a-595f-474b-adb4-e099f921cedf}</Project>
<Name>BasicInteractiveEditorFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Interactive\Features\InteractiveFeatures.csproj">
<Project>{8e2a252e-a140-45a6-a81a-2652996ea589}</Project>
<Name>InteractiveFeatures</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Interactive\Host\InteractiveHost.csproj">
<Project>{eba4dfa1-6ded-418f-a485-a3b608978906}</Project>
<Name>InteractiveHost</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Scripting\Core\Scripting.csproj">
<Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
<Name>Scripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Scripting\CSharp\CSharpScripting.csproj">
<Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
<Name>CSharpScripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Scripting\VisualBasic\BasicScripting.vbproj">
<Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
<Name>BasicScripting</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj"> <ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project> <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name> <Name>TestUtilities.FX45</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\CoreTestUtilities\WorkspacesTestUtilities.csproj">
<Project>{3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e}</Project>
<Name>WorkspacesTestUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj"> <ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project> <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name> <Name>Workspaces.Desktop</Name>
...@@ -66,10 +126,30 @@ ...@@ -66,10 +126,30 @@
<Project>{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}</Project> <Project>{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}</Project>
<Name>ServicesVisualStudio</Name> <Name>ServicesVisualStudio</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\Remote\Core\RemoteWorkspaces.csproj">
<Project>{f822f72a-cc87-4e31-b57d-853f65cbebf3}</Project>
<Name>RemoteWorkspaces</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\Remote\ServiceHub\ServiceHub.csproj">
<Project>{80fddd00-9393-47f7-8baf-7e87ce011068}</Project>
<Name>ServiceHub</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
<Name>BasicWorkspace</Name>
</ProjectReference>
<ProjectReference Include="..\..\Core\SolutionExplorerShim\SolutionExplorerShim.csproj">
<Project>{7be3deeb-87f8-4e15-9c21-4f94b0b1c2d6}</Project>
<Name>SolutionExplorerShim</Name>
</ProjectReference>
<ProjectReference Include="..\..\TestUtilities2\VisualStudioTestUtilities2.vbproj"> <ProjectReference Include="..\..\TestUtilities2\VisualStudioTestUtilities2.vbproj">
<Project>{69f853e5-bd04-4842-984f-fc68cc51f402}</Project> <Project>{69f853e5-bd04-4842-984f-fc68cc51f402}</Project>
<Name>VisualStudioTestUtilities2</Name> <Name>VisualStudioTestUtilities2</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\VisualBasic\Impl\BasicVisualStudio.vbproj">
<Project>{d49439d7-56d2-450f-a4f0-74cb95d620e6}</Project>
<Name>BasicVisualStudio</Name>
</ProjectReference>
<ProjectReference Include="..\Impl\CSharpVisualStudio.csproj"> <ProjectReference Include="..\Impl\CSharpVisualStudio.csproj">
<Project>{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}</Project> <Project>{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}</Project>
<Name>CSharpVisualStudio</Name> <Name>CSharpVisualStudio</Name>
...@@ -85,17 +165,14 @@ ...@@ -85,17 +165,14 @@
<ProjectReference Include="..\..\..\Features\CSharp\Portable\CSharpFeatures.csproj"> <ProjectReference Include="..\..\..\Features\CSharp\Portable\CSharpFeatures.csproj">
<Project>{3973B09A-4FBF-44A5-8359-3D22CEB71F71}</Project> <Project>{3973B09A-4FBF-44A5-8359-3D22CEB71F71}</Project>
<Name>CSharpFeatures</Name> <Name>CSharpFeatures</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj"> <ProjectReference Include="..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
<Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project> <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
<Name>TextEditorFeatures</Name> <Name>TextEditorFeatures</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Features\Core\Portable\Features.csproj"> <ProjectReference Include="..\..\..\Features\Core\Portable\Features.csproj">
<Project>{EDC68A0E-C68D-4A74-91B7-BF38EC909888}</Project> <Project>{EDC68A0E-C68D-4A74-91B7-BF38EC909888}</Project>
<Name>Features</Name> <Name>Features</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
......
src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj
浏览文件 @ 7fe93934
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects> <ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects>
<RoslynProjectType>UnitTestNext</RoslynProjectType> <RoslynProjectType>UnitTest</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj"> <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
......
src/VisualStudio/Core/Test/project.json
浏览文件 @ 7fe93934
{ {
"dependencies": { "dependencies": {
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": {
"version": "2.0.0-beta5-60820-04",
"suppressParent": "all"
},
"Microsoft.VisualStudio.RemoteControl": { "Microsoft.VisualStudio.RemoteControl": {
"version": "14.0.249-master2E2DC10C", "version": "14.0.249-master2E2DC10C",
"suppressParent": "all" "suppressParent": "all"
......
src/VisualStudio/IntegrationTests/VisualStudioIntegrationTests.csproj
浏览文件 @ 7fe93934
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<Nonshipping>true</Nonshipping> <Nonshipping>true</Nonshipping>
<RoslynProjectType>UnitTestNext</RoslynProjectType> <RoslynProjectType>UnitTest</RoslynProjectType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"></PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"></PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"></PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"></PropertyGroup>
......
src/Workspaces/CoreTest/project.json
浏览文件 @ 7fe93934
{ {
"dependencies": { "dependencies": {
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239" "xunit.runner.console": "2.2.0-beta1-build3239",
"Microsoft.CodeAnalysis.Elfie": {
"version": "0.10.6-rc2",
"suppressParent": "all"
}
}, },
"frameworks": { "frameworks": {
"net46": { } "net46": { }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或