Fix IBC data application

fa1f7f3d · Tomas Matousek · e87464c0 · fa1f7f3d · fa1f7f3d · fa1f7f3d
34 changed file
--- a/build/Targets/RepoToolset/OptimizationData.targets
+++ b/build/Targets/RepoToolset/OptimizationData.targets
@@ -24,10 +24,10 @@
  <Target Name="PostCompileBinaryModification"
          AfterTargets="CoreCompile"
          DependsOnTargets="_InitializeAssemblyOptimizationWithTargetAssembly;ApplyOptimizations"
-          Condition="'$(IsWpfTempProject)' != 'true' and Exists('$(_PreviousOptimizedFile)')"
+          Condition="'$(IsWpfTempProject)' != 'true' and '$(ApplyPartialNgenOptimization)' == 'true'"
          Inputs="$(MSBuildAllProjects);@(IntermediateAssembly)"
          Outputs="@(IntermediateAssembly);$(PostCompileBinaryModificationSentinelFile)">
-
+    
    <!-- Write out a sentinel timestamp file to prevent unnecessary work in incremental builds. -->
    <Touch AlwaysCreate="true" Files="$(PostCompileBinaryModificationSentinelFile)" />

@@ -36,7 +36,7 @@
    </ItemGroup>
  </Target>

-  <Target Name="_InitializeAssemblyOptimizationWithTargetAssembly">
+  <Target Name="_InitializeAssemblyOptimizationWithTargetAssembly">    
    <ItemGroup>
      <OptimizeAssembly Include="@(IntermediateAssembly)" PreviousOptimizedFile="$(_PreviousOptimizedFile)" />
    </ItemGroup>
@@ -75,6 +75,9 @@
             Condition="'$(_RunIbcMerge)' != 'true'" 
             Importance="normal"/>

+    <Warning Text="Optimization data expected but not found at '%(OptimizeAssembly.PreviousOptimizedFile)'"
+             Condition="'$(_RunIbcMerge)' != 'true' and !Exists(%(OptimizeAssembly.PreviousOptimizedFile))" />
+
    <Exec Command='"$(_IbcMergePath)" %(OptimizeAssembly._IbcArgs)' 
          ConsoleToMSBuild="true"
          Condition="'$(_RunIbcMerge)' == 'true'">

--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -42,6 +42,7 @@

    <ThirdPartyNoticesFilePath>$(MSBuildThisFileDirectory)..\..\src\NuGet\ThirdPartyNotices.rtf</ThirdPartyNoticesFilePath>    
    <TargetFrameworkRootPath>$(NuGetPackageRoot)\roslyntools.referenceassemblies\$(RoslynToolsReferenceAssembliesVersion)\tools\framework</TargetFrameworkRootPath>
+    <IbcOptimizationDataDir>$(NuGetPackageRoot)roslyndependencies.optimizationdata\$(RoslynDependenciesOptimizationDataVersion)\content\OptimizationData\</IbcOptimizationDataDir>

    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
    <VisualStudioReferenceMajorVersion Condition="'$(VisualStudioReferenceMajorVersion)' == ''">$(VisualStudioVersion.Substring($([System.Convert]::ToInt32(0)), $(VisualStudioVersion.IndexOf('.'))))</VisualStudioReferenceMajorVersion>

--- a/build/config/optprof.json
+++ b/build/config/optprof.json
@@ -260,7 +260,7 @@
      "assembly": "Microsoft.Build.Conversion.Core.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],
@@ -277,7 +277,7 @@
      "assembly": "Microsoft.Build.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],
@@ -294,7 +294,7 @@
      "assembly": "Microsoft.Build.Engine.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],
@@ -311,7 +311,7 @@
      "assembly": "Microsoft.Build.Framework.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],
@@ -328,7 +328,7 @@
      "assembly": "Microsoft.Build.Tasks.Core.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],
@@ -345,7 +345,7 @@
      "assembly": "Microsoft.Build.Utilities.Core.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],
@@ -362,7 +362,7 @@
      "assembly": "System.Threading.Tasks.Dataflow.dll",
      "instrumentationArguments": [
        {
-          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "relativeInstallationFolder": "MSBuild/Current/Bin",
          "instrumentationExecutable": "Common7/IDE/vsn.exe"
        }
      ],

