Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

提交 1f31f238 编写于 作者: J Jason Malinowski
浏览文件
操作

Merge pull request #6608 from jasonmalinowski/enable-f5-deployment-for-master 

Enable F5 deployment atop Visual Studio 2015 Update 1
上级 1e03699b 1e60442a
展开全部 隐藏空白更改
内联 并排
Showing with 1526 addition and 477 deletion
Roslyn.sln
浏览文件 @ 1f31f238
...@@ -100,8 +100,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeSign", "src\Tools\Sourc ...@@ -100,8 +100,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeSign", "src\Tools\Sourc
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunTests", "src\Tools\Source\RunTests\RunTests.csproj", "{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunTests", "src\Tools\Source\RunTests\RunTests.csproj", "{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSourceDebug", "src\Tools\Source\OpenSourceDebug\OpenSourceDebug.csproj", "{43026D51-3083-4850-928D-07E1883D5B1A}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicFeatures", "src\Features\VisualBasic\Portable\BasicFeatures.vbproj", "{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicFeatures", "src\Features\VisualBasic\Portable\BasicFeatures.vbproj", "{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpFeatures", "src\Features\CSharp\Portable\CSharpFeatures.csproj", "{3973B09A-4FBF-44A5-8359-3D22CEB71F71}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpFeatures", "src\Features\CSharp\Portable\CSharpFeatures.csproj", "{3973B09A-4FBF-44A5-8359-3D22CEB71F71}"
...@@ -320,6 +318,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableServer", "src\Compi ...@@ -320,6 +318,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableServer", "src\Compi
EndProject EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ServerShared", "src\Compilers\Server\ServerShared\ServerShared.shproj", "{32691768-AF9C-4CAE-9D0F-10721091B9AA}" Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ServerShared", "src\Compilers\Server\ServerShared\ServerShared.shproj", "{32691768-AF9C-4CAE-9D0F-10721091B9AA}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompilerExtension", "src\Compilers\Extension\CompilerExtension.csproj", "{43026D51-3083-4850-928D-07E1883D5B1A}"
EndProject
Global Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4 src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
...@@ -1115,26 +1115,6 @@ Global ...@@ -1115,26 +1115,6 @@ Global
{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x64.Build.0 = Release|Any CPU {1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x64.Build.0 = Release|Any CPU
{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x86.ActiveCfg = Release|Any CPU {1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x86.ActiveCfg = Release|Any CPU
{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x86.Build.0 = Release|Any CPU {1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA}.Release|x86.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|ARM.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x64.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x64.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x86.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x86.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Any CPU.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|ARM.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|ARM.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x64.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x64.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x86.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x86.Build.0 = Release|Any CPU
{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|ARM.ActiveCfg = Debug|Any CPU {A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}.Debug|ARM.ActiveCfg = Debug|Any CPU
...@@ -2749,6 +2729,26 @@ Global ...@@ -2749,6 +2729,26 @@ Global
{06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x64.ActiveCfg = Release|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x64.ActiveCfg = Release|x64
{06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x64.Build.0 = Release|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x64.Build.0 = Release|x64
{06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x86.ActiveCfg = Release|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x86.ActiveCfg = Release|x64
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|ARM.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x64.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x64.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x86.ActiveCfg = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Debug|x86.Build.0 = Debug|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Any CPU.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|ARM.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|ARM.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x64.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x64.Build.0 = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x86.ActiveCfg = Release|Any CPU
{43026D51-3083-4850-928D-07E1883D5B1A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -2795,7 +2795,6 @@ Global ...@@ -2795,7 +2795,6 @@ Global
{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5} {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
{97CC7ABF-7E07-4F3A-947B-8C2D8F916450} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {97CC7ABF-7E07-4F3A-947B-8C2D8F916450} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
{1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {1A3941F1-1E1F-4EF7-8064-7729C4C2E2AA} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
{43026D51-3083-4850-928D-07E1883D5B1A} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6} {A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
{3973B09A-4FBF-44A5-8359-3D22CEB71F71} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6} {3973B09A-4FBF-44A5-8359-3D22CEB71F71} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
{EDC68A0E-C68D-4A74-91B7-BF38EC909888} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6} {EDC68A0E-C68D-4A74-91B7-BF38EC909888} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
...@@ -2898,5 +2897,6 @@ Global ...@@ -2898,5 +2897,6 @@ Global
{7E907718-0B33-45C8-851F-396CEFDC1AB6} = {3F40F71B-7DCF-44A1-B15C-38CA34824143} {7E907718-0B33-45C8-851F-396CEFDC1AB6} = {3F40F71B-7DCF-44A1-B15C-38CA34824143}
{06B26DCB-7A12-48EF-AE50-708593ABD05F} = {7E907718-0B33-45C8-851F-396CEFDC1AB6} {06B26DCB-7A12-48EF-AE50-708593ABD05F} = {7E907718-0B33-45C8-851F-396CEFDC1AB6}
{32691768-AF9C-4CAE-9D0F-10721091B9AA} = {7E907718-0B33-45C8-851F-396CEFDC1AB6} {32691768-AF9C-4CAE-9D0F-10721091B9AA} = {7E907718-0B33-45C8-851F-396CEFDC1AB6}
{43026D51-3083-4850-928D-07E1883D5B1A} = {3F40F71B-7DCF-44A1-B15C-38CA34824143}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
build/Targets/VSL.Imports.targets
浏览文件 @ 1f31f238
...@@ -2,12 +2,6 @@ ...@@ -2,12 +2,6 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. --> <!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- This file is imported by all projects at the end of the project files --> <!-- This file is imported by all projects at the end of the project files -->
<PropertyGroup Condition="'$(OpenSourceDebug)' == 'true'">
<DeployVSHive>Roslyn</DeployVSHive>
<AssemblyVersion>$(RoslynSemanticVersion).0</AssemblyVersion>
<BuildVersion>$(RoslynSemanticVersion).0</BuildVersion>
</PropertyGroup>
<!-- Update common properties --> <!-- Update common properties -->
<PropertyGroup> <PropertyGroup>
<OutputPath>$(OutDir)</OutputPath> <OutputPath>$(OutDir)</OutputPath>
...@@ -89,7 +83,6 @@ ...@@ -89,7 +83,6 @@
<BuildDependsOn> <BuildDependsOn>
$(BuildDependsOn); $(BuildDependsOn);
CopyCppOutputBackToIntDir; CopyCppOutputBackToIntDir;
DeployToPreviewPackageFolders;
</BuildDependsOn> </BuildDependsOn>
</PropertyGroup> </PropertyGroup>
...@@ -111,26 +104,6 @@ ...@@ -111,26 +104,6 @@
Text="Must specify a build version in order to real sign a build." /> Text="Must specify a build version in order to real sign a build." />
</Target> </Target>
<!-- ====================================================================================
Deploy binary to 14.0 Package folders
===================================================================================== -->
<PropertyGroup>
<RoslynOssComponentPath>$(UserProfile)\AppData\Local\Microsoft\VisualStudio\$(VisualStudioVersion)$(DeployVSHive)\Extensions\MSOpenTech\OpenSourceDebug\0.7</RoslynOssComponentPath>
<TargetConfigFile>$(TargetPath).config</TargetConfigFile>
<TargetPdbFile>$(TargetDir)$(TargetName).pdb</TargetPdbFile>
<TargetRspFile>$(TargetDir)$(TargetName).rsp</TargetRspFile>
</PropertyGroup>
<Target Name="DeployToPreviewPackageFolders" Condition="'$(DeployToPackageFolders)' == 'true' and '$(VisualStudioVersion)' == '14.0'">
<ItemGroup>
<CopySources Condition="('$(TargetExt)' == '.dll' or '$(TargetExt)' == '.exe') and Exists($(TargetPath))" Include="$(TargetPath)"/>
<CopySources Condition="('$(TargetExt)' == '.dll' or '$(TargetExt)' == '.exe') and Exists($(TargetPdb))" Include="$(TargetPdbFile)"/>
<CopySources Condition="'$(TargetExt)' == '.exe' and Exists($(TargetConfigFile))" Include="$(TargetConfigFile)"/>
<CopySources Condition="'$(TargetExt)' == '.exe' and Exists($(TargetRspFile))" Include="$(TargetRspFile)"/>
</ItemGroup>
<Copy SourceFiles="@(CopySources)" DestinationFolder="$(RoslynOssComponentPath)" SkipUnchangedFiles="true" />
</Target>
<!-- ==================================================================================== <!-- ====================================================================================
Support for a IncludeInVSIXLocalOnly Content metadata Support for a IncludeInVSIXLocalOnly Content metadata
......
build/Targets/VSL.Settings.targets
浏览文件 @ 1f31f238
...@@ -78,8 +78,7 @@ ...@@ -78,8 +78,7 @@
<MicrosoftCodeAnalysisAnalyzersVersionNext Condition="'$(MicrosoftCodeAnalysisAnalyzersVersionNext)' == ''">1.2.0</MicrosoftCodeAnalysisAnalyzersVersionNext> <MicrosoftCodeAnalysisAnalyzersVersionNext Condition="'$(MicrosoftCodeAnalysisAnalyzersVersionNext)' == ''">1.2.0</MicrosoftCodeAnalysisAnalyzersVersionNext>
<!-- If we're on Visual Studio 2015 RTM and we still have Roslyn installed, our VSIX-producing packages are not going to install, so let's not even try. <!-- If we're on Visual Studio 2015 RTM and we still have Roslyn installed, our VSIX-producing packages are not going to install, so let's not even try.
Update 1 supports this, so we'll use csi.exe's existence as a simple proxy for whether we have Update 1 installed or not. Update 1 supports this, so we'll use csi.exe's existence as a simple proxy for whether we have Update 1 installed or not. -->
OpenSourceDebug overrides this by simple virtue that it's property setting is after the include of this file. -->
<DeployExtension Condition="'$(DeployExtension)' == '' AND Exists('$(DevEnvDir)\CommonExtensions\Microsoft\Roslyn\Language Services\extension.vsixmanifest') AND !Exists('$(MSBuildBinPath)\csi.exe')">false</DeployExtension> <DeployExtension Condition="'$(DeployExtension)' == '' AND Exists('$(DevEnvDir)\CommonExtensions\Microsoft\Roslyn\Language Services\extension.vsixmanifest') AND !Exists('$(MSBuildBinPath)\csi.exe')">false</DeployExtension>
</PropertyGroup> </PropertyGroup>
......
src/Compilers/Extension/AssemblyRedirects.cs 0 → 100644
浏览文件 @ 1f31f238
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.VisualStudio.Shell;
using Roslyn.VisualStudio.Setup;
[assembly: ProvideRoslynBindingRedirection("Microsoft.Build.Tasks.CodeAnalysis.dll")]
src/Tools/Source/OpenSourceDebug/OpenSourceDebug.csproj → src/Compilers/Extension/CompilerExtension.csproj
浏览文件 @ 1f31f238
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<ImportGroup Label="Settings"> <ImportGroup Label="Settings">
<Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" /> <Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{43026D51-3083-4850-928D-07E1883D5B1A}</ProjectGuid> <ProjectGuid>{43026D51-3083-4850-928D-07E1883D5B1A}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenSourceDebug</RootNamespace> <RootNamespace>Roslyn.Compilers.Extension</RootNamespace>
<AssemblyName>OpenSourceDebug</AssemblyName> <AssemblyName>Roslyn.Compilers.Extension</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<ImportVSSDKTargets>True</ImportVSSDKTargets> <ImportVSSDKTargets>True</ImportVSSDKTargets>
<GeneratePkgDefFile>true</GeneratePkgDefFile> <GeneratePkgDefFile>true</GeneratePkgDefFile>
<UseCodebase>true</UseCodebase>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer> <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer> <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment> <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
...@@ -27,36 +23,28 @@ ...@@ -27,36 +23,28 @@
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory> <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
<StartAction>Program</StartAction> <StartAction>Program</StartAction>
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram> <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
<StartArguments>/rootsuffix Roslyn /log</StartArguments> <StartArguments>/rootsuffix RoslynDev /log</StartArguments>
<VSSDKTargetPlatformRegRootSuffix>Roslyn</VSSDKTargetPlatformRegRootSuffix> <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
<SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir> <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
<NonShipping>true</NonShipping> <NonShipping>true</NonShipping>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreateVsixContainer>False</CreateVsixContainer>
<DeployExtension>True</DeployExtension>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreateVsixContainer>True</CreateVsixContainer>
<DeployExtension>True</DeployExtension>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="OpenSourceDebugPackage.cs" /> <Compile Include="..\..\VisualStudio\Setup\ProvideRoslynBindingRedirection.cs">
<Compile Include="Resources.Designer.cs" /> <Link>ProvideRoslynBindingRedirection.cs</Link>
</Compile>
<Compile Include="AssemblyRedirects.cs" />
<Compile Include="CompilerPackage.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="project.json" />
<None Include="source.extension.vsixmanifest"> <None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="enableopensource.pkgdef">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="License.txt">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.Build, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Reference Include="Microsoft.Build, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>false</Private> <Private>false</Private>
...@@ -105,84 +93,60 @@ ...@@ -105,84 +93,60 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj"> <ProjectReference Include="..\Core\Portable\CodeAnalysis.csproj">
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project> <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name> <Name>CodeAnalysis</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj"> <ProjectReference Include="..\Server\VBCSCompiler\VBCSCompiler.csproj">
<Project>{9508f118-f62e-4c16-a6f4-7c3b56e166ad}</Project> <Project>{9508f118-f62e-4c16-a6f4-7c3b56e166ad}</Project>
<Name>VBCSCompiler</Name> <Name>VBCSCompiler</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Compilers\CSharp\csc\csc.csproj"> <ProjectReference Include="..\CSharp\csc\csc.csproj">
<Project>{4b45ca0c-03a0-400f-b454-3d4bcb16af38}</Project> <Project>{4b45ca0c-03a0-400f-b454-3d4bcb16af38}</Project>
<Name>csc</Name> <Name>csc</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj"> <ProjectReference Include="..\CSharp\Portable\CSharpCodeAnalysis.csproj">
<Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project> <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
<Name>CSharpCodeAnalysis</Name> <Name>CSharpCodeAnalysis</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj"> <ProjectReference Include="..\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
<Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project> <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
<Name>BasicCodeAnalysis</Name> <Name>BasicCodeAnalysis</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Compilers\VisualBasic\vbc\vbc.csproj"> <ProjectReference Include="..\VisualBasic\vbc\vbc.csproj">
<Project>{2ac2755d-9437-4271-bbde-1a3795a0c320}</Project> <Project>{2ac2755d-9437-4271-bbde-1a3795a0c320}</Project>
<Name>vbc</Name> <Name>vbc</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj"> <ProjectReference Include="..\Core\MSBuildTask\MSBuildTask.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project> <Project>{d874349c-8bb3-4bdc-8535-2d52ccca1198}</Project>
<Name>Workspaces.Desktop</Name> <Name>MSBuildTask</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX> <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\Core\Portable\Workspaces.csproj">
<Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
<Name>Workspaces</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\CSharp\Portable\CSharpWorkspace.csproj">
<Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>
<Name>CSharpWorkspace</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
<Project>{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}</Project>
<Name>BasicWorkspace</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX> <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources.resx" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />
</ItemGroup> </ItemGroup>
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
src/Tools/Source/OpenSourceDebug/OpenSourceDebugPackage.cs → src/Compilers/Extension/CompilerPackage.cs
浏览文件 @ 1f31f238
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Diagnostics;
using System.Globalization;
using System.Runtime.InteropServices;
using System.ComponentModel.Design;
using Microsoft.Win32;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.OLE.Interop;
using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell;
using System.Reflection; using System.Reflection;
using System.IO; using System.IO;
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1017:MarkAssembliesWithComVisible")] namespace Roslyn.Compilers.Extension
namespace Microsoft.OpenSourceDebug
{ {
/// <summary> [ProvideAutoLoad(UIContextGuids.SolutionExists)]
/// This is the class that implements the package exposed by this assembly. public sealed class CompilerPackage : Package
///
/// The minimum requirement for a class to be considered a valid package for Visual Studio
/// is to implement the IVsPackage interface and register itself with the shell.
/// This package uses the helper classes defined inside the Managed Package Framework (MPF)
/// to do it: it derives from the Package class that provides the implementation of the
/// IVsPackage interface and uses the registration attributes defined in the framework to
/// register itself and its components with the shell.
/// </summary>
public sealed class OpenSourceDebugPackage : Package
{ {
private const string VisualStudioVersion = "14.0";
private const string VisualStudioHive = "VisualStudio";
private const string MSBuildDirectory = @"Microsoft\MSBuild\14.0";
private readonly string _CSharpTargetsTemplate =
@"<?xml version=""1.0"" encoding=""utf-8""?>
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<PropertyGroup Condition=""'$(RoslynHive)'=='{0}'"">
<CscToolPath>{1}</CscToolPath>
<CscToolExe>csc.exe</CscToolExe>
</PropertyGroup>
</Project>
";
private const string VisualBasicTargetsTemplate =
@"<?xml version=""1.0"" encoding=""utf-8""?>
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<PropertyGroup Condition=""'$(RoslynHive)'=='{0}'"">
<VbcToolPath>{1}</VbcToolPath>
<VbcToolExe>vbc.exe</VbcToolExe>
</PropertyGroup>
</Project>
";
private const string WriteFileExceptionTitle = "OpenSourceDebugPackage";
private const string WriteFileExceptionMessage = private const string WriteFileExceptionMessage =
@"Unable to write {0} @"{1}
{1}
To reload the Roslyn compiler package, close Visual Studio and any MSBuild processes, then restart Visual Studio."; To reload the Roslyn compiler package, close Visual Studio and any MSBuild processes, then restart Visual Studio.";
protected override void Initialize() protected override void Initialize()
{ {
// Generate targets file base.Initialize();
var packagePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var packagePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
var msbuildExtensionsPath = Path.Combine(localAppData, MSBuildDirectory);
string localRegistryRoot; string localRegistryRoot;
var reg = (ILocalRegistry2)this.GetService(typeof(SLocalRegistry)); var reg = (ILocalRegistry2)this.GetService(typeof(SLocalRegistry));
reg.GetLocalRegistryRoot(out localRegistryRoot); reg.GetLocalRegistryRoot(out localRegistryRoot);
var regDirs = localRegistryRoot.Split('\\'); var registryParts = localRegistryRoot.Split('\\');
var roslynHive = string.Format(@"{0}\{1}", regDirs[2], regDirs[3]);
// Is it a valid Hive looks similar to: // Is it a valid Hive looks similar to:
// 'Software\Microsoft\VisualStudio\14.0' 'Software\Microsoft\VisualStudio\14.0Roslyn' 'Software\Microsoft\VSWinExpress\14.0' // 'Software\Microsoft\VisualStudio\14.0' 'Software\Microsoft\VisualStudio\14.0Roslyn' 'Software\Microsoft\VSWinExpress\14.0'
if (regDirs.Length >= 4) if (registryParts.Length >= 4)
{ {
if (regDirs[3].ToUpperInvariant() != "VISUALSTUDIOVERSION") var skuName = registryParts[2];
{ var hiveName = registryParts[3];
WriteFile( var roslynHive = string.Format(@"{0}.{1}", registryParts[2], registryParts[3]);
Path.Combine(msbuildExtensionsPath, string.Format(@"Microsoft.CSharp.targets\ImportAfter\Microsoft.CSharp.Roslyn.{0}.{1}.targets", regDirs[2], regDirs[3])),
string.Format(_CSharpTargetsTemplate, roslynHive, packagePath)); WriteMSBuildFiles(packagePath, roslynHive);
WriteFile(
Path.Combine(msbuildExtensionsPath, string.Format(@"Microsoft.VisualBasic.targets\ImportAfter\Microsoft.VisualBasic.Roslyn.{0}.{1}.targets", regDirs[2], regDirs[3])),
string.Format(VisualBasicTargetsTemplate, roslynHive, packagePath));
}
try try
{ {
...@@ -96,48 +47,85 @@ protected override void Initialize() ...@@ -96,48 +47,85 @@ protected override void Initialize()
Microsoft.Build.Evaluation.ProjectCollection.GlobalProjectCollection.DisableMarkDirty = false; Microsoft.Build.Evaluation.ProjectCollection.GlobalProjectCollection.DisableMarkDirty = false;
} }
} }
base.Initialize();
}
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
} }
private void WriteFile(string path, string contents) private void WriteMSBuildFiles(string packagePath, string hiveName)
{ {
try // First we want to ensure any existing Roslyn files are deleted so we don't have old stuff floating
// aroud and causing troubles
var msbuildDirectory = new DirectoryInfo(GetMSBuildPath());
if (msbuildDirectory.Exists)
{ {
var directory = Path.GetDirectoryName(path); foreach (var file in msbuildDirectory.EnumerateFiles($"*Roslyn*{hiveName}*", SearchOption.AllDirectories))
if (!Directory.Exists(directory))
{ {
Directory.CreateDirectory(directory); file.Delete();
} }
}
using (var writer = new StreamWriter(path)) try
{ {
writer.Write(contents); // The props we want to be included as early as possible since we want our tasks to be used and
} // to ensure our setting of targets path happens early enough
var propsContent =
$@"<?xml version=""1.0"" encoding=""utf-8""?>
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<PropertyGroup Condition=""'$(RoslynHive)' == '{hiveName}'"">
<RoslynCompilerExtensionActive>true</RoslynCompilerExtensionActive>
<CSharpCoreTargetsPath>{packagePath}\Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath>
<VisualBasicCoreTargetsPath>{packagePath}\Microsoft.VisualBasic.Core.targets</VisualBasicCoreTargetsPath>
</PropertyGroup>
<UsingTask TaskName=""Microsoft.CodeAnalysis.BuildTasks.Csc"" AssemblyFile=""{packagePath}\Microsoft.Build.Tasks.CodeAnalysis.dll"" Condition=""'$(RoslynCompilerExtensionActive)' == 'true'"" />
<UsingTask TaskName=""Microsoft.CodeAnalysis.BuildTasks.Vbc"" AssemblyFile=""{packagePath}\Microsoft.Build.Tasks.CodeAnalysis.dll"" Condition=""'$(RoslynCompilerExtensionActive)' == 'true'"" />
</Project>";
WriteMSBuildFile(propsContent, $@"Imports\Microsoft.Common.props\ImportBefore\Roslyn.Compilers.Extension.{hiveName}.props");
// This targets content we want to be included later since the project flie might touch UseSharedCompilation
var targetsContent =
$@"<?xml version=""1.0"" encoding=""utf-8""?>
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<!-- If we're not using the compiler server, set ToolPath/Exe to direct to the exes in this package -->
<PropertyGroup Condition=""'$(RoslynCompilerExtensionActive)' == 'true' and '$(UseSharedCompilation)' != 'true'"">
<CscToolPath>{packagePath}</CscToolPath>
<CscToolExe>csc.exe</CscToolExe>
<VbcToolPath>{packagePath}</VbcToolPath>
<VbcToolExe>vbc.exe</VbcToolExe>
<UseSharedCompilation>false</UseSharedCompilation>
</PropertyGroup>
</Project>";
WriteMSBuildFile(targetsContent, $@"Microsoft.CSharp.targets\ImportBefore\Roslyn.Compilers.Extension.{hiveName}.targets");
WriteMSBuildFile(targetsContent, $@"Microsoft.VisualBasic.targets\ImportBefore\Roslyn.Compilers.Extension.{hiveName}.targets");
} }
catch (IOException e) catch (Exception e)
{ {
ReportWriteFileException(path, e); VsShellUtilities.ShowMessageBox(
this,
string.Format(WriteFileExceptionMessage, e.Message),
null,
OLEMSGICON.OLEMSGICON_WARNING,
OLEMSGBUTTON.OLEMSGBUTTON_OK,
OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
} }
catch (UnauthorizedAccessException e) }
private static void WriteMSBuildFile(string content, string relativeFilePath)
{
var fileFullPath = Path.Combine(GetMSBuildPath(), relativeFilePath);
var directory = new DirectoryInfo(Path.GetDirectoryName(fileFullPath));
if (!directory.Exists)
{ {
ReportWriteFileException(path, e); directory.Create();
} }
File.WriteAllText(fileFullPath, content);
} }
private void ReportWriteFileException(string path, Exception e) private static string GetMSBuildPath()
{ {
VsShellUtilities.ShowMessageBox( var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
this, return Path.Combine(localAppData, @"Microsoft\MSBuild\14.0");
string.Format(WriteFileExceptionMessage, path, e.Message),
WriteFileExceptionTitle,
OLEMSGICON.OLEMSGICON_WARNING,
OLEMSGBUTTON.OLEMSGBUTTON_OK,
OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
} }
} }
} }
src/Compilers/Extension/project.json 0 → 100644
浏览文件 @ 1f31f238
{
"dependencies": {
},
"frameworks": {
"net452": { }
},
"runtimes": {
"win7": { },
"win7-anycpu": { }
}
}
\ No newline at end of file
src/Compilers/Extension/project.lock.json 0 → 100644
浏览文件 @ 1f31f238
此差异已折叠。
src/Compilers/Extension/source.extension.vsixmanifest 0 → 100644
浏览文件 @ 1f31f238
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="7922692f-f018-45e7-8f3f-d3b7c0262841" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft" />
<DisplayName>Roslyn Compilers</DisplayName>
<Description xml:space="preserve">Package of the Roslyn compilers that enables them for Visual Studio builds.</Description>
</Metadata>
<Installation>
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Pro" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" d:Source="Project" d:ProjectName="%CurrentProject%" />
</Assets>
</PackageManifest>
src/ExpressionEvaluator/Package/AssemblyRedirects.cs
浏览文件 @ 1f31f238
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
using Roslyn.VisualStudio.Setup; using Roslyn.VisualStudio.Setup;
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll")]
src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
浏览文件 @ 1f31f238
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<RootNamespace>ExpressionEvaluatorPackage</RootNamespace> <RootNamespace>ExpressionEvaluatorPackage</RootNamespace>
<AssemblyName>ExpressionEvaluatorPackage</AssemblyName> <AssemblyName>ExpressionEvaluatorPackage</AssemblyName>
<UseCodebase>true</UseCodebase> <UseCodebase>true</UseCodebase>
<GeneratePkgDefFile>False</GeneratePkgDefFile> <GeneratePkgDefFile>true</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer> <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer> <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment> <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
......
src/ExpressionEvaluator/Package/source.extension.vsixmanifest
浏览文件 @ 1f31f238
...@@ -19,5 +19,6 @@ ...@@ -19,5 +19,6 @@
<Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="BasicResultProvider.Portable" Path="|BasicResultProvider.Portable;VsdConfigOutputGroup|" /> <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="BasicResultProvider.Portable" Path="|BasicResultProvider.Portable;VsdConfigOutputGroup|" />
<Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpExpressionCompiler" Path="|CSharpExpressionCompiler;VsdConfigOutputGroup|" /> <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpExpressionCompiler" Path="|CSharpExpressionCompiler;VsdConfigOutputGroup|" />
<Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpResultProvider.Portable" Path="|CSharpResultProvider.Portable;VsdConfigOutputGroup|" /> <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpResultProvider.Portable" Path="|CSharpResultProvider.Portable;VsdConfigOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets> </Assets>
</PackageManifest> </PackageManifest>
src/InteractiveWindow/VisualStudio/AssemblyRedirects.cs
浏览文件 @ 1f31f238
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
using Roslyn.VisualStudio.Setup; using Roslyn.VisualStudio.Setup;
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.InteractiveWindow")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.InteractiveWindow.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.VsInteractiveWindow")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.VsInteractiveWindow.dll")]
\ No newline at end of file \ No newline at end of file
src/Tools/Source/OpenSourceDebug/License.txt 已删除 100644 → 0
浏览文件 @ 1e03699b
Copyright (c) Microsoft. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
these files except in compliance with the License. You may obtain a copy of the
License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
src/Tools/Source/OpenSourceDebug/Resources.Designer.cs 已删除 100644 → 0
浏览文件 @ 1e03699b
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Microsoft.OpenSourceDebug {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.OpenSourceDebug.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}
src/Tools/Source/OpenSourceDebug/Resources.resx 已删除 100644 → 0
浏览文件 @ 1e03699b
<?xml version="1.0" encoding="utf-8"?>
<!--
VS SDK Notes: This resx file contains the resources that will be consumed directly by your package.
For example, if you chose to create a tool window, there is a resource with ID 'CanNotCreateWindow'. This
is used in VsPkg.cs to determine the string to show the user if there is an error when attempting to create
the tool window.
Resources that are accessed directly from your package *by Visual Studio* are stored in the VSPackage.resx
file.
-->
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
src/Tools/Source/OpenSourceDebug/enableopensource.pkgdef 已删除 100644 → 0
浏览文件 @ 1e03699b
; Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
[$RootKey$\InstalledProducts\OpenSourceDebugPackage]
@="#110"
"Package"="{7922692f-f018-45e7-8f3f-d3b7c0262841}"
"PID"="0.7"
[$RootKey$\Packages\{7922692f-f018-45e7-8f3f-d3b7c0262841}]
@="OpenSourceDebugPackage"
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.OpenSourceDebug.OpenSourceDebugPackage"
"Assembly"="OpenSourceDebug, Version=42.42.42.42, Culture=neutral, PublicKeyToken=fc793a00266884fb"
[$RootKey$\AutoLoadPackages\{f1536ef8-92ec-443c-9ed7-fdadf150da82}]
"{7922692f-f018-45e7-8f3f-d3b7c0262841}"=dword:00000000
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{B0633220-CC49-4846-95FE-BF14E45A7746}]
"name"="OpenSourceDebug"
"publicKeyToken"="fc793a00266884fb"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\OpenSourceDebug.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{6F2F49AD-3400-468C-A4E3-DF22A400A5BE}]
"name"="Microsoft.CodeAnalysis.CSharp"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.CSharp.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{FB16B8CA-5B0D-4907-B53C-5A6280A18D26}]
"name"="Microsoft.CodeAnalysis.CSharp.FxCopAnalyzers"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.CSharp.FxCopAnalyzers.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{6197998F-B175-40ED-83A6-6B9F3F5957EB}]
"name"="Microsoft.CodeAnalysis.CSharp.Workspaces"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.CSharp.Workspaces.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{9191E7D9-AD0F-4FC4-9BAA-13F5AEB7B7A9}]
"name"="Microsoft.CodeAnalysis"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{F7B75996-8BE1-407F-8F17-54AB745CD804}]
"name"="Microsoft.CodeAnalysis.FxCopAnalyzers"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.FxCopAnalyzers.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{74465C32-9A24-44DE-BDD0-6A335D926101}]
"name"="Microsoft.CodeAnalysis.VisualBasic"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.VisualBasic.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{455F6A8A-1385-4443-B440-A97B4206BACB}]
"name"="Microsoft.CodeAnalysis.VisualBasic.FxCopAnalyzers"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.VisualBasic.FxCopAnalyzers.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{4B14766C-ED6F-4A10-8374-7FA73055D4E4}]
"name"="Microsoft.CodeAnalysis.VisualBasic.Workspaces"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{F9F9D431-7216-4199-8648-DDC26E7BCF76}]
"name"="Microsoft.CodeAnalysis.Workspaces"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\Microsoft.CodeAnalysis.Workspaces.dll"
[$RootKey$\RuntimeConfiguration\dependentAssembly\codeBase\{E53DF9E9-CA2D-4F64-9DA6-4CB504612A1E}]
"name"=">Roslyn.Diagnostics.Analyzers.VisualBasic"
"publicKeyToken"="31bf3856ad364e35"
"culture"="neutral"
"version"="42.42.42.42"
"codeBase"="$PackageFolder$\>Roslyn.Diagnostics.Analyzers.VisualBasic.dll"
src/Tools/Source/OpenSourceDebug/source.extension.vsixmanifest 已删除 100644 → 0
浏览文件 @ 1e03699b
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="OpenSourceDebug..7922692f-f018-45e7-8f3f-d3b7c0262841" Version="0.7" Language="en-US" Publisher="MSOpenTech" />
<DisplayName>OpenSourceDebug</DisplayName>
<Description xml:space="preserve">Enable Open Source Debugging</Description>
<License>License.txt</License>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0]" />
<InstallationTarget Version="[14.0]" Id="Microsoft.VisualStudio.Premium" />
<InstallationTarget Version="[14.0]" Id="Microsoft.VisualStudio.Ultimate" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="enableopensource.pkgdef" d:Source="File" />
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" d:Source="Project" d:ProjectName="%CurrentProject%" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|CSharpCodeAnalysis|" AssemblyName="Microsoft.CodeAnalysis.CSharp, Version=0.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" d:Source="Project" d:ProjectName="CSharpCodeAnalysis" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|CSharpWorkspace|" AssemblyName="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=0.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" d:Source="Project" d:ProjectName="CSharpWorkspace" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|CodeAnalysis|" AssemblyName="Microsoft.CodeAnalysis, Version=0.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" d:Source="Project" d:ProjectName="CodeAnalysis" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|BasicCodeAnalysis|" AssemblyName="Microsoft.CodeAnalysis.VisualBasic, Version=0.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" d:Source="Project" d:ProjectName="BasicCodeAnalysis" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|BasicWorkspace|" AssemblyName="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=0.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" d:Source="Project" d:ProjectName="BasicWorkspace" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|Workspaces|" AssemblyName="Microsoft.CodeAnalysis.Workspaces, Version=0.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" d:Source="Project" d:ProjectName="Workspaces" />
</Assets>
</PackageManifest>
src/VisualStudio/Setup/AssemblyRedirects.cs
浏览文件 @ 1f31f238
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell;
using Roslyn.VisualStudio.Setup; using Roslyn.VisualStudio.Setup;
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.EditorFeatures")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.Features")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.Features.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.Workspaces")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.Workspaces.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.EditorFeatures")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.EditorFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.EditorFeatures.Text")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.EditorFeatures.Text.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Features")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Features.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.EditorFeatures")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.Features")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.Features.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.Workspaces")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Workspaces.Desktop")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Workspaces.Desktop.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Workspaces")] [assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Workspaces.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.Implementation")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.Implementation.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.VisualBasic")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.VisualBasic.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.CSharp")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.CSharp.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.SolutionExplorer")] [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.LanguageServices.SolutionExplorer.dll")]
[assembly: ProvideBindingRedirection( [assembly: ProvideBindingRedirection(
AssemblyName = "System.Reflection.Metadata", AssemblyName = "System.Reflection.Metadata",
......
src/VisualStudio/Setup/ProvideRoslynBindingRedirection.cs
浏览文件 @ 1f31f238
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using System; using System;
using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell;
using System.IO;
namespace Roslyn.VisualStudio.Setup namespace Roslyn.VisualStudio.Setup
{ {
...@@ -17,13 +18,13 @@ internal sealed class ProvideRoslynBindingRedirectionAttribute : RegistrationAtt ...@@ -17,13 +18,13 @@ internal sealed class ProvideRoslynBindingRedirectionAttribute : RegistrationAtt
// We should include CodeBase attributes so they always are loaded from this extension // We should include CodeBase attributes so they always are loaded from this extension
public const bool GenerateCodeBase = true; public const bool GenerateCodeBase = true;
public ProvideRoslynBindingRedirectionAttribute(string assemblyName) public ProvideRoslynBindingRedirectionAttribute(string fileName)
{ {
// ProvideBindingRedirectionAttribute is sealed, so we can't inherit from it to provide defaults. // ProvideBindingRedirectionAttribute is sealed, so we can't inherit from it to provide defaults.
// Instead, we'll do more of an aggregation pattern here. // Instead, we'll do more of an aggregation pattern here.
_redirectionAttribute = new ProvideBindingRedirectionAttribute _redirectionAttribute = new ProvideBindingRedirectionAttribute
{ {
AssemblyName = assemblyName, AssemblyName = Path.GetFileNameWithoutExtension(fileName),
PublicKeyToken = "31BF3856AD364E35", PublicKeyToken = "31BF3856AD364E35",
OldVersionLowerBound = "0.7.0.0", OldVersionLowerBound = "0.7.0.0",
OldVersionUpperBound = "1.2.0.0", OldVersionUpperBound = "1.2.0.0",
...@@ -39,17 +40,25 @@ public ProvideRoslynBindingRedirectionAttribute(string assemblyName) ...@@ -39,17 +40,25 @@ public ProvideRoslynBindingRedirectionAttribute(string assemblyName)
#endif #endif
GenerateCodeBase = GenerateCodeBase, GenerateCodeBase = GenerateCodeBase,
CodeBase = fileName,
}; };
} }
public override void Register(RegistrationContext context) public override void Register(RegistrationContext context)
{ {
_redirectionAttribute.Register(context); _redirectionAttribute.Register(context);
// Opt into overriding the devenv.exe.config binding redirect
using (var key = context.CreateKey(@"RuntimeConfiguration\dependentAssembly\bindingRedirection\" + _redirectionAttribute.Guid.ToString("B").ToUpperInvariant()))
{
key.SetValue("isPkgDefOverrideEnabled", true);
}
} }
public override void Unregister(RegistrationContext context) public override void Unregister(RegistrationContext context)
{ {
_redirectionAttribute.Unregister(context); _redirectionAttribute.Unregister(context);
} }
} }
} }
src/VisualStudio/SetupInteractive/AssemblyRedirects.cs 0 → 100644
浏览文件 @ 1f31f238
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Roslyn.VisualStudio.Setup;
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.CSharp.Repl.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.VisualBasic.Repl.dll")]
\ No newline at end of file
src/VisualStudio/SetupInteractive/VisualStudioSetupInteractive.csproj
浏览文件 @ 1f31f238
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<RootNamespace>Roslyn.VisualStudio.Setup.Interactive</RootNamespace> <RootNamespace>Roslyn.VisualStudio.Setup.Interactive</RootNamespace>
<AssemblyName>Roslyn.VisualStudio.Setup.Interactive</AssemblyName> <AssemblyName>Roslyn.VisualStudio.Setup.Interactive</AssemblyName>
<UseCodebase>true</UseCodebase> <UseCodebase>true</UseCodebase>
<GeneratePkgDefFile>false</GeneratePkgDefFile> <GeneratePkgDefFile>true</GeneratePkgDefFile>
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix> <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer> <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer> <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment> <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<StartAction>Program</StartAction> <StartAction>Program</StartAction>
...@@ -74,6 +74,10 @@ ...@@ -74,6 +74,10 @@
</IncludeOutputGroupsInVSIXLocalOnly> </IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
...@@ -85,6 +89,10 @@ ...@@ -85,6 +89,10 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\Setup\ProvideRoslynBindingRedirection.cs">
<Link>ProvideRoslynBindingRedirection.cs</Link>
</Compile>
<Compile Include="AssemblyRedirects.cs" />
<Compile Include="VSPackage.Designer.cs"> <Compile Include="VSPackage.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
...@@ -114,4 +122,4 @@ ...@@ -114,4 +122,4 @@
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
src/VisualStudio/SetupInteractive/source.extension.vsixmanifest
浏览文件 @ 1f31f238
...@@ -22,5 +22,6 @@ ...@@ -22,5 +22,6 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="CSharpVisualStudioRepl" Path="|CSharpVisualStudioRepl|" /> <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="CSharpVisualStudioRepl" Path="|CSharpVisualStudioRepl|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="CSharpPackageRegistration.pkgdef" /> <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="CSharpPackageRegistration.pkgdef" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="VisualBasicPackageRegistration.pkgdef" /> <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="VisualBasicPackageRegistration.pkgdef" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets> </Assets>
</PackageManifest> </PackageManifest>
\ No newline at end of file
src/VisualStudio/VisualStudioInteractiveComponents/AssemblyRedirects.cs 0 → 100644
浏览文件 @ 1f31f238
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.VisualStudio.Shell;
using Roslyn.VisualStudio.Setup;
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.Scripting.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.Scripting.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.Scripting.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.InteractiveEditorFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.CodeAnalysis.InteractiveFeatures.dll")]
[assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.InteractiveServices.dll")]
[assembly: ProvideRoslynBindingRedirection("InteractiveHost.exe")]
src/VisualStudio/VisualStudioInteractiveComponents/BindingPath.pkgdef 已删除 100644 → 0
浏览文件 @ 1e03699b
[$RootKey$\BindingPaths\{71D7D6CA-E5AD-4B4A-86CF-55F94C4A1000}]
"$PackageFolder$"=""
src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
浏览文件 @ 1f31f238
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>Roslyn.VisualStudio.InteractiveComponents</RootNamespace> <RootNamespace>Roslyn.VisualStudio.InteractiveComponents</RootNamespace>
<AssemblyName>Roslyn.VisualStudio.InteractiveComponents</AssemblyName> <AssemblyName>Roslyn.VisualStudio.InteractiveComponents</AssemblyName>
<GeneratePkgDefFile>false</GeneratePkgDefFile> <GeneratePkgDefFile>true</GeneratePkgDefFile>
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix> <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer> <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer> <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment> <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<NoDocumentationFile>true</NoDocumentationFile> <NoDocumentationFile>true</NoDocumentationFile>
...@@ -166,12 +166,17 @@ ...@@ -166,12 +166,17 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="BindingPath.pkgdef"> <Compile Include="..\Setup\ProvideRoslynBindingRedirection.cs">
<IncludeInVsix>true</IncludeInVsix> <Link>ProvideRoslynBindingRedirection.cs</Link>
<VSIXSubPath>$(PkgdefVSIXSubPath)</VSIXSubPath> </Compile>
</Content> <Compile Include="AssemblyRedirects.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
</ItemGroup> </ItemGroup>
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
src/VisualStudio/VisualStudioInteractiveComponents/source.extension.vsixmanifest
浏览文件 @ 1f31f238
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures.dll" /> <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures.dll" /> <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.InteractiveEditorFeatures.dll" /> <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.InteractiveEditorFeatures.dll" />
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="BindingPath.pkgdef" /> <Asset Type="Microsoft.VisualStudio.VsPackage" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" d:Source="Project" d:ProjectName="%CurrentProject%" />
</Assets> </Assets>
</PackageManifest> </PackageManifest>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或