提交 584731ef 编写于 作者: J Jared Parsons 提交者: GitHub

Merge pull request #16305 from jaredpar/fix-dev15

Move our references over to Dev15
......@@ -73,6 +73,54 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
</dependentAssembly>
<!-- Even though all of our references are to Dev15 binaries we are still pulling in the interactive window
which references Dev14. Until that moves to Dev15 we need these redirects -->
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="4.0.0.0-4.5.65535.65535" newVersion="4.5.24.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.CoreUtility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Editor" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Text.Data" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Text.Logic" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Text.Internal" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Text.UI" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Text.UI.Wpf" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Language.Intellisense" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Language.StandardClassification" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
......@@ -8,9 +8,9 @@
"include": [ "csc", "vbc" ]
},
"dependencies": {
"Microsoft.Build": "15.1.0-preview-000370-00",
"Microsoft.Build.Runtime": "15.1.0-preview-000370-00",
"Microsoft.Build.Tasks.Core": "15.1.0-preview-000370-00",
"Microsoft.Build": "15.1.0-preview-000458-02",
"Microsoft.Build.Runtime": "15.1.0-preview-000458-02",
"Microsoft.Build.Tasks.Core": "15.1.0-preview-000458-02",
"Microsoft.Net.Compilers.netcore": "2.0.0-rc2-61102-09",
"Microsoft.NuGet.Build.Tasks": "0.1.0",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-rc2-61102-09",
......
......@@ -7,11 +7,12 @@
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
<MicroBuildPluginsSwixBuildVersion>1.0.101</MicroBuildPluginsSwixBuildVersion>
<MicrosoftBuildVersion>15.1.0-preview-000370-00</MicrosoftBuildVersion>
<MicrosoftBuildVersion>15.1.0-preview-000458-02</MicrosoftBuildVersion>
<MicrosoftBuild14Version>14.3.0</MicrosoftBuild14Version>
<MicrosoftBuildFrameworkVersion>15.1.0-preview-000458-02</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildLoggingStructuredLoggerVersion>1.0.58</MicrosoftBuildLoggingStructuredLoggerVersion>
<MicrosoftBuildRuntimeVersion>15.1.0-preview-000370-00</MicrosoftBuildRuntimeVersion>
<MicrosoftBuildTasksCoreVersion>15.1.0-preview-000370-00</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildRuntimeVersion>15.1.0-preview-000458-02</MicrosoftBuildRuntimeVersion>
<MicrosoftBuildTasksCoreVersion>15.1.0-preview-000458-02</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildTasksCore14Version>14.3.0</MicrosoftBuildTasksCore14Version>
<MicrosoftCodeAnalysisAnalyzersVersion>1.1.0</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisElfieVersion>0.10.6-rc2</MicrosoftCodeAnalysisElfieVersion>
......@@ -83,7 +84,6 @@
<SystemTextRegularExpressionsVersion>4.3.0</SystemTextRegularExpressionsVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksVersion>4.3.0</SystemThreadingTasksVersion>
<SystemThreadingTasksDataflowVersion>4.5.24</SystemThreadingTasksDataflowVersion>
<SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
<SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>
......
......@@ -90,6 +90,12 @@
</Choose>
<Choose>
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND '$(OS)' != 'Windows_NT'">
<PropertyGroup>
<!-- https://github.com/Microsoft/msbuild/issues/1533 -->
<MSBuildTargetsFilePath>$(MSBuildExtensionsPath32)\Extensions\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.$(MSBuildTargetsLanguageName).targets</MSBuildTargetsFilePath>
</PropertyGroup>
</When>
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable'">
<PropertyGroup>
<MSBuildTargetsFilePath>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.$(MSBuildTargetsLanguageName).targets</MSBuildTargetsFilePath>
......@@ -109,7 +115,7 @@
<RoslynPublicKey>0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9</RoslynPublicKey>
<RoslynInternalKey>002400000480000094000000060200000024000052534131000400000100010055e0217eb635f69281051f9a823e0c7edd90f28063eb6c7a742a19b4f6139778ee0af438f47aed3b6e9f99838aa8dba689c7a71ddb860c96d923830b57bbd5cd6119406ddb9b002cf1c723bf272d6acbb7129e9d6dd5a5309c94e0ff4b2c884d45a55f475cd7dba59198086f61f5a8c8b5e601c0edbf269733f6f578fc8579c2</RoslynInternalKey>
<ForceGenerationOfBindingRedirects Condition="'$(GenerateMSBuildBindingRedirects)' == 'true'">true</ForceGenerationOfBindingRedirects>
<ForceGenerationOfBindingRedirects Condition="'$(GenerateMSBuildBindingRedirects)' != ''">true</ForceGenerationOfBindingRedirects>
<AutoGenerateBindingRedirects Condition="'$(ForceGenerationOfBindingRedirects)' == 'true'">true</AutoGenerateBindingRedirects>
<FileAlignment>512</FileAlignment>
......@@ -200,24 +206,24 @@
<!-- ====================================================================================
Generation of binding redirects.
Generation of binding redirects for our MSBuild binaries.
==================================================================================== -->
<ItemGroup Condition="'$(GenerateMSBuildBindingRedirects)' == 'true'">
<ItemGroup Condition="'$(GenerateMSBuildBindingRedirects)' != ''">
<SuggestedBindingRedirects Include="Microsoft.Build, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
<MaxVersion>$(GenerateMSBuildBindingRedirects)</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="Microsoft.Build.Engine, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
<MaxVersion>$(GenerateMSBuildBindingRedirects)</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="Microsoft.Build.Framework, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
<MaxVersion>$(GenerateMSBuildBindingRedirects)</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="Microsoft.Build.Tasks.$(MSBuildAssemblyNameFragment), Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
<MaxVersion>$(GenerateMSBuildBindingRedirects)</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="Microsoft.Build.Utilities.Core, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
<MaxVersion>$(GenerateMSBuildBindingRedirects)</MaxVersion>
</SuggestedBindingRedirects>
</ItemGroup>
......@@ -449,4 +455,4 @@
<!-- Returns the current build version. Used in .vsixmanifests to substitute our build version into them -->
<Target Name="GetBuildVersion" Outputs="$(VsixVersion)" />
</Project>
\ No newline at end of file
</Project>
......@@ -224,7 +224,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(MSBuildProjectExtension)' != '.vcxproj'" />
<Import Project="$(RoslynDiagnosticsPropsFilePath)" Condition="'$(UseRoslynAnalyzers)' == 'true'" />
<Import Project="$(RoslynDiagnosticsPropsFilePath)" Condition="'$(UseRoslynAnalyzers)' == 'true' AND Exists('$(RoslynDiagnosticsPropsFilePath)')" />
<ImportGroup Label="WindowsImports" Condition="'$(OS)' == 'Windows_NT'">
<Import Project="$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\$(VisualStudioBuildToolsVersion)\build\Microsoft.VsSDK.BuildTools.props" />
......
{
"fixedPackages": {
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VSSDK.BuildTools": [ "14.3.25420", "15.0.25929-RC2" ],
"Newtonsoft.Json": "9.0.1",
"System.Reflection.Metadata": "1.0.21",
"System.Collections.Immutable": "1.1.36",
"Microsoft.VisualStudio.CoreUtility": "14.3.25407",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.VisualStudio.Imaging": "14.3.25407",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
"Microsoft.VisualStudio.Shell.Immutable.10.0": "10.0.30319",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Text.Logic": "14.3.25407",
"Microsoft.VisualStudio.Text.Data": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Utilities": "14.3.25407",
"Microsoft.VisualStudio.Validation": "14.1.111",
"Microsoft.VisualStudio.Threading": "14.1.111",
"Microsoft.Build": {
"generateName": "Microsoft.Build.14",
"version": "14.3.0"
......
......@@ -26,7 +26,10 @@ public class IntegrationTests : TestBase
static IntegrationTests()
{
s_msbuildDirectory = TestHelpers.GetMSBuildDirectory();
s_msbuildExecutable = Path.Combine(s_msbuildDirectory, "MSBuild.exe");
if (s_msbuildDirectory != null)
{
s_msbuildExecutable = Path.Combine(s_msbuildDirectory, "MSBuild.exe");
}
}
private readonly TempDirectory _tempDirectory;
......@@ -604,7 +607,7 @@ End Class
"}
};
[Fact]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
public void ReportAnalyzerMSBuild()
{
string arguments = string.Format(@"/m /nr:false /t:Rebuild /p:UseSharedCompilation=false /p:UseRoslyn=1 HelloSolution.sln");
......
{
"dependencies": {
"EnvDTE": "8.0.0",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319"
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop.8.0": "8.0.50727",
"Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729",
"Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"System.Collections.Immutable": "1.3.1",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Imaging": "14.3.25407",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Utilities": "14.3.25407",
"Microsoft.VisualStudio.Validation": "14.1.111",
"Microsoft.VisualStudio.Threading": "14.1.111"
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.Validation": "15.0.26014-alpha",
"Microsoft.VisualStudio.Threading": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.CoreUtility": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "15.0.25726-Preview5",
"Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Data": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Logic": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.UI": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Validation": "15.0.55-pre",
"Microsoft.VisualStudio.Threading": "15.0.109-pre",
"Microsoft.VisualStudio.CoreUtility": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Logic": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.Validation": "15.0.26014-alpha",
"Microsoft.VisualStudio.Threading": "15.0.26014-alpha",
"System.Collections.Immutable": "1.3.1",
"System.Threading.Tasks.Dataflow": "4.5.24",
"Microsoft.Tpl.Dataflow": "4.5.24",
"VS.ExternalAPIs.CodingConventions": "1.0.60704.2"
},
"frameworks": {
......
{
"dependencies": {
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -322,9 +322,15 @@
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
<None Include="..\..\Compilers\Core\MSBuildTask\Microsoft.CSharp.Core.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\Compilers\Core\MSBuildTask\Microsoft.VisualBasic.Core.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
{
"dependencies": {
"System.Threading.Tasks.Dataflow": "4.5.24",
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.Tpl.Dataflow": "4.5.24",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Imaging": "14.3.25407",
"Microsoft.Build.Runtime": "15.1.0-preview-000458-02",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -7,16 +7,16 @@
"Newtonsoft.Json": "8.0.3",
"Nerdbank.FullDuplexStream": "1.0.1",
"BasicUndo": "0.9.3",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.Language.StandardClassification" : "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification" : "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Imaging": "14.3.25407",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Text.Data": "14.3.25407",
"Microsoft.VisualStudio.Text.Logic": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Logic": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.CoreUtility": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"BasicUndo": "0.9.3",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407"
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407"
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Editor": "14.3.25407"
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -51,6 +51,7 @@ private string BuildTestResultContent(AssemblyInfo assemblyInfo)
builder.AppendLine($"\t{nameof(_options.Trait)} - {_options.Trait}");
builder.AppendLine($"\t{nameof(_options.NoTrait)} - {_options.NoTrait}");
builder.AppendLine($"Extra Options: {assemblyInfo.ExtraArguments}");
AppendExtra(builder, assemblyPath);
return builder.ToString();
}
......@@ -114,6 +115,25 @@ private void AppendReferences(StringBuilder builder, string assemblyPath)
}
}
private void AppendExtra(StringBuilder builder, string assemblyPath)
{
builder.AppendLine("Extra Files:");
var all = new[]
{
"*.targets",
"*.props"
};
var binariesPath = Path.GetDirectoryName(assemblyPath);
foreach (var ext in all)
{
foreach (var file in Directory.EnumerateFiles(binariesPath, ext))
{
builder.AppendLine($"\t{Path.GetFileName(file)} - {GetFileChecksum(file)}");
}
}
}
private string GetChecksum(string content)
{
var contentBytes = Encoding.UTF8.GetBytes(content);
......
......@@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:s="clr-namespace:Roslyn.SyntaxVisualizer.Control;assembly=Roslyn.SyntaxVisualizer.Control"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300"
......
......@@ -7,21 +7,23 @@
"Microsoft.CodeAnalysis.Common": "1.0.1",
"Microsoft.CodeAnalysis.EditorFeatures.Text": "1.0.1",
"Microsoft.CodeAnalysis.Workspaces.Common": "1.0.1",
"Microsoft.VisualStudio.CoreUtility": "14.3.25407",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Text.Data": "14.3.25407",
"Microsoft.VisualStudio.Text.Logic": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.CoreUtility": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Logic": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.OLE.Interop": "7.10.6070",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.Immutable.10.0": "10.0.30319",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop": "7.10.6071",
"Microsoft.VisualStudio.Shell.Interop.8.0": "8.0.50727",
"Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729",
"Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319",
"Microsoft.VisualStudio.TextManager.Interop": "7.10.6070",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"System.Collections.Immutable": "1.1.36",
"System.Reflection.Metadata": "1.0.21"
},
......
......@@ -2,15 +2,15 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": "14.3.25407",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.GraphModel": "15.0.26014-alpha",
"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.Shell.Design": "14.3.25407"
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Design": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
......@@ -2,7 +2,7 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.Editor": "14.3.25407"
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -3,11 +3,11 @@
"BasicUndo": "0.9.3",
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha"
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -7,7 +7,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:imagingPlatformUI="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
Height="420" Width="560"
MinHeight="420" MinWidth="560"
......@@ -316,4 +316,4 @@
MinHeight="21"/>
</StackPanel>
</Grid>
</vs:DialogWindow>
\ No newline at end of file
</vs:DialogWindow>
......@@ -2,12 +2,12 @@
x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.ExtractInterface.ExtractInterfaceDialog"
x:ClassModifier="internal"
x:Name="dialog"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
mc:Ignorable="d"
d:DesignHeight="380" d:DesignWidth="460"
......@@ -147,4 +147,4 @@
MinHeight="21"/>
</StackPanel>
</Grid>
</vs:DialogWindow>
\ No newline at end of file
</vs:DialogWindow>
......@@ -3,7 +3,7 @@
x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.GenerateType.GenerateTypeDialog"
x:ClassModifier="internal"
x:Name="dialog"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
......@@ -3,8 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
x:ClassModifier="internal" mc:Ignorable="d"
Focusable="True" IsTabStop="False" TextOptions.TextFormattingMode="Display"
Foreground="{DynamicResource {x:Static vsui:EnvironmentColors.PanelTextBrushKey}}"
......@@ -107,4 +107,4 @@
</DockPanel>
<Button x:Name="OptionsButton" Content="Change Style Options" Click="OptionsButton_Click" DockPanel.Dock="Bottom"></Button>
</DockPanel>
</UserControl>
\ No newline at end of file
</UserControl>
......@@ -4,8 +4,8 @@
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:local="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:ui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
mc:Ignorable="d"
x:ClassModifier="internal"
......@@ -46,4 +46,4 @@
Style="{DynamicResource {x:Static vs:VsResourceKeys.ButtonStyleKey}}"/>
</StackPanel>
</Grid>
</ui:DialogWindow>
\ No newline at end of file
</ui:DialogWindow>
......@@ -7,38 +7,44 @@
"Microsoft.VisualStudio.Telemetry": "15.0.722-masterBFDFE2B0",
"Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C",
"Microsoft.VisualStudio.OLE.Interop": "7.10.6070",
"Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729",
"Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319",
"Microsoft.VisualStudio.Shell.Interop.11.0": "11.0.61030",
"Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime": "12.1.30328",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha",
"Microsoft.Internal.Performance.CodeMarkers.DesignTime": "14.3.25407-alpha",
"RoslynDependencies.Microsoft.VisualStudio.Progression": "14.3.25407",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": "14.3.25407",
"Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
"Microsoft.VisualStudio.CallHierarchy.Package.Definitions": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.Shell.Design": "14.3.25407",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407-alpha",
"Microsoft.Internal.Performance.CodeMarkers.DesignTime": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.CodeSchema": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.Common": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.GraphModel": "15.0.26014-alpha",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.CallHierarchy.Package.Definitions": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Design": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.TextManager.Interop.10.0": "10.0.30319",
"Microsoft.VisualStudio.TextManager.Interop.12.0": "12.0.30110",
"Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime": "12.1.30328",
"Microsoft.VisualStudio.Designer.Interfaces": "1.1.4322",
"Microsoft.DiaSymReader": "1.1.0-rc3-61303-01",
"Microsoft.MSXML": "8.0.0.0-alpha",
"Microsoft.Build": "14.3.0",
"Microsoft.Build": "15.1.0-preview-000458-02",
"VSLangProj": "7.0.3300-alpha",
"VSLangProj80": "8.0.0.0-alpha",
"VSLangProj140": "14.3.25407-alpha",
"VsWebsite.Interop": "8.0.0.0-alpha",
"NuGet.VisualStudio": "4.0.0-rc-2048",
"Newtonsoft.Json": "8.0.3"
},
"frameworks": {
"net46": {}
......
......@@ -3,7 +3,7 @@
x:ClassModifier="internal"
x:Name="dialog"
xmlns:local="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Options.Style.NamingPreferences"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......@@ -11,7 +11,7 @@
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
xmlns:imagingPlatformUI="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
mc:Ignorable="d"
d:DesignHeight="400" d:DesignWidth="300"
Height="400" Width="300"
......@@ -203,4 +203,4 @@
MinWidth="73"
MinHeight="21"/>
</Grid>
</vs:DialogWindow>
\ No newline at end of file
</vs:DialogWindow>
......@@ -10,7 +10,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:options="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Options"
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns:imagingPlatformUI="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
mc:Ignorable="d"
......@@ -272,4 +272,4 @@
</StackPanel>
</Border>
</Grid>
</local:AbstractOptionPageControl>
\ No newline at end of file
</local:AbstractOptionPageControl>
......@@ -3,12 +3,12 @@
x:ClassModifier="internal"
x:Name="dialog"
xmlns:local="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Options.Style.NamingPreferences"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
mc:Ignorable="d"
d:DesignHeight="280" d:DesignWidth="500"
Height="280" Width="500"
......@@ -88,4 +88,4 @@
MinHeight="21"/>
</StackPanel>
</Grid>
</vs:DialogWindow>
\ No newline at end of file
</vs:DialogWindow>
......@@ -2,12 +2,12 @@
x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.Options.Style.NamingPreferences.SymbolSpecificationDialog"
x:ClassModifier="internal"
x:Name="dialog"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
xmlns:s="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
mc:Ignorable="d"
d:DesignHeight="400" d:DesignWidth="600"
Height="450" Width="700"
......@@ -169,4 +169,4 @@
MinHeight="21"/>
</StackPanel>
</Grid>
</vs:DialogWindow>
\ No newline at end of file
</vs:DialogWindow>
......@@ -2,14 +2,14 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.Build": "14.3.0",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.Build": "15.1.0-preview-000458-02",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
"Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.UI": "15.0.25726-Preview5",
"Microsoft.VisualStudio.CoreUtility": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Data": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Logic": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.25824-RC",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.CoreUtility": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Logic": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"NuGet.VisualStudio": "4.0.0-rc-2048",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.ServiceHub.Client": "1.0.177-rc-g56d40a8a02",
"Newtonsoft.Json": "8.0.3",
"RoslynDependencies.Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime": "15.0.25718-Preview5",
"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime": "15.0.26014-alpha",
"RoslynDependencies.Microsoft.VisualStudio.Workspace": "14.0.983-pre-ge167e81694",
"System.Collections.Immutable": "1.3.1",
"System.Threading.Tasks.Dataflow": "4.5.24",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.25802-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.Immutable.10.0": {
"version": "15.0.25413-Preview5",
"include": "runtime"
},
"Microsoft.VisualStudio.Shell.Immutable.14.0": {
"version": "15.0.25403-Preview5",
"include": "runtime"
},
"Microsoft.VisualStudio.Shell.14.0": {
"version": "14.3.25407",
"include": "runtime"
},
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": {
"version": "14.3.25407",
"include": "none"
}
"Microsoft.Tpl.Dataflow": "4.5.24",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"EnvDTE": "8.0.0",
"RoslynDependencies.Microsoft.VisualStudio.CodeAnalysis.Sdk.UI": "14.3.25420",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.ImageCatalog": "14.3.25407"
"Microsoft.VisualStudio.CodeAnalysis.Sdk.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.Build.Framework": "15.1.0-preview-000458-02"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"System.Threading.Tasks.Dataflow": "4.5.24",
"Microsoft.Tpl.Dataflow": "4.5.24",
"Newtonsoft.Json": "8.0.3",
"Moq": "4.2.1402.2112",
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
"Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.UI": "15.0.25726-Preview5",
"Microsoft.VisualStudio.CoreUtility": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Data": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Logic": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.CoreUtility": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Logic": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26014-alpha",
"BasicUndo": "0.9.3",
"Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.25802-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Validation": "15.0.55-pre",
"Microsoft.VisualStudio.Threading": "15.0.109-pre",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": {
"version": "14.3.25407",
"include": "none"
}
"Microsoft.VisualStudio.Language.StandardClassification": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Utilities": "15.0.26014-alpha",
"Microsoft.VisualStudio.Validation": "15.0.26014-alpha",
"Microsoft.VisualStudio.Threading": "15.0.26014-alpha",
},
"frameworks": {
"net46": {}
......
......@@ -34,7 +34,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
End Get
End Property
Private Shared s_CSharpCompilerExecutable As String = Path.Combine(MSBuildDirectory, "csc.exe")
Private Shared s_CSharpCompilerExecutable As String = If(MSBuildDirectory IsNot Nothing, Path.Combine(MSBuildDirectory, "csc.exe"), Nothing)
Private Shared s_mscorlibDisplayName As String = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
Private Shared Function GetIgnorableAssemblyLists() As IEnumerable(Of IIgnorableAssemblyList)
......@@ -44,7 +44,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
Return {New IgnorableAssemblyIdentityList({mscorlib})}
End Function
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest1()
' Dependency Graph:
' A
......@@ -60,7 +61,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest2()
' Dependency graph:
' A --> B
......@@ -87,7 +89,8 @@ public class A
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest3()
' Dependency graph:
' A --> B
......@@ -121,7 +124,8 @@ public class A
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest4()
' Dependency graph:
' A --> B
......@@ -161,7 +165,8 @@ public class C
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest5()
' Dependency graph:
' Directory 1:
......@@ -203,7 +208,8 @@ public class C
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest6()
' Dependency graph:
' A -
......@@ -244,7 +250,8 @@ public class B
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest7()
' Dependency graph:
' Directory 1:
......@@ -285,7 +292,8 @@ public class B
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest8()
' Dependency graph:
' Directory 1:
......@@ -345,7 +353,8 @@ public class C
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest9()
' Dependency graph:
' Directory 1:
......@@ -415,7 +424,8 @@ public class D
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest10()
' Dependency graph:
' Directory 1:
......@@ -495,7 +505,8 @@ public class E
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest11()
' Dependency graph:
' Directory 1:
......@@ -546,7 +557,8 @@ public class B
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest12()
' Dependency graph:
' Directory 1:
......@@ -603,7 +615,8 @@ public class B
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest13()
' Dependency graph:
' Directory 1:
......@@ -661,7 +674,8 @@ public class B
End Using
End Sub
<Fact, WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
<WorkItem(1064914, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1064914")>
Public Sub ConflictsTest14()
' Dependency graph:
' Directory 1:
......@@ -732,8 +746,8 @@ public class D
Assert.Equal(expected:=3, actual:=results.Conflicts.Length)
End Using
End Sub
<Fact>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
Public Sub MissingTest1()
' Dependency Graph:
' A
......@@ -748,7 +762,7 @@ public class D
End Using
End Sub
<Fact>
<Fact(Skip:= "https://github.com/dotnet/roslyn/issues/16301")>
Public Sub MissingTest2()
' Dependency graph:
' A --> B*
......
......@@ -3,18 +3,20 @@
"BasicUndo": "0.9.3",
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha",
"RoslynDependencies.Microsoft.VisualStudio.Progression": "14.3.25407",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": "14.3.25407",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha"
"Microsoft.VisualStudio.Progression.CodeSchema": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.Common": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.GraphModel": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
......@@ -2,22 +2,22 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.CoreUtility": "14.3.25407",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.CoreUtility": "15.0.26014-alpha",
"Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.OLE.Interop": "7.10.6070",
"Microsoft.VisualStudio.Setup.Configuration.Interop": "1.3.269-rc",
"Microsoft.VisualStudio.Setup.Configuration.Native.x86": "1.3.269-rc",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Interop": "7.10.6071",
"Microsoft.VisualStudio.Shell.Interop.8.0": "8.0.50727",
"Microsoft.VisualStudio.Text.Data": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha",
"Microsoft.VisualStudio.TextManager.Interop": "7.10.6070",
"Microsoft.VisualStudio.VsInteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.VsInteractiveWindow": "2.0.0-rc3-61304-01",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"System.Collections.Immutable": "1.3.1"
},
"frameworks": {
......
......@@ -2,10 +2,10 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.VsInteractiveWindow": "2.0.0-beta5-60820-04",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.VsInteractiveWindow": "2.0.0-rc3-61304-01",
"System.ValueTuple": "4.3.0"
},
"frameworks": {
......
{
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.25824-RC",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.25802-alpha",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": {
"version": "14.3.25407",
"include": "none"
}
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.25413-Preview5",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Immutable.11.0": "15.0.25413-Preview5",
"Microsoft.VisualStudio.CallHierarchy.Package.Definitions": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.25802-alpha",
"Microsoft.VisualStudio.Shell.Immutable.10.0": {
"version": "15.0.25413-Preview5",
"include": "runtime"
},
"Microsoft.VisualStudio.Shell.Immutable.14.0": {
"version": "15.0.25403-Preview5",
"include": "runtime"
},
"Microsoft.VisualStudio.Shell.14.0": {
"version": "14.3.25407",
"include": "runtime"
},
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": {
"version": "14.3.25407",
"include": "none"
}
"Microsoft.VisualStudio.CallHierarchy.Package.Definitions": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
......@@ -2,27 +2,29 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Platform.VSEditor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26014-alpha",
"Microsoft.VisualStudio.Composition": "15.0.66-rc",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C",
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"Microsoft.VisualStudio.Text.Internal": "14.3.25407-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Internal": "15.0.26014-alpha",
"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha",
"RoslynDependencies.Microsoft.VisualStudio.Progression": "14.3.25407",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": "14.3.25407",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407-alpha",
"Microsoft.VisualStudio.Imaging": "14.3.25407",
"Microsoft.VisualStudio.Text.Data": "14.3.25407",
"Microsoft.VisualStudio.Text.Logic": "14.3.25407",
"Microsoft.VisualStudio.Progression.CodeSchema": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.Common": "15.0.26014-alpha",
"Microsoft.VisualStudio.Progression.Interfaces": "15.0.26014-alpha",
"Microsoft.VisualStudio.GraphModel": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Data": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.Logic": "15.0.26014-alpha",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -2,12 +2,12 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.Editor": "14.3.25407",
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": "14.3.25407",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.Shell.Design": "14.3.25407"
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.Language.Intellisense": "15.0.26014-alpha",
"Microsoft.VisualStudio.GraphModel": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Design": "15.0.26014-alpha",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"EnvDTE": "8.0.0",
"Microsoft.VisualStudio.Editor": "14.3.25407"
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
......@@ -2,10 +2,10 @@
"dependencies": {
"EnvDTE": "8.0.0",
"EnvDTE80": "8.0.0",
"Microsoft.VisualStudio.ComponentModelHost": "14.3.25407-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420-alpha",
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407"
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI": "15.0.26014-alpha",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26014-alpha"
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
"Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.25824-RC",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.25802-alpha",
"Microsoft.VisualStudio.Editor": "15.0.26014-alpha",
"Microsoft.VisualStudio.ImageCatalog": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26014-alpha",
"Microsoft.VisualStudio.Shell.Framework": "15.0.26014-alpha",
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26014-alpha",
"Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26014-alpha",
"Newtonsoft.Json": "8.0.3",
"Microsoft.VisualStudio.Shell.Immutable.10.0": {
"version": "15.0.25413-Preview5",
"include": "runtime"
},
"Microsoft.VisualStudio.Shell.14.0": {
"version": "14.3.25407",
"include": "runtime"
},
"RoslynDependencies.Microsoft.VisualStudio.GraphModel": {
"version": "14.3.25407",
"include": "none"
}
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"ManagedEsent": "1.9.4",
"Microsoft.Build": "14.3.0",
"Microsoft.Build.Tasks.Core": "14.3.0",
"Microsoft.Build": "15.1.0-preview-000458-02",
"Microsoft.Build.Tasks.Core": "15.1.0-preview-000458-02",
"Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2",
"Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C"
},
......
......@@ -150,6 +150,12 @@
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
<None Include="..\..\Compilers\Core\MSBuildTask\Microsoft.CSharp.Core.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\Compilers\Core\MSBuildTask\Microsoft.VisualBasic.Core.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -58,7 +58,8 @@ public void TestOpenSolution_SingleProjectSolution()
Assert.Equal(true, type.ToString().StartsWith("public class CSharpClass", StringComparison.Ordinal));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestOpenSolution_MultiProjectSolution()
{
CreateFiles(GetMultiProjectSolutionFiles());
......@@ -99,7 +100,8 @@ public void Test_OpenProjectReferencingPortableProject()
Assert.True(hasFacades);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void Test_SharedMetadataReferences()
{
CreateFiles(GetMultiProjectSolutionFiles());
......@@ -131,7 +133,8 @@ private static MetadataReference GetMetadataReferenceByAlias(Project project, st
!mr.Properties.Aliases.IsDefault && mr.Properties.Aliases.Contains(aliasName));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(546171, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546171")]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(546171, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546171")]
public void Test_SharedMetadataReferencesWithAliases()
{
var projPath1 = @"CSharpProject\CSharpProject_ExternAlias.csproj";
......@@ -237,7 +240,8 @@ public void TestOutputFilePaths()
Assert.Equal("VisualBasicProject.dll", Path.GetFileName(p2.OutputFilePath));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestCrossLanguageReferencesUsesInMemoryGeneratedMetadata()
{
CreateFiles(GetMultiProjectSolutionFiles());
......@@ -257,7 +261,8 @@ public void TestCrossLanguageReferencesUsesInMemoryGeneratedMetadata()
Assert.NotNull(pref);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestCrossLanguageReferencesWithOutOfDateMetadataOnDiskUsesInMemoryGeneratedMetadata()
{
PrepareCrossLanguageProjectWithEmittedMetadata();
......@@ -282,7 +287,8 @@ public void TestCrossLanguageReferencesWithOutOfDateMetadataOnDiskUsesInMemoryGe
Assert.NotNull(pref);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestInternalsVisibleToSigned()
{
var solution = Solution(
......@@ -370,7 +376,8 @@ public void TestOpenSolution_LoadMetadataForReferencedProjects()
Assert.Equal(true, type.ToString().StartsWith("public class CSharpClass", StringComparison.Ordinal));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
[WorkItem(739043, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/739043")]
public void TestOpenProject_CSharp_WithoutPrefer32BitAndConsoleApplication()
{
......@@ -395,7 +402,8 @@ public void TestOpenProject_CSharp_WithoutPrefer32BitAndLibrary()
Assert.Equal(Platform.AnyCpu, compilation.Options.Platform);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
[WorkItem(739043, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/739043")]
public void TestOpenProject_CSharp_WithPrefer32BitAndConsoleApplication()
{
......@@ -496,7 +504,8 @@ public void TestOpenProject_VisualBasic_WithoutVBTargetsImported_DocumentsArePic
Assert.True(project.Documents.ToList().Any());
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
[WorkItem(739043, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/739043")]
public void TestOpenProject_VisualBasic_WithoutPrefer32BitAndConsoleApplication()
{
......@@ -521,7 +530,8 @@ public void TestOpenProject_VisualBasic_WithoutPrefer32BitAndLibrary()
Assert.Equal(Platform.AnyCpu, compilation.Options.Platform);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
[WorkItem(739043, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/739043")]
public void TestOpenProject_VisualBasic_WithPrefer32BitAndConsoleApplication()
{
......@@ -623,7 +633,8 @@ public void TestOpenProject_WithXaml()
Assert.Equal(true, documents.Contains(d => d.Name == "MainWindow.g.cs"));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestMetadataReferenceHasBadHintPath()
{
// prove that even with bad hint path for metadata reference the workspace can succeed at finding the correct metadata reference.
......@@ -1254,7 +1265,8 @@ public void TestOpenProject_WithUnrecognizedProjectReferenceFileExtension_WithMe
Assert.Equal(true, metaRefs.Any(r => r is PortableExecutableReference && ((PortableExecutableReference)r).Display.Contains("CSharpProject.dll")));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestOpenProject_WithUnrecognizedProjectReferenceFileExtension_BadMsbuildProject_SkipTrue_SucceedsWithDanglingProjectReference()
{
CreateFiles(GetMultiProjectSolutionFiles()
......@@ -1624,7 +1636,8 @@ public void TestCompilationOptions_VisualBasic_RootNamespace()
AssertVBOptions("Foo.Bar", options => options.RootNamespace);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestCompilationOptions_VisualBasic_OptionStrict_On()
{
CreateVBFilesWith("OptionStrict", "On");
......@@ -1757,7 +1770,8 @@ public void TestParseOptions_VisualBasic_PreprocessorSymbols()
}, defines);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void Test_VisualBasic_ConditionalAttributeEmitted()
{
CreateFiles(GetMultiProjectSolutionFiles()
......@@ -1779,7 +1793,8 @@ public void Test_VisualBasic_ConditionalAttributeEmitted()
Assert.Equal(true, attrs.Any(ad => ad.AttributeClass.Name == "MyAttribute"));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void Test_VisualBasic_ConditionalAttributeNotEmitted()
{
CreateFiles(GetMultiProjectSolutionFiles()
......@@ -1800,7 +1815,8 @@ public void Test_VisualBasic_ConditionalAttributeNotEmitted()
Assert.Equal(false, attrs.Any(ad => ad.AttributeClass.Name == "MyAttribute"));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void Test_CSharp_ConditionalAttributeEmitted()
{
CreateFiles(this.GetSimpleCSharpSolutionFiles()
......@@ -1822,7 +1838,8 @@ public void Test_CSharp_ConditionalAttributeEmitted()
Assert.Equal(true, attrs.Any(ad => ad.AttributeClass.Name == "MyAttr"));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void Test_CSharp_ConditionalAttributeNotEmitted()
{
CreateFiles(this.GetSimpleCSharpSolutionFiles()
......@@ -1866,7 +1883,8 @@ public void TestOpenProject_CSharp_WithLinkedDocument()
Assert.Equal(fooText, text);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestAddDocumentAsync()
{
CreateFiles(GetSimpleCSharpSolutionFiles());
......@@ -1906,7 +1924,8 @@ public void TestAddDocumentAsync()
Assert.Equal(1, documentB.Folders.Count);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestUpdateDocumentAsync()
{
CreateFiles(GetSimpleCSharpSolutionFiles());
......@@ -2013,7 +2032,8 @@ public void TestApplyChanges_AddDocument()
Assert.Equal(newText.ToString(), textOnDisk);
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestApplyChanges_NotSupportedChangesFail()
{
var csharpProjPath = @"AnalyzerSolution\CSharpProject_AnalyzerReference.csproj";
......@@ -2185,7 +2205,8 @@ public void TestSemanticVersionVB()
var vbdoc8 = AssertSemanticVersionChanged(vbdoc7, vbdoc7.GetTextAsync().Result.Replace(literal7.Span, "100"));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(529276, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529276"), WorkItem(12086, "DevDiv_Projects/Roslyn")]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(529276, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529276"), WorkItem(12086, "DevDiv_Projects/Roslyn")]
public void TestOpenProject_LoadMetadataForReferenceProjects_NoMetadata()
{
var projPath = @"CSharpProject\CSharpProject_ProjectReference.csproj";
......@@ -2235,7 +2256,8 @@ public void TestAnalyzerReferenceLoadStandalone()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public async Task TestAdditionalFilesStandalone()
{
var projPaths = new[] { @"AnalyzerSolution\CSharpProject_AnalyzerReference.csproj", @"AnalyzerSolution\VisualBasicProject_AnalyzerReference.vbproj" };
......@@ -2257,7 +2279,8 @@ public async Task TestAdditionalFilesStandalone()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestLoadTextSync()
{
var files = GetAnalyzerReferenceSolutionFiles();
......@@ -2280,7 +2303,8 @@ public void TestLoadTextSync()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestGetTextSynchronously()
{
var files = GetAnalyzerReferenceSolutionFiles();
......@@ -2301,7 +2325,8 @@ public void TestGetTextSynchronously()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(546171, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546171")]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(546171, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546171")]
public void TestCSharpExternAlias()
{
var projPath = @"CSharpProject\CSharpProject_ExternAlias.csproj";
......@@ -2322,7 +2347,8 @@ public void TestCSharpExternAlias()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(530337, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530337")]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace), WorkItem(530337, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530337")]
public void TestProjectReferenceWithExternAlias()
{
var files = GetProjectReferenceSolutionFiles();
......@@ -2411,7 +2437,8 @@ public void TestProjectReferenceWithNoGuid()
}
}
[ConditionalFact(typeof(IsEnglishLocal)), Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
[WorkItem(5668, "https://github.com/dotnet/roslyn/issues/5668")]
public void TestOpenProject_MetadataReferenceHasDocComments()
{
......@@ -2467,7 +2494,8 @@ public void TestOpenProject_VisualBasic_HasSourceDocComments()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestOpenProject_CrossLanguageSkeletonReferenceHasDocComments()
{
CreateFiles(GetMultiProjectSolutionFiles());
......@@ -2849,8 +2877,9 @@ public void TestAddRemoveMetadataReference_GAC()
Assert.Equal(false, projFileText.Contains(@"<Reference Include=""System.Xaml,"));
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestAddRemoveMetadataReference_ReferenceAssembly()
{
CreateFiles(GetMultiProjectSolutionFiles()
......@@ -2977,7 +3006,8 @@ public void TestAddRemoveProjectReference()
}
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
[WorkItem(1101040, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1101040")]
public void TestOpenProject_BadLink()
{
......@@ -3062,7 +3092,8 @@ public async Task TestOpenProject_WildcardsWithLink()
Assert.True(proj.Documents.Any(d => d.Name == "AssemblyInfo.cs"));
}
[Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/16301")]
[Trait(Traits.Feature, Traits.Features.Workspace)]
public void TestOpenProject_CommandLineArgsHaveNoErrors()
{
CreateFiles(GetSimpleCSharpSolutionFiles());
......@@ -3101,4 +3132,4 @@ public Assembly LoadFromPath(string fullPath)
}
}
}
}
\ No newline at end of file
}
......@@ -3,7 +3,9 @@
"xunit": "2.2.0-beta4-build3444",
"xunit.runner.console": "2.2.0-beta4-build3444",
"xunit.runner.visualstudio": "2.2.0-beta4-build1194",
"Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2"
"Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2",
"Microsoft.Tpl.Dataflow": "4.5.24",
"Microsoft.Build.Runtime": "15.1.0-preview-000458-02",
},
"frameworks": {
"net46": { }
......
{
"dependencies": {
"StreamJsonRpc": "0.12.32-alpha-g90be50f449"
"StreamJsonRpc": "1.0.2-rc"
},
"frameworks": {
"net46": {}
}
}
\ No newline at end of file
}
{
"dependencies": {
"StreamJsonRpc": "0.12.32-alpha-g90be50f449"
"StreamJsonRpc": "1.0.2-rc",
"Newtonsoft.Json": "8.0.3"
},
"frameworks": {
"net46": { }
}
}
\ No newline at end of file
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册