--- a/src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj
+++ b/src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj
@@ -10,6 +10,7 @@
    <TargetFramework>netstandard2.0</TargetFramework>
    <CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
    <GenerateMicrosoftCodeAnalysisCommitHashAttribute>true</GenerateMicrosoftCodeAnalysisCommitHashAttribute>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj
+++ b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj
@@ -11,6 +11,7 @@
    <DefineConstants>$(DefineConstants);COMPILERCORE</DefineConstants>
    <CodeAnalysisRuleSet>..\CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
    <NoStdLib>true</NoStdLib>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj
+++ b/src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj
@@ -10,6 +10,7 @@
    <CodeAnalysisRuleSet>..\BasicCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
    <GenerateMicrosoftCodeAnalysisCommitHashAttribute>true</GenerateMicrosoftCodeAnalysisCommitHashAttribute>
    <RootNamespace></RootNamespace>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj
+++ b/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj
@@ -8,6 +8,7 @@
    <RootNamespace>Microsoft.CodeAnalysis.Editor.CSharp</RootNamespace>
    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
@@ -8,6 +8,7 @@
    <RootNamespace>Microsoft.CodeAnalysis.Editor</RootNamespace>
    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -9,6 +9,7 @@
    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefineConstants>$(DefineConstants);EDITOR_FEATURES</DefineConstants>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <PackageId>Microsoft.CodeAnalysis.EditorFeatures.Common</PackageId>

--- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
+++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.Text</RootNamespace>
    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj
+++ b/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj
@@ -7,7 +7,8 @@
    <OutputType>Library</OutputType>
    <TargetFramework>net472</TargetFramework>
    <RootNamespace></RootNamespace>
-    
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
+
    <!-- NuGet -->
    <IsPackable>true</IsPackable>
    <PackageDescription>

--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj
@@ -4,12 +4,12 @@
  <PropertyGroup>
    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
    <PlatformTarget>AnyCPU</PlatformTarget>
+    <TargetFramework>netstandard2.0</TargetFramework>
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
@@ -9,6 +9,7 @@
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
    <TargetFramework>net20</TargetFramework>
    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\UnicodeCharacterUtilities.cs">

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj
@@ -9,6 +9,7 @@
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
    <!-- We need to support Windows OneCore, which runs Core CLR 1.0 (Windows OneCore) -->
    <TargetFramework>netstandard1.3</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\UnicodeCharacterUtilities.cs">

--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj
@@ -10,6 +10,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFramework>netstandard2.0</TargetFramework>
    <DefineConstants>$(DefineConstants);EXPRESSIONCOMPILER</DefineConstants>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
    <Compile Include="..\..\..\..\Test\PdbUtilities\Shared\DateTimeUtilities.cs">

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
@@ -11,6 +11,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFramework>net20</TargetFramework>
    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj
@@ -9,7 +9,7 @@
    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
    <!-- We need to support Windows OneCore, which runs Core CLR 1.0 (Windows OneCore) -->
    <TargetFramework>netstandard1.3</TargetFramework>
-    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">

--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
+++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
    <TargetFramework>netstandard2.0</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
    <TargetFramework>netstandard2.0</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj
+++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <TargetFramework>netstandard2.0</TargetFramework>
    <RootNamespace></RootNamespace>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/Interactive/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures.csproj
+++ b/src/Interactive/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.Editor.CSharp</RootNamespace>
    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

--- a/src/Interactive/EditorFeatures/Core/Microsoft.CodeAnalysis.InteractiveEditorFeatures.csproj
+++ b/src/Interactive/EditorFeatures/Core/Microsoft.CodeAnalysis.InteractiveEditorFeatures.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.Editor</RootNamespace>
    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

--- a/src/Interactive/Features/Microsoft.CodeAnalysis.InteractiveFeatures.csproj
+++ b/src/Interactive/Features/Microsoft.CodeAnalysis.InteractiveFeatures.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

--- a/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.targets
+++ b/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.targets
@@ -25,6 +25,7 @@

  <Target Name="InitializeCompilerArtifacts">
    <ItemGroup>
+      
      <!-- The Roslyn built binaries must be taken from these locations because this is the location where signing occurs -->
      <CompilerArtifact Include="$(_Dlls)Microsoft.CodeAnalysis\Microsoft.CodeAnalysis.dll" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe"/>
      <CompilerArtifact Include="$(_Dlls)Microsoft.CodeAnalysis\Microsoft.DiaSymReader.Native.amd64.dll"/>
