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

Fix issues with VSIX deployment and assembly binding in master for RTM machines

src/Compilers/Extension/CompilerExtension.csproj

@@ -21,6 +21,7 @@
     <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
     <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
+    <CopyNuGetImplementations>true</CopyNuGetImplementations>
     <StartAction>Program</StartAction>
     <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix RoslynDev /log</StartArguments>
@@ -28,8 +29,10 @@
     <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\VisualStudio\Setup\ProvideRoslynBindingRedirection.cs">

src/VisualStudio/Setup/AssemblyRedirects.cs

@@ -29,4 +29,10 @@
     OldVersionUpperBound = "1.0.99.0",
     NewVersion = "1.1.0.0",
     PublicKeyToken = "b03f5f7f11d50a3a",
-    GenerateCodeBase = ProvideRoslynBindingRedirectionAttribute.GenerateCodeBase)]
\ No newline at end of file
+    GenerateCodeBase = true)]
+
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Esent.Interop.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.DiaSymReader.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Composition.Convention.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Composition.Hosting.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Composition.TypedParts.dll")]

src/VisualStudio/Setup/ProvideRoslynBindingRedirection.cs

@@ -15,9 +15,6 @@ internal sealed class ProvideRoslynBindingRedirectionAttribute : RegistrationAtt
     {
         private readonly ProvideBindingRedirectionAttribute _redirectionAttribute;
 
-        // We should include CodeBase attributes so they always are loaded from this extension
-        public const bool GenerateCodeBase = true;
-
         public ProvideRoslynBindingRedirectionAttribute(string fileName)
         {
             // ProvideBindingRedirectionAttribute is sealed, so we can't inherit from it to provide defaults.
@@ -28,7 +25,6 @@ public ProvideRoslynBindingRedirectionAttribute(string fileName)
                 PublicKeyToken = "31BF3856AD364E35",
                 OldVersionLowerBound = "0.7.0.0",
                 OldVersionUpperBound = "1.2.0.0",
-                GenerateCodeBase = GenerateCodeBase,
                 CodeBase = fileName,
             };
         }

src/VisualStudio/VisualStudioInteractiveComponents/AssemblyRedirects.cs

@@ -16,3 +16,5 @@
 [assembly: ProvideRoslynBindingRedirection("Microsoft.VisualStudio.InteractiveServices.dll")]
 
 [assembly: ProvideRoslynBindingRedirection("InteractiveHost.exe")]
+
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.FileSystem.dll")]
\ No newline at end of file