Update the facades we insert for netstandard1.3 (#14139)

8d16ed15 · Andy Gocke · GitHub · 5357afd9 · 8d16ed15 · 8d16ed15
7 changed file
--- a/src/Compilers/Extension/AssemblyRedirects.cs
+++ b/src/Compilers/Extension/AssemblyRedirects.cs
@@ -8,7 +8,7 @@

 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.AppContext.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Console.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Diagnostics.FileVersionInfo.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Diagnostics.FileVersionInfo.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Diagnostics.Process.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.Compression.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.FileSystem.dll")]
@@ -19,11 +19,12 @@
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.AccessControl.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Claims.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.Algorithms.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Security.Cryptography.Encoding.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Security.Cryptography.Primitives.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Security.Cryptography.X509Certificates.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.Encoding.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.Primitives.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.X509Certificates.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Principal.Windows.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Text.Encoding.CodePages.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Text.Encoding.CodePages.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Threading.Thread.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Xml.XmlDocument.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Xml.XPath.XDocument.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XmlDocument.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XPath.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XPath.XDocument.dll")]
--- a/src/Compilers/Extension/CompilerExtension.csproj
+++ b/src/Compilers/Extension/CompilerExtension.csproj
@@ -47,7 +47,6 @@
  <ItemGroup>
    <NuGetPackageToIncludeInVsix Include="Microsoft.DiaSymReader.Native" />
    <NuGetPackageToIncludeInVsix Include="Microsoft.Win32.Primitives" />
-    <!-- Even though the VS process includes both of these, we need to also include them in the VSIX for the compiler processes -->
    <NuGetPackageToIncludeInVsix Include="System.AppContext" />
    <NuGetPackageToIncludeInVsix Include="System.Collections" />
    <NuGetPackageToIncludeInVsix Include="System.Collections.Concurrent" />

--- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
@@ -106,19 +106,27 @@ Public Class BuildDevDivInsertionFiles
        "Microsoft.DiaSymReader.Native.x86.dll",
        "System.AppContext.dll",
        "System.Console.dll",
+        "System.Diagnostics.FileVersionInfo.dll",
        "System.Diagnostics.Process.dll",
        "System.Diagnostics.StackTrace.dll",
-        "System.IO.Pipes.dll",
+        "System.IO.Compression.dll",
        "System.IO.FileSystem.dll",
        "System.IO.FileSystem.DriveInfo.dll",
        "System.IO.FileSystem.Primitives.dll",
+        "System.IO.Pipes.dll",
        "System.Runtime.InteropServices.RuntimeInformation.dll",
        "System.Security.AccessControl.dll",
        "System.Security.Claims.dll",
        "System.Security.Cryptography.Algorithms.dll",
+        "System.Security.Cryptography.Encoding.dll",
        "System.Security.Cryptography.Primitives.dll",
+        "System.Security.Cryptography.X509Certificates.dll",
        "System.Security.Principal.Windows.dll",
+        "System.Text.Encoding.CodePages.dll",
        "System.Threading.Thread.dll",
+        "System.Xml.XmlDocument.dll",
+        "System.Xml.XPath.dll",
+        "System.Xml.XPath.XDocument.dll",
        "csc.exe",
        "csc.exe.config",
        "csc.rsp",

--- a/src/Setup/DevDivPackages/Roslyn/project.json
+++ b/src/Setup/DevDivPackages/Roslyn/project.json
@@ -8,9 +8,33 @@
    "ManagedEsent": "1.9.4",
    "System.AppContext": "4.1.0",
    "System.Console": "4.0.0",
+    "System.Collections": "4.0.11",
+    "System.Collections.Concurrent": "4.0.12",
+    "System.Diagnostics.Process": "4.1.0",
+    "System.Diagnostics.Tools": "4.0.1",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
    "System.Diagnostics.StackTrace": "4.0.1",
+    "System.IO": "4.1.0",
+    "System.IO.Compression": "4.1.0",
    "System.IO.FileSystem": "4.0.1",
    "System.IO.FileSystem.Primitives": "4.0.1",
+    "System.IO.Pipes": "4.0.0",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
+    "System.Runtime.Numerics": "4.0.1",
+    "System.Security.AccessControl": "4.0.0",
+    "System.Security.Cryptography.Algorithms": "4.2.0",
+    "System.Security.Cryptography.Encoding": "4.0.0",
+    "System.Security.Cryptography.X509Certificates": "4.1.0",
+    "System.Security.Principal.Windows": "4.0.0",
+    "System.Text.Encoding": "4.0.11",
+    "System.Text.Encoding.CodePages": "4.0.1",
+    "System.Text.Encoding.Extensions": "4.0.11",
+    "System.Text.RegularExpressions": "4.1.0",
+    "System.Threading.Thread": "4.0.0",
+    "System.Xml.ReaderWriter": "4.0.11",
+    "System.Xml.XDocument": "4.0.11",
+    "System.Xml.XmlDocument": "4.0.1",
+    "System.Xml.XPath.XDocument": "4.0.1"
  },
  "frameworks": {
    "net46": {}

--- a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr
+++ b/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr
@@ -34,19 +34,27 @@ folder InstallDir:\MSBuild\15.0\Bin

    file source=$(OutputPath)\System.AppContext.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Console.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Diagnostics.FileVersionInfo.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Diagnostics.Process.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Diagnostics.StackTrace.dll vs.file.ngen=yes
-    file source=$(OutputPath)\System.IO.Pipes.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.IO.Compression.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.IO.FileSystem.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.IO.FileSystem.DriveInfo.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.IO.FileSystem.Primitives.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.IO.Pipes.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Runtime.InteropServices.RuntimeInformation.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.AccessControl.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Claims.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Cryptography.Algorithms.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Security.Cryptography.Encoding.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Cryptography.Primitives.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Security.Cryptography.X509Certificates.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Principal.Windows.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Text.Encoding.CodePages.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Threading.Thread.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Xml.XmlDocument.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Xml.XPath.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Xml.XPath.XDocument.dll vs.file.ngen=yes

 folder InstallDir:\MSBuild\15.0\Bin\amd64
    file source=$(OutputPath)\VBCSCompiler.exe vs.file.ngen=yes
@@ -79,16 +87,24 @@ folder InstallDir:\MSBuild\15.0\Bin\amd64

    file source=$(OutputPath)\System.AppContext.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Console.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Diagnostics.FileVersionInfo.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Diagnostics.Process.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Diagnostics.StackTrace.dll vs.file.ngen=yes
-    file source=$(OutputPath)\System.IO.Pipes.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.IO.Compression.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.IO.FileSystem.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.IO.FileSystem.DriveInfo.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.IO.FileSystem.Primitives.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.IO.Pipes.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Runtime.InteropServices.RuntimeInformation.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.AccessControl.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Claims.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Cryptography.Algorithms.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Security.Cryptography.Encoding.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Cryptography.Primitives.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Security.Cryptography.X509Certificates.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Security.Principal.Windows.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Text.Encoding.CodePages.dll vs.file.ngen=yes
    file source=$(OutputPath)\System.Threading.Thread.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Xml.XmlDocument.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Xml.XPath.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.Xml.XPath.XDocument.dll vs.file.ngen=yes
--- a/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr
+++ b/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr
 use vs

 package name=PortableFacades
-        version=1.1.0.0
+        version=1.2.0.0

 folder InstallDir:\Common7\IDE\PrivateAssemblies
    file source="$(NuGetPackageRoot)\System.AppContext\4.1.0\lib\net46\System.AppContext.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Console\4.0.0\lib\net46\System.Console.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Diagnostics.FileVersionInfo\4.0.0\runtimes\win\lib\net46\System.Diagnostics.FileVersionInfo.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Diagnostics.Process\4.1.0\runtimes\win\lib\net46\System.Diagnostics.Process.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Diagnostics.StackTrace\4.0.1\lib\net46\System.Diagnostics.StackTrace.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.IO.Compression\4.1.0\runtimes\win\lib\net46\System.IO.Compression.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.IO.FileSystem\4.0.1\lib\net46\System.IO.FileSystem.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.IO.FileSystem.Primitives\4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.IO.Pipes\4.0.0\runtimes\win\lib\net46\System.IO.Pipes.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Net.Security\4.0.0\runtimes\win\lib\net46\System.Net.Security.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Net.Sockets\4.1.0\lib\net46\System.Net.Sockets.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Reflection.TypeExtensions\4.1.0\lib\net46\System.Reflection.TypeExtensions.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Security.AccessControl\4.0.0\runtimes\win\lib\net46\System.Security.AccessControl.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Security.Claims\4.0.1\lib\net46\System.Security.Claims.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Security.Cryptography.Algorithms\4.2.0\runtimes\win\lib\net46\System.Security.Cryptography.Algorithms.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Security.Cryptography.Encoding\4.0.0\runtimes\win\lib\net46\System.Security.Cryptography.Encoding.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Security.Cryptography.Primitives\4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Security.Cryptography.X509Certificates\4.1.0\runtimes\win\lib\net46\System.Security.Cryptography.X509Certificates.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Security.Principal.Windows\4.0.0\runtimes\win\lib\net46\System.Security.Principal.Windows.dll" vs.file.ngen=yes
    file source="$(NuGetPackageRoot)\System.Threading.Thread\4.0.0\lib\net46\System.Threading.Thread.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Xml.XmlDocument\4.0.1\lib\net46\System.Xml.XmlDocument.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Xml.XPath\4.0.1\lib\net46\System.Xml.XPath.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Xml.XPath.XDocument\4.0.1\lib\net46\System.Xml.XPath.XDocument.dll" vs.file.ngen=yes
--- a/src/VisualStudio/Setup/AssemblyRedirects.cs
+++ b/src/VisualStudio/Setup/AssemblyRedirects.cs
@@ -36,7 +36,7 @@

 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.AppContext.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Console.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Diagnostics.FileVersionInfo.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Diagnostics.FileVersionInfo.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Diagnostics.Process.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.Compression.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.IO.FileSystem.dll")]
@@ -47,11 +47,12 @@
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.AccessControl.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Claims.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.Algorithms.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Security.Cryptography.Encoding.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Security.Cryptography.Primitives.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Security.Cryptography.X509Certificates.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.Encoding.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.Primitives.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Cryptography.X509Certificates.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Security.Principal.Windows.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Text.Encoding.CodePages.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Text.Encoding.CodePages.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Threading.Thread.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Xml.XmlDocument.dll")]
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\System.Xml.XPath.XDocument.dll")]
\ No newline at end of file
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XmlDocument.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XPath.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Xml.XPath.XDocument.dll")]
\ No newline at end of file