@@ -54,10 +55,16 @@
        This assembly is signed by Open key in CoreFX and MicroBuild does not support this key.
        Arcade SignTool doesn't support signing directly at this point either.
        https://github.com/dotnet/arcade/issues/1204
+        
+        We don't currently collect optimization data for the following assemblies.
      -->
-      <CompilerArtifact Include="$(_Exes)csi\net472\System.*.dll" Exclude="$(_Exes)csi\net472\System.Threading.Tasks.Extensions.dll" NgenArchitecture="all"  NgenApplication="VBCSCompiler.exe" OverwriteOptimizationData="true"/>
-
-      <CompilerArtifact Include="$(_Exes)csi\net472\System.Threading.Tasks.Extensions.dll" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteOptimizationData="false"/>
+      <_NoOptimizationData Include="$(_Exes)csi\net472\System.Threading.Tasks.Extensions.dll"/>
+      <_NoOptimizationData Include="$(_Exes)csi\net472\System.Buffers.dll"/>
+      <_NoOptimizationData Include="$(_Exes)csi\net472\System.Memory.dll"/>
+      <_NoOptimizationData Include="$(_Exes)csi\net472\System.Numerics.Vectors.dll"/>
+      
+      <CompilerArtifact Include="$(_Exes)csi\net472\System.*.dll" Exclude="@(_NoOptimizationData)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="true"/>
+      <CompilerArtifact Include="@(_NoOptimizationData)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="false"/>
    </ItemGroup>
  </Target>
 </Project>
\ No newline at end of file
--- a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
+++ b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
@@ -36,29 +36,29 @@
  <!-- 
    List of dependencies that are expected to be inserted into VS by Roslyn Insertion Tool.
    DevEnvLib is the relative path within the package of the binary that's used by devenv process.
-    This binary will get IBC data embedded if they are available for it and Optimize is not false.
+    This binary will get IBC data embedded if OverwriteNgenOptimizationData is true.
    Note - optimizing Authenticode-signed 3rd party libraries would invalidate their signature.
  -->
  <ItemGroup>
-    <ExpectedDependency Include="Humanizer.Core" DevEnvLib="lib/netstandard2.0/Humanizer.dll" Optimize="false" />
-    <ExpectedDependency Include="ICSharpCode.Decompiler" DevEnvLib="lib/netstandard2.0/ICSharpCode.Decompiler.dll" Optimize="false" />
+    <ExpectedDependency Include="Humanizer.Core" DevEnvLib="lib/netstandard2.0/Humanizer.dll"/>
+    <ExpectedDependency Include="ICSharpCode.Decompiler" DevEnvLib="lib/netstandard2.0/ICSharpCode.Decompiler.dll"/>
    <ExpectedDependency Include="Microsoft.DiaSymReader" DevEnvLib="lib/netstandard1.1/Microsoft.DiaSymReader.dll"/>
    <ExpectedDependency Include="Microsoft.CodeAnalysis.Elfie" DevEnvLib="lib/net46/Microsoft.CodeAnalysis.Elfie.dll"/>
-    <ExpectedDependency Include="System.Buffers" DevEnvLib="lib/netstandard2.0/System.Buffers.dll" />
-    <ExpectedDependency Include="System.Collections.Immutable" DevEnvLib="lib/netstandard2.0/System.Collections.Immutable.dll"/>
-    <ExpectedDependency Include="System.Reflection.Metadata" DevEnvLib="lib/netstandard2.0/System.Reflection.Metadata.dll"/>
-    <ExpectedDependency Include="System.Memory" DevEnvLib="lib/netstandard2.0/System.Memory.dll" />
-    <ExpectedDependency Include="System.Runtime.CompilerServices.Unsafe" DevEnvLib="lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll"/>
-    <ExpectedDependency Include="System.Text.Encoding.CodePages" DevEnvLib="lib/netstandard2.0/System.Text.Encoding.CodePages.dll"/>
-    <ExpectedDependency Include="System.Numerics.Vectors" DevEnvLib="lib/netstandard2.0/System.Numerics.Vectors.dll" />
+    <ExpectedDependency Include="System.Buffers" DevEnvLib="lib/netstandard2.0/System.Buffers.dll"/>
+    <ExpectedDependency Include="System.Collections.Immutable" DevEnvLib="lib/netstandard2.0/System.Collections.Immutable.dll" OverwriteNgenOptimizationData="true"/>
+    <ExpectedDependency Include="System.Reflection.Metadata" DevEnvLib="lib/netstandard2.0/System.Reflection.Metadata.dll" OverwriteNgenOptimizationData="true"/>
+    <ExpectedDependency Include="System.Memory" DevEnvLib="lib/netstandard2.0/System.Memory.dll"/>
+    <ExpectedDependency Include="System.Runtime.CompilerServices.Unsafe" DevEnvLib="lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll" OverwriteNgenOptimizationData="true"/>
+    <ExpectedDependency Include="System.Text.Encoding.CodePages" DevEnvLib="lib/netstandard2.0/System.Text.Encoding.CodePages.dll" OverwriteNgenOptimizationData="true"/>
+    <ExpectedDependency Include="System.Numerics.Vectors" DevEnvLib="lib/netstandard2.0/System.Numerics.Vectors.dll"/>

    <!-- 
-      Do not optimize this binary for now.
+      Do not overwrite optimization data for this binary for now.
      This assembly is signed by Open key in CoreFX and MicroBuild does not support this key.
      Arcade SignTool doesn't support signing directly at this point either.
      https://github.com/dotnet/arcade/issues/1204
    -->
-    <ExpectedDependency Include="System.Threading.Tasks.Extensions" DevEnvLib="lib/netstandard2.0/System.Threading.Tasks.Extensions.dll" Optimize="false" />
+    <ExpectedDependency Include="System.Threading.Tasks.Extensions" DevEnvLib="lib/netstandard2.0/System.Threading.Tasks.Extensions.dll"/>
  </ItemGroup>
  
  <Target Name="_CalculateDependenciesToInsert" DependsOnTargets="ResolveAssemblyReferences">
@@ -104,7 +104,7 @@
    <ItemGroup>
      <_Dependency>
        <_AssemblyName>$([MSBuild]::ValueOrDefault('%(_Dependency.FusionName)', '').Split(',')[0])</_AssemblyName>
-        <_AssemblyVersion>$([MSBuild]::ValueOrDefault('%(_Dependency.FusionName)', '').Split(',')[1])</_AssemblyVersion>
+        <_AssemblyVersion>$([MSBuild]::ValueOrDefault('%(_Dependency.FusionName)', '').Split(',')[1]).Split('=')[1]</_AssemblyVersion>
        <_NuGetPackageFileName>%(_Dependency.NuGetPackageId).%(_Dependency.NuGetPackageVersion).nupkg</_NuGetPackageFileName>
        <_NuGetPackageDir>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(_Dependency.NuGetPackageId)', '').ToLower())\%(_Dependency.NuGetPackageVersion)\</_NuGetPackageDir>
      </_Dependency>
@@ -135,8 +135,8 @@
        <_PreviousOptimizedFile>$([System.IO.Path]::Combine($(IbcOptimizationDataDir), '$([System.IO.Path]::GetFileNameWithoutExtension(%(_DependencyWithExpectedMetadata.DevEnvLib))).pgo'))</_PreviousOptimizedFile>
      </_DependencyWithExpectedMetadata>

-      <_DependencyWithOptimizationData Include="@(_DependencyWithExpectedMetadata)" Condition="'%(_DependencyWithExpectedMetadata.Optimize)' != 'false' and Exists(%(_DependencyWithExpectedMetadata._PreviousOptimizedFile))" />
-      <_DependencyWithoutOptimizationData Include="@(_Dependency)" Exclude="@(_DependencyWithOptimizationData)"/>
+      <_DependencyWithOptimizationData Include="@(_DependencyWithExpectedMetadata)" Condition="'%(_DependencyWithExpectedMetadata.OverwriteNgenOptimizationData)' == 'true'" />
+      <_DependencyWithoutOptimizationData Include="@(_DependencyWithExpectedMetadata)" Exclude="@(_DependencyWithOptimizationData)"/>

      <OptimizeAssembly Include="%(_DependencyWithOptimizationData._OptimizeAssembly)" PreviousOptimizedFile="%(_DependencyWithOptimizationData._PreviousOptimizedFile)" />
    </ItemGroup>

--- a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj
+++ b/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj
@@ -30,16 +30,11 @@
          DependsOnTargets="InitializeCompilerArtifacts">

    <ItemGroup>
-      <CompilerArtifact Condition="'%(CompilerArtifact.OverwriteOptimizationData)' == 'true'">
+      <CompilerArtifact Condition="'%(CompilerArtifact.OverwriteNgenOptimizationData)' == 'true'">
        <_PreviousOptimizedFile>$([System.IO.Path]::Combine($(IbcOptimizationDataDir), '$([System.IO.Path]::GetFileNameWithoutExtension(%(CompilerArtifact.Identity))).pgo'))</_PreviousOptimizedFile>
        <_OptimizeAssembly>$(IntermediateOutputPath)optimized\$([System.IO.Path]::GetFileName(%(CompilerArtifact.Identity)))</_OptimizeAssembly>
      </CompilerArtifact>

-      <CompilerArtifact Condition="!Exists(%(CompilerArtifact._PreviousOptimizedFile))">
-        <_PreviousOptimizedFile/>
-        <_OptimizeAssembly/>
-      </CompilerArtifact>
-
      <OptimizeAssembly Include="@(CompilerArtifact->'%(_OptimizeAssembly)')"
                        PreviousOptimizedFile="%(CompilerArtifact._PreviousOptimizedFile)"
                        Condition="'%(CompilerArtifact._OptimizeAssembly)' != ''" />

--- a/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
+++ b/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.VisualStudio.LanguageServices.CSharp</RootNamespace>
+    <CreateVsixContainer>false</CreateVsixContainer>
+    <GeneratePkgDefFile>true</GeneratePkgDefFile>
+    <DeployExtension>false</DeployExtension>
+    <TargetFramework>net472</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
+  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
    <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
@@ -14,17 +26,6 @@
    <ProjectReference Include="..\..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
    <ProjectReference Include="..\..\..\VisualStudio\Core\Impl\Microsoft.VisualStudio.LanguageServices.Implementation.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Microsoft.VisualStudio.LanguageServices.CSharp</RootNamespace>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <GeneratePkgDefFile>true</GeneratePkgDefFile>
-    <DeployExtension>false</DeployExtension>
-    <TargetFramework>net472</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>

--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -12,6 +12,7 @@
    <GeneratePkgDefFile>true</GeneratePkgDefFile>
    <DeployExtension>false</DeployExtension>
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
+++ b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Text\Microsoft.CodeAnalysis.EditorFeatures.Text.csproj" />
-    <ProjectReference Include="..\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
-  </ItemGroup>
  <PropertyGroup>
    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -16,7 +8,16 @@
    <RootNamespace>Microsoft.VisualStudio.LanguageServices.Implementation</RootNamespace>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
+    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
+    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
+    <ProjectReference Include="..\..\..\EditorFeatures\Text\Microsoft.CodeAnalysis.EditorFeatures.Text.csproj" />
+    <ProjectReference Include="..\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
+  </ItemGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>

--- a/src/VisualStudio/Core/SolutionExplorerShim/Microsoft.VisualStudio.LanguageServices.SolutionExplorer.csproj
+++ b/src/VisualStudio/Core/SolutionExplorerShim/Microsoft.VisualStudio.LanguageServices.SolutionExplorer.csproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.VisualStudio.LanguageServices.SolutionExplorer</RootNamespace>
    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

--- a/src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj
+++ b/src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj
@@ -10,6 +10,7 @@
    <DeployExtension>false</DeployExtension>
    <TargetFramework>net472</TargetFramework>
    <RootNamespace></RootNamespace>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />

--- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
+++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
@@ -8,7 +8,8 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFramework>netstandard2.0</TargetFramework>
-    
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>
+
    <!-- NuGet -->
    <IsPackable>true</IsPackable>
    <PackageDescription>

--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
@@ -9,6 +9,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFramework>netstandard2.0</TargetFramework>
    <DefineConstants>$(DefineConstants);WORKSPACE</DefineConstants>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>

--- a/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj
+++ b/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj
@@ -7,6 +7,7 @@
    <OutputType>Library</OutputType>
    <TargetFramework>netstandard2.0</TargetFramework>
    <RootNamespace></RootNamespace>
+    <ApplyNgenOptimizationData>true</ApplyNgenOptimizationData>

    <!-- NuGet -->
    <IsPackable>true</IsPackable>