Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

提交 19d6d5ff 编写于 作者: T Tanner Gooding 提交者： GitHub
浏览文件
操作

Merge pull request #14879 from tmat/SRM141 

Update Roslyn dependencies to CoreFX 1.1 packages, specifically System.Reflection.Metadata 1.4.1
上级 9ae8d8bf 76b7bab6
展开全部 隐藏空白更改
内联 并排
Showing with 930 addition and 740 deletion
build/Defaults/Desktop/app.config
浏览文件 @ 19d6d5ff
......@@ -3,7 +3,6 @@
<!-- The default app.config for test projects that do not specify one -->
<configuration>
<appSettings>
<add key="xunit.appDomain" value="denied"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
......@@ -19,7 +18,51 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipes" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
......
build/Defaults/Portable/app.config
浏览文件 @ 19d6d5ff
......@@ -3,7 +3,6 @@
<!-- The default app.config for desktop portable test projects that do not specify one -->
<configuration>
<appSettings>
<add key="xunit.appDomain" value="denied"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
......@@ -19,7 +18,51 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipes" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
......
build/MSBuildToolset/project.json
浏览文件 @ 19d6d5ff
......@@ -14,7 +14,7 @@
"Microsoft.Net.Compilers.netcore": "2.0.0-rc2-61102-09",
"Microsoft.NuGet.Build.Tasks": "0.1.0",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-rc2-61102-09",
"Microsoft.NETCore.TestHost": "1.0.0",
"Microsoft.NETCore.TestHost": "1.1.0",
"Microsoft.NETCore.App": "1.1.0",
"Microsoft.Portable.Targets": "0.1.1-dev",
"Newtonsoft.Json": "8.0.3"
......
build/Targets/Dependencies.props
浏览文件 @ 19d6d5ff
......@@ -18,75 +18,76 @@
<MicrosoftCompositionVersion>1.0.27</MicrosoftCompositionVersion>
<MicrosoftDiagnosticsRuntimeVersion>0.8.31-beta</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>1.0.35</MicrosoftDiagnosticsTracingTraceEventVersion>
<MicrosoftDiaSymReaderVersion>1.1.0-beta1-60625-03</MicrosoftDiaSymReaderVersion>
<MicrosoftDiaSymReaderVersion>1.1.0-beta1-60818-02</MicrosoftDiaSymReaderVersion>
<MicrosoftDiaSymReaderNativeVersion>1.5.0-beta1</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.2.0-beta1-60831-01</MicrosoftDiaSymReaderPortablePdbVersion>
<MicrosoftVisualBasicVersion>10.0.1</MicrosoftVisualBasicVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.2.0-beta1-61104-02</MicrosoftDiaSymReaderPortablePdbVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>1.1.0</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
<RoslynToolsMicrosoftLocateVSVersion>0.2.2-beta</RoslynToolsMicrosoftLocateVSVersion>
<RoslynToolsMicrosoftSignToolVersion>0.2.2-beta</RoslynToolsMicrosoftSignToolVersion>
<RoslynToolsMicrosoftVSIXExpInstallerVersion>0.2.2-beta</RoslynToolsMicrosoftVSIXExpInstallerVersion>
<SystemAppContextVersion>4.1.0</SystemAppContextVersion>
<SystemCollectionsVersion>4.0.11</SystemCollectionsVersion>
<SystemCollectionsConcurrentVersion>4.0.12</SystemCollectionsConcurrentVersion>
<SystemCollectionsImmutableVersion>1.2.0</SystemCollectionsImmutableVersion>
<SystemConsoleVersion>4.0.0</SystemConsoleVersion>
<SystemDiagnosticsContractsVersion>4.0.1</SystemDiagnosticsContractsVersion>
<SystemDiagnosticsDebugVersion>4.0.11</SystemDiagnosticsDebugVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemDiagnosticsProcessVersion>4.1.0</SystemDiagnosticsProcessVersion>
<SystemDiagnosticsStackTraceVersion>4.0.1</SystemDiagnosticsStackTraceVersion>
<SystemDiagnosticsToolsVersion>4.0.1</SystemDiagnosticsToolsVersion>
<SystemDiagnosticsTraceSourceVersion>4.0.0</SystemDiagnosticsTraceSourceVersion>
<SystemDynamicRuntimeVersion>4.0.11</SystemDynamicRuntimeVersion>
<SystemGlobalizationVersion>4.0.11</SystemGlobalizationVersion>
<SystemAppContextVersion>4.3.0</SystemAppContextVersion>
<SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
<SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion>
<SystemCollectionsImmutableVersion>1.3.0</SystemCollectionsImmutableVersion>
<SystemConsoleVersion>4.3.0</SystemConsoleVersion>
<SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion>
<SystemDiagnosticsDebugVersion>4.3.0</SystemDiagnosticsDebugVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.3.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
<SystemDiagnosticsStackTraceVersion>4.3.0</SystemDiagnosticsStackTraceVersion>
<SystemDiagnosticsToolsVersion>4.3.0</SystemDiagnosticsToolsVersion>
<SystemDiagnosticsTraceSourceVersion>4.3.0</SystemDiagnosticsTraceSourceVersion>
<SystemDynamicRuntimeVersion>4.3.0</SystemDynamicRuntimeVersion>
<SystemGlobalizationVersion>4.3.0</SystemGlobalizationVersion>
<SystemIdentityModelTokensJwtVersion>5.0.0</SystemIdentityModelTokensJwtVersion>
<SystemIOVersion>4.1.0</SystemIOVersion>
<SystemIOCompressionVersion>4.1.0</SystemIOCompressionVersion>
<SystemIOVersion>4.3.0</SystemIOVersion>
<SystemIOCompressionVersion>4.3.0</SystemIOCompressionVersion>
<SystemIOCompressionZipFileVersion>4.0.1</SystemIOCompressionZipFileVersion>
<SystemIOFileSystemVersion>4.0.1</SystemIOFileSystemVersion>
<SystemIOFileSystemDriveInfoVersion>4.0.0</SystemIOFileSystemDriveInfoVersion>
<SystemIOFileSystemPrimitivesVersion>4.0.1</SystemIOFileSystemPrimitivesVersion>
<SystemIOFileSystemWatcherVersion>4.0.0</SystemIOFileSystemWatcherVersion>
<SystemIOPipesVersion>4.0.0</SystemIOPipesVersion>
<SystemLinqVersion>4.1.0</SystemLinqVersion>
<SystemLinqExpressionsVersion>4.1.0</SystemLinqExpressionsVersion>
<SystemLinqParallelVersion>4.0.1</SystemLinqParallelVersion>
<SystemNetNameResolutionVersion>4.0.0</SystemNetNameResolutionVersion>
<SystemNetSecurityVersion>4.0.0</SystemNetSecurityVersion>
<SystemNetSocketsVersion>4.1.0</SystemNetSocketsVersion>
<SystemObjectModelVersion>4.0.10</SystemObjectModelVersion>
<SystemReflectionVersion>4.1.0</SystemReflectionVersion>
<SystemReflectionExtensionsVersion>4.0.1</SystemReflectionExtensionsVersion>
<SystemReflectionMetadataVersion>1.4.1-beta-24430-01</SystemReflectionMetadataVersion>
<SystemReflectionPrimitivesVersion>4.0.1</SystemReflectionPrimitivesVersion>
<SystemReflectionTypeExtensionsVersion>4.1.0</SystemReflectionTypeExtensionsVersion>
<SystemResourcesResourceManagerVersion>4.0.1</SystemResourcesResourceManagerVersion>
<SystemRuntimeVersion>4.1.0</SystemRuntimeVersion>
<SystemRuntimeExtensionsVersion>4.1.0</SystemRuntimeExtensionsVersion>
<SystemRuntimeHandlesVersion>4.0.1</SystemRuntimeHandlesVersion>
<SystemRuntimeInteropServicesVersion>4.1.0</SystemRuntimeInteropServicesVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.0.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemRuntimeLoaderVersion>4.0.0</SystemRuntimeLoaderVersion>
<SystemRuntimeNumericsVersion>4.0.1</SystemRuntimeNumericsVersion>
<SystemSecurityAccessControlVersion>4.0.0</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.2.0</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyEncodingVersion>4.0.0</SystemSecurityCryptographyEncodingVersion>
<SystemSecurityCryptographyX509CertificatesVersion>4.1.0</SystemSecurityCryptographyX509CertificatesVersion>
<SystemSecurityPrincipalWindowsVersion>4.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingVersion>4.0.11</SystemTextEncodingVersion>
<SystemTextEncodingCodePagesVersion>4.0.1</SystemTextEncodingCodePagesVersion>
<SystemTextEncodingExtensionsVersion>4.0.11</SystemTextEncodingExtensionsVersion>
<SystemTextRegularExpressionsVersion>4.1.0</SystemTextRegularExpressionsVersion>
<SystemThreadingVersion>4.0.11</SystemThreadingVersion>
<SystemThreadingTasksVersion>4.0.11</SystemThreadingTasksVersion>
<SystemThreadingTasksParallelVersion>4.0.1</SystemThreadingTasksParallelVersion>
<SystemThreadingThreadVersion>4.0.0</SystemThreadingThreadVersion>
<SystemValueTupleVersion>4.0.1-beta-24425-02</SystemValueTupleVersion>
<SystemXmlReaderWriterVersion>4.0.11</SystemXmlReaderWriterVersion>
<SystemXmlXDocumentVersion>4.0.11</SystemXmlXDocumentVersion>
<SystemXmlXmlDocumentVersion>4.0.1</SystemXmlXmlDocumentVersion>
<SystemXmlXmlSerializerVersion>4.0.11</SystemXmlXmlSerializerVersion>
<SystemXmlXPathXDocumentVersion>4.0.1</SystemXmlXPathXDocumentVersion>
<SystemIOFileSystemVersion>4.3.0</SystemIOFileSystemVersion>
<SystemIOFileSystemDriveInfoVersion>4.3.0</SystemIOFileSystemDriveInfoVersion>
<SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
<SystemIOFileSystemWatcherVersion>4.3.0</SystemIOFileSystemWatcherVersion>
<SystemIOPipesVersion>4.3.0</SystemIOPipesVersion>
<SystemLinqVersion>4.3.0</SystemLinqVersion>
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
<SystemLinqParallelVersion>4.3.0</SystemLinqParallelVersion>
<SystemNetNameResolutionVersion>4.3.0</SystemNetNameResolutionVersion>
<SystemNetSecurityVersion>4.3.0</SystemNetSecurityVersion>
<SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
<SystemObjectModelVersion>4.3.0</SystemObjectModelVersion>
<SystemReflectionVersion>4.3.0</SystemReflectionVersion>
<SystemReflectionExtensionsVersion>4.3.0</SystemReflectionExtensionsVersion>
<SystemReflectionMetadataVersion>1.4.1</SystemReflectionMetadataVersion>
<SystemReflectionPrimitivesVersion>4.3.0</SystemReflectionPrimitivesVersion>
<SystemReflectionTypeExtensionsVersion>4.3.0</SystemReflectionTypeExtensionsVersion>
<SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion>
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
<SystemRuntimeExtensionsVersion>4.3.0</SystemRuntimeExtensionsVersion>
<SystemRuntimeHandlesVersion>4.3.0</SystemRuntimeHandlesVersion>
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
<SystemRuntimeNumericsVersion>4.3.0</SystemRuntimeNumericsVersion>
<SystemSecurityAccessControlVersion>4.3.0</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyEncodingVersion>4.3.0</SystemSecurityCryptographyEncodingVersion>
<SystemSecurityCryptographyX509CertificatesVersion>4.3.0</SystemSecurityCryptographyX509CertificatesVersion>
<SystemSecurityPrincipalWindowsVersion>4.3.0</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingVersion>4.3.0</SystemTextEncodingVersion>
<SystemTextEncodingCodePagesVersion>4.3.0</SystemTextEncodingCodePagesVersion>
<SystemTextEncodingExtensionsVersion>4.3.0</SystemTextEncodingExtensionsVersion>
<SystemTextRegularExpressionsVersion>4.3.0</SystemTextRegularExpressionsVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksVersion>4.3.0</SystemThreadingTasksVersion>
<SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
<SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>
<SystemXmlReaderWriterVersion>4.3.0</SystemXmlReaderWriterVersion>
<SystemXmlXDocumentVersion>4.3.0</SystemXmlXDocumentVersion>
<SystemXmlXmlDocumentVersion>4.3.0</SystemXmlXmlDocumentVersion>
<SystemXmlXmlSerializerVersion>4.3.0</SystemXmlXmlSerializerVersion>
<SystemXmlXPathXDocumentVersion>4.3.0</SystemXmlXPathXDocumentVersion>
<xunitVersion>2.1.0</xunitVersion>
<xunitassertVersion>2.1.0</xunitassertVersion>
<xunitconsolenetcoreVersion>1.0.2-prerelease-00104</xunitconsolenetcoreVersion>
......
build/Targets/GenerateCompilerExecutableBindingRedirects.targets
浏览文件 @ 19d6d5ff
......@@ -17,16 +17,41 @@
<SuggestedBindingRedirects Include="Microsoft.CodeAnalysis.VisualBasic, Version=0.0.0.0, Culture=neutral, PublicKeyToken=$(PublicKeyToken)">
<MaxVersion>$(AssemblyVersion)</MaxVersion>
</SuggestedBindingRedirects>
<!-- System.Collections.Immutable and System.Reflection.Metadata have a package version that is only three parts instead
of the normal four (such as 1.2.0 instead of 1.2.0.0). Binding redirects that do not have exactly four version parts
are ignored and as such, we need the special handling below to ensure we end up with four parts to the build version. -->
<!-- Please note that this will break if the package version is ever changed from 3 parts. A better, but much more complicated
fix would be to check the number of version parts detected and adjust appropriately. -->
<SuggestedBindingRedirects Include="System.Collections.Immutable, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(SystemCollectionsImmutableVersion.Split('-')[0]).0</MaxVersion>
<MaxVersion>1.2.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Console, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Diagnostics.FileVersionInfo, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Diagnostics.StackTrace, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.3.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.IO.Compression, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<MaxVersion>4.1.2.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.IO.FileSystem, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.2.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.IO.FileSystem.Primitives, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.2.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.IO.Pipes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Reflection.Metadata, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>$(SystemReflectionMetadataVersion.Split('-')[0]).0</MaxVersion>
<MaxVersion>1.4.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Threading.Thread, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Security.Cryptography.Primitives, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.1.0</MaxVersion>
</SuggestedBindingRedirects>
<SuggestedBindingRedirects Include="System.Security.Principal.Windows, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<MaxVersion>4.0.1.0</MaxVersion>
</SuggestedBindingRedirects>
</ItemGroup>
</Project>
build/ToolsetPackages/project.json
浏览文件 @ 19d6d5ff
......@@ -4,7 +4,7 @@
"MicroBuild.Core.Sentinel": "1.0.0",
"MicroBuild.Core": "0.2.0",
"MicroBuild.Plugins.SwixBuild": "1.0.101",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.DiaSymReader.Native": "1.5.0-beta1",
"Microsoft.Net.Compilers": "2.0.0-rc2-61102-09",
"Microsoft.Net.RoslynDiagnostics": "1.2.0-beta2",
......
build/bootstrap/VBCSCompiler.exe.config
浏览文件 @ 19d6d5ff
......@@ -17,12 +17,48 @@
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipes" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
......
build/bootstrap/csc.exe.config
浏览文件 @ 19d6d5ff
......@@ -17,12 +17,48 @@
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipes" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
......
build/bootstrap/vbc.exe.config
浏览文件 @ 19d6d5ff
......@@ -17,12 +17,48 @@
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipes" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
......
build/config/RepoUtilData.json
浏览文件 @ 19d6d5ff
......@@ -41,7 +41,8 @@
"xunit",
"RoslynTools.*",
"^Microsoft.?Build.*",
"GitLink"
"GitLink",
"Microsoft.NETCore.Runtime.CoreCLR"
]
}
},
......
build/config/SignToolData.json
浏览文件 @ 19d6d5ff
......@@ -138,6 +138,7 @@
"System.Text.Encoding.CodePages.dll",
"System.Threading.Thread.dll",
"System.ValueTuple.dll",
"System.Xml.ReaderWriter.dll",
"System.Xml.XmlDocument.dll",
"System.Xml.XPath.XDocument.dll",
"Microsoft.VisualStudio.Threading.resources.dll",
......
build/scripts/crossgen.sh
浏览文件 @ 19d6d5ff
......@@ -24,10 +24,10 @@ if [ -z "$RID" ]; then
fi
fi
VERSIONS_TARGETS=$CONTAINING_DIR/../Targets/VSL.Versions.targets
CORECLR_VERSION_SUFFIX="$(grep -o '<CoreClrVersionSuffix>.*</CoreClrVersionSuffix>' $VERSIONS_TARGETS | sed 's/ *<\/*CoreClrVersionSuffix> *//g')"
DEPENDENCIES=$CONTAINING_DIR/../Targets/Dependencies.props
CORECLR_VERSION="$(grep -o '<MicrosoftNETCoreRuntimeCoreCLRVersion>.*</MicrosoftNETCoreRuntimeCoreCLRVersion>' $DEPENDENCIES | sed 's/ *<\/*MicrosoftNETCoreRuntimeCoreCLRVersion> *//g')"
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2$CORECLR_VERSION_SUFFIX/tools/crossgen
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/$CORECLR_VERSION/tools/crossgen
cd $BIN_DIR
......
src/Compilers/CSharp/Portable/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.Linq.Expressions": "4.1.0",
"System.Threading.Tasks.Parallel": "4.0.1"
"System.Linq.Expressions": "4.3.0",
"System.Threading.Tasks.Parallel": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
......
src/Compilers/CSharp/Test/Emit/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/Compilers/Core/CodeAnalysisTest/AnalyzerFileReferenceTests.cs
浏览文件 @ 19d6d5ff
......@@ -180,6 +180,7 @@ public void TestLoadErrors3()
public void TestAnalyzerLoading()
{
var dir = Temp.CreateDirectory();
dir.CopyFile(typeof(AppDomainUtils).Assembly.Location);
var test = dir.CopyFile(typeof(FromFileLoader).Assembly.Location);
var analyzerFile = TestHelpers.CreateCSharpAnalyzerAssemblyWithTestAnalyzer(dir, "MyAnalyzer");
var loadDomain = AppDomainUtils.Create("AnalyzerTestDomain", basePath: dir.Path);
......@@ -216,12 +217,12 @@ public class TestAnalyzer : DiagnosticAnalyzer
var dir = Temp.CreateDirectory();
var metadata = dir.CopyFile(typeof(System.Reflection.Metadata.MetadataReader).Assembly.Location);
dir.CopyFile(typeof(System.Reflection.Metadata.MetadataReader).Assembly.Location);
dir.CopyFile(typeof(AppDomainUtils).Assembly.Location);
var immutable = dir.CopyFile(typeof(ImmutableArray).Assembly.Location);
var analyzer = dir.CopyFile(typeof(DiagnosticAnalyzer).Assembly.Location);
var test = dir.CopyFile(typeof(FromFileLoader).Assembly.Location);
var filesystem = dir.CreateFile("System.IO.FileSystem.dll").WriteAllBytes(
TestResources.NetFX.v4_6_1038_0.Facades.System_IO_FileSystem);
dir.CopyFile(Path.Combine(Path.GetDirectoryName(typeof(CSharp.CSharpCompilation).Assembly.Location), "System.IO.FileSystem.dll"));
var analyzerCompilation = CSharp.CSharpCompilation.Create(
"MyAnalyzer",
......
src/Compilers/Core/MSBuildTask/AssemblyResolution.cs 0 → 100644
浏览文件 @ 19d6d5ff
// 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.Utilities;
using System;
using System.IO;
using System.Reflection;
namespace Microsoft.CodeAnalysis.BuildTasks
{
// TODO: Remove once https://github.com/Microsoft/msbuild/issues/1309 is fixed.
/// <summary>
/// msbuild currently doesn't support specifying binding redirects per custom task thru a config file.
/// Each task needs to handle version redirection of its dependencies manually.
/// </summary>
internal static class AssemblyResolution
{
static AssemblyResolution()
{
CorLightup.Desktop.AddAssemblyResolveHandler(ResolveAssembly);
}
public static void Install()
{
// empty, just to trigger static ctor
}
internal static Assembly ResolveAssembly(string assemblyDisplayName, Assembly requestingAssemblyOpt)
{
var name = new AssemblyName(assemblyDisplayName);
return TryRedirect(name) ? Assembly.Load(name) : null;
}
private static readonly byte[] s_b03f5f7f11d50a3a = new byte[] { 0xb0, 0x3f, 0x5f, 0x7f, 0x11, 0xd5, 0x0a, 0x3a };
private static readonly byte[] s_b77a5c561934e089 = new byte[] { 0xb7, 0x7a, 0x5c, 0x56, 0x19, 0x34, 0xe0, 0x89 };
private static bool TryRedirect(AssemblyName name)
{
switch (name.Name)
{
case "System.IO.Compression":
return TryRedirect(name, s_b77a5c561934e089, 4, 1, 2, 0);
case "System.Console":
case "System.Diagnostics.FileVersionInfo":
case "System.IO.Pipes":
case "System.Security.Cryptography.Primitives":
case "System.Security.Principal.Windows":
case "System.Threading.Thread":
return TryRedirect(name, s_b03f5f7f11d50a3a, 4, 0, 1, 0);
case "System.IO.FileSystem":
case "System.IO.FileSystem.Primitives":
return TryRedirect(name, s_b03f5f7f11d50a3a, 4, 0, 2, 0);
case "System.Diagnostics.StackTrace":
return TryRedirect(name, s_b03f5f7f11d50a3a, 4, 0, 3, 0);
}
return false;
}
private static bool TryRedirect(AssemblyName name, byte[] token, int major, int minor, int revision, int build)
{
var version = new Version(major, minor, revision, build);
if (KeysEqual(name.GetPublicKeyToken(), token) && name.Version < version)
{
name.Version = version;
return true;
}
return false;
}
private static bool KeysEqual(byte[] left, byte[] right)
{
if (left.Length != right.Length)
{
return false;
}
for (var i = 0; i < left.Length; i++)
{
if (left[i] != right[i])
{
return false;
}
}
return true;
}
}
}
\ No newline at end of file
src/Compilers/Core/MSBuildTask/MSBuildTask.csproj
浏览文件 @ 19d6d5ff
......@@ -15,8 +15,10 @@
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<None Include="Microsoft.CSharp.Core.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......@@ -31,6 +33,9 @@
<Compile Include="..\..\Shared\BuildServerConnection.cs">
<Link>BuildServerConnection.cs</Link>
</Compile>
<Compile Include="..\Portable\CorLightup.cs">
<Link>CorLightup.cs</Link>
</Compile>
<Compile Include="..\Portable\InternalUtilities\CommandLineUtilities.cs">
<Link>CommandLineUtilities.cs</Link>
</Compile>
......@@ -40,9 +45,13 @@
<Compile Include="..\Portable\InternalUtilities\IReadOnlySet.cs">
<Link>IReadOnlySet.cs</Link>
</Compile>
<Compile Include="..\Portable\InternalUtilities\ReflectionUtilities.cs">
<Link>ReflectionUtilities.cs</Link>
</Compile>
<Compile Include="..\Portable\InternalUtilities\UnicodeCharacterUtilities.cs">
<Link>UnicodeCharacterUtilities.cs</Link>
</Compile>
<Compile Include="AssemblyResolution.cs" />
<Compile Include="CanonicalError.cs" />
<Compile Include="ValidateBootstrap.cs" />
<Compile Include="CommandLineBuilderExtension.cs" />
......
src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
浏览文件 @ 19d6d5ff
......@@ -26,6 +26,11 @@ public abstract class ManagedCompiler : ToolTask
internal abstract RequestLanguage Language { get; }
static ManagedCompiler()
{
AssemblyResolution.Install();
}
public ManagedCompiler()
{
TaskResources = ErrorString.ResourceManager;
......
src/Compilers/Core/MSBuildTask/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"Microsoft.Build": "14.3.0",
"Microsoft.Build.Tasks.Core": "14.3.0",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"Microsoft.Win32.Primitives": "4.0.1",
"System.AppContext": "4.1.0",
"System.Console": "4.0.0",
"System.Diagnostics.Process": "4.1.0",
"System.Diagnostics.Tools": "4.0.1",
"System.IO.FileSystem": "4.0.1",
"System.IO.FileSystem.DriveInfo": "4.0.0",
"System.IO.Pipes": "4.0.0",
"System.Linq": "4.1.0",
"System.Reflection": "4.1.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Security.AccessControl": "4.0.0",
"System.Security.Cryptography.Algorithms": "4.2.0",
"System.Security.Principal.Windows": "4.0.0",
"System.Text.Encoding": "4.0.11",
"System.Text.Encoding.Extensions": "4.0.11",
"System.Text.RegularExpressions": "4.1.0",
"System.Threading.Thread": "4.0.0"
"Microsoft.Win32.Primitives": "4.3.0",
"System.AppContext": "4.3.0",
"System.Console": "4.3.0",
"System.Diagnostics.Process": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.IO.FileSystem.DriveInfo": "4.3.0",
"System.IO.Pipes": "4.3.0",
"System.Linq": "4.3.0",
"System.Reflection": "4.3.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
"System.Security.AccessControl": "4.3.0",
"System.Security.Cryptography.Algorithms": "4.3.0",
"System.Security.Principal.Windows": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Text.Encoding.Extensions": "4.3.0",
"System.Text.RegularExpressions": "4.3.0",
"System.Threading.Thread": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Compilers/Core/MSBuildTaskTests/project.json
浏览文件 @ 19d6d5ff
......@@ -2,7 +2,7 @@
"dependencies": {
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239",
"System.Collections.Immutable": "1.2.0",
"System.Collections.Immutable": "1.3.0",
"Microsoft.Build": "14.3.0",
"Moq": "4.2.1402.2112"
},
......
src/Compilers/Core/Portable/project.json
浏览文件 @ 19d6d5ff
{
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Collections.Immutable": "1.2.0",
"System.Collections": "4.0.11",
"System.Collections.Concurrent": "4.0.12",
"System.Diagnostics.Tools": "4.0.1",
"System.Diagnostics.FileVersionInfo": "4.0.0",
"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.Reflection.Metadata": "1.4.1-beta-24430-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Runtime.Numerics": "4.0.1",
"System.Security.Cryptography.Algorithms": "4.2.0",
"System.Security.Cryptography.Encoding": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.1.0",
"System.Text.Encoding": "4.0.11",
"System.Text.Encoding.CodePages": "4.0.1",
"System.Text.Encoding.Extensions": "4.0.11",
"System.ValueTuple": "4.0.1-beta-24425-02",
"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"
"System.Collections.Immutable": "1.3.0",
"System.Collections": "4.3.0",
"System.Collections.Concurrent": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.Diagnostics.FileVersionInfo": "4.3.0",
"System.IO": "4.3.0",
"System.IO.Compression": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.IO.FileSystem.Primitives": "4.3.0",
"System.Reflection.Metadata": "1.4.1",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
"System.Runtime.Numerics": "4.3.0",
"System.Security.Cryptography.Algorithms": "4.3.0",
"System.Security.Cryptography.Encoding": "4.3.0",
"System.Security.Cryptography.X509Certificates": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Text.Encoding.CodePages": "4.3.0",
"System.Text.Encoding.Extensions": "4.3.0",
"System.ValueTuple": "4.3.0",
"System.Xml.ReaderWriter": "4.3.0",
"System.Xml.XDocument": "4.3.0",
"System.Xml.XmlDocument": "4.3.0",
"System.Xml.XPath.XDocument": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
......
src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
浏览文件 @ 19d6d5ff
......@@ -87,7 +87,6 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
......
src/Compilers/Server/VBCSCompilerTests/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="denied"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
</startup>
</configuration>
src/Compilers/Server/VBCSCompilerTests/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.Build": "14.3.0",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"Moq": "4.2.1402.2112",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
......
src/Compilers/Test/Resources/Core/project.json
浏览文件 @ 19d6d5ff
......@@ -2,7 +2,7 @@
"supports": { },
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Xml.ReaderWriter": "4.0.11"
"System.Xml.ReaderWriter": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
......
src/Compilers/VisualBasic/Portable/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.Threading.Tasks.Parallel": "4.0.1"
"System.Threading.Tasks.Parallel": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
......
src/Compilers/VisualBasic/Test/Emit/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
浏览文件 @ 19d6d5ff
......@@ -450,7 +450,6 @@
<Compile Include="TypeInferrer\TypeInferrerTests.Delegate.cs" />
<Compile Include="TypeInferrer\TypeInferrerTests.cs" />
<Compile Include="Workspaces\WorkspaceTests.cs" />
<None Include="app.config" />
<None Include="project.json" />
<None Include="PerfTests\CSharpPerfFindRefs.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
src/EditorFeatures/CSharpTest/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
src/EditorFeatures/Core/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"System.Collections.Immutable": "1.2.0",
"System.Collections.Immutable": "1.3.0",
"Microsoft.VisualStudio.InteractiveWindow": {
"version": "2.0.0-beta5-60820-04",
"suppressParent": "all"
......
src/EditorFeatures/Next/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
......@@ -11,7 +11,7 @@
"Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
"Roslyn.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
"System.Collections.Immutable": "1.2.0",
"System.Collections.Immutable": "1.3.0",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": {
"version": "14.3.25407",
"suppressParent": "all"
......
src/EditorFeatures/Test/EditorServicesTest.csproj
浏览文件 @ 19d6d5ff
......@@ -245,7 +245,6 @@
<Compile Include="Workspaces\WorkspaceTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
<None Include="PerfTests\ResetRoslynOptions.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
src/EditorFeatures/Test/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
src/EditorFeatures/Test2/EditorServicesTest2.vbproj
浏览文件 @ 19d6d5ff
......@@ -322,7 +322,6 @@
<Folder Include="My Project\" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
......
src/EditorFeatures/Test2/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj
浏览文件 @ 19d6d5ff
......@@ -577,7 +577,6 @@
<Compile Include="Utilities\CodeSnippets.vb" />
<Compile Include="Utils.vb" />
<EmbeddedResource Include="Formatting\XmlLiterals.resx" />
<None Include="app.config" />
<None Include="project.json" />
<None Include="PerfTests\BasicPerfFindRefs.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
src/EditorFeatures/VisualBasicTest/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03"
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02"
},
"frameworks": {
"netstandard1.3": {
......
src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Collections.Immutable": "1.2.0",
"System.Reflection.Metadata": "1.4.1-beta-24430-01",
"System.Collections.Immutable": "1.3.0",
"System.Reflection.Metadata": "1.4.1",
"Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
},
"frameworks": {
......
src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.Collections.Immutable": "1.2.0",
"System.Collections.Immutable": "1.3.0",
"Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
......
src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/Features/Core/Portable/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.Reflection": "4.1.0"
"System.Reflection": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Interactive/CsiCore/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"System.ValueTuple": "4.0.1-beta-24425-02"
"System.ValueTuple": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Interactive/HostTest/InteractiveHostTest.csproj
浏览文件 @ 19d6d5ff
......@@ -160,7 +160,6 @@
<Compile Include="SynchronizedTextWriter.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
......
src/Interactive/HostTest/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
</configuration>
src/Interactive/VbiCore/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"System.ValueTuple": "4.0.1-beta-24425-02"
"System.ValueTuple": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Interactive/csi/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.ValueTuple": "4.0.1-beta-24425-02"
"System.ValueTuple": "4.3.0"
},
"frameworks": {
"net46": {}
......
src/Interactive/vbi/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.ValueTuple": "4.0.1-beta-24425-02"
"System.ValueTuple": "4.3.0"
},
"frameworks": {
"net46": {}
......
src/NuGet/Microsoft.Net.Compilers.nuspec
浏览文件 @ 19d6d5ff
......@@ -71,6 +71,7 @@ Supported Platforms:
<file src="Exes\Toolset\System.Text.Encoding.CodePages.dll" target="tools" />
<file src="Exes\Toolset\System.Threading.Thread.dll" target="tools" />
<file src="Exes\Toolset\System.ValueTuple.dll" target="tools" />
<file src="Exes\Toolset\System.Xml.ReaderWriter.dll" target="tools" />
<file src="Exes\Toolset\System.Xml.XmlDocument.dll" target="tools" />
<file src="Exes\Toolset\System.Xml.XPath.dll" target="tools" />
<file src="Exes\Toolset\System.Xml.XPath.XDocument.dll" target="tools" />
......
src/Scripting/CSharp/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.CSharp": "4.0.1",
"System.Dynamic.Runtime": "4.0.11"
"Microsoft.CSharp": "4.3.0",
"System.Dynamic.Runtime": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Scripting/CSharpTest.Desktop/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"System.Diagnostics.Process": "4.1.0"
"System.Diagnostics.Process": "4.3.0"
},
"frameworks": {
"net46": { }
......
src/Scripting/CSharpTest/CSharpScriptingTest.csproj
浏览文件 @ 19d6d5ff
......@@ -72,7 +72,6 @@
<InternalsVisibleToTest Include="Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests" />
</ItemGroup>
<ItemGroup>
<Content Include="app.config" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
......
src/Scripting/CSharpTest/InteractiveSessionTests.cs
浏览文件 @ 19d6d5ff
......@@ -2078,32 +2078,57 @@ public void HostObjectInRootNamespace()
Assert.Equal(1, r1.Result);
}
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/8332")]
[Fact]
public void HostObjectAssemblyReference1()
{
var scriptCompilation = CSharpScript.Create(
"nameof(Microsoft.CodeAnalysis.Scripting)",
ScriptOptions.Default.WithMetadataResolver(TestRuntimeMetadataReferenceResolver.Instance),
globalsType: typeof(CommandLineScriptGlobals)).GetCompilation();
scriptCompilation.VerifyDiagnostics(
// (1,8): error CS0234: The type or namespace name 'CodeAnalysis' does not exist in the namespace 'Microsoft' (are you missing an assembly reference?)
Diagnostic(ErrorCode.ERR_DottedTypeNameNotFoundInNS, "Microsoft.CodeAnalysis").WithArguments("CodeAnalysis", "Microsoft"));
foreach (var assemblyAndAliases in scriptCompilation.GetBoundReferenceManager().GetReferencedAssemblyAliases())
string corAssemblyName = typeof(object).GetTypeInfo().Assembly.GetName().Name;
string hostObjectAssemblyName = scriptCompilation.ScriptCompilationInfo.GlobalsType.GetTypeInfo().Assembly.GetName().Name;
// The host adds
// 1) a reference to typeof(object).Assembly
// 2) a reference to GlobalsType with alias <host> applied recursively.
// References returned from ResolveMissingAssembly have <implicit> alias.
foreach (var (assembly, aliases) in scriptCompilation.GetBoundReferenceManager().GetReferencedAssemblyAliases())
{
switch (assemblyAndAliases.Item1.Identity.Name)
string name = assembly.Identity.Name;
switch (name)
{
case "mscorlib":
AssertEx.SetEqual(new[] { "global", "<host>" }, assemblyAndAliases.Item2);
case "Microsoft.CodeAnalysis.CSharp.Scripting":
case "Microsoft.CodeAnalysis.CSharp":
// assemblies not referenced
Assert.False(true);
break;
case "Microsoft.CodeAnalysis.Scripting":
AssertEx.SetEqual(new[] { "<host>" }, assemblyAndAliases.Item2);
case "Microsoft.CodeAnalysis":
case "System.Collections.Immutable":
// Microsoft.CodeAnalysis.Scripting contains host object and is thus referenced recursively with <host> alias.
// The script doesn't reference the assemblies explicitly.
AssertEx.SetEqual(new[] { "<implicit>", "<host>" }, aliases);
break;
case "Microsoft.CodeAnalysis":
default:
AssertEx.SetEqual(new[] { "<implicit>", "<host>" }, assemblyAndAliases.Item2);
if (name == corAssemblyName)
{
// Host object depends on System.Object, thus <host> is applied on CorLib.
AssertEx.SetEqual(new[] { "<host>", "global" }, aliases);
}
else if (name == hostObjectAssemblyName)
{
// Host object is only referenced by the host and thus the assembly is hidden behind <host> alias.
AssertEx.SetEqual(new[] { "<host>" }, aliases);
}
break;
}
}
......@@ -2114,75 +2139,126 @@ public void HostObjectAssemblyReference2()
{
var scriptCompilation = CSharpScript.Create(
"typeof(Microsoft.CodeAnalysis.Scripting.Script)",
options: ScriptOptions.Default.WithReferences(typeof(CSharpScript).GetTypeInfo().Assembly),
options: ScriptOptions.Default.
WithMetadataResolver(TestRuntimeMetadataReferenceResolver.Instance).
WithReferences(typeof(CSharpScript).GetTypeInfo().Assembly),
globalsType: typeof(CommandLineScriptGlobals)).GetCompilation();
scriptCompilation.VerifyDiagnostics();
foreach (var assemblyAndAliases in scriptCompilation.GetBoundReferenceManager().GetReferencedAssemblyAliases())
{
switch (assemblyAndAliases.Item1.Identity.Name)
{
case "mscorlib":
AssertEx.SetEqual(new[] { "global", "<host>" }, assemblyAndAliases.Item2);
break;
string corAssemblyName = typeof(object).GetTypeInfo().Assembly.GetName().Name;
string hostObjectAssemblyName = scriptCompilation.ScriptCompilationInfo.GlobalsType.GetTypeInfo().Assembly.GetName().Name;
case "Microsoft.CodeAnalysis.Scripting":
AssertEx.SetEqual(new[] { "<host>", "global" }, assemblyAndAliases.Item2);
break;
// The host adds
// 1) a reference to typeof(object).Assembly
// 2) a reference to GlobalsType with alias <host> applied recursively.
// References returned from ResolveMissingAssembly have <implicit> alias.
foreach (var (assembly, aliases) in scriptCompilation.GetBoundReferenceManager().GetReferencedAssemblyAliases())
{
string name = assembly.Identity.Name;
switch (name)
{
case "Microsoft.CodeAnalysis.CSharp.Scripting":
AssertEx.SetEqual(new string[0], assemblyAndAliases.Item2);
// we have an explicit reference to CSharpScript assembly:
AssertEx.SetEqual(Array.Empty<string>(), aliases);
break;
case "Microsoft.CodeAnalysis.CSharp":
AssertEx.SetEqual(new[] { "<implicit>", "global" }, assemblyAndAliases.Item2);
// The script has a recursive reference to Microsoft.CodeAnalysis.CSharp.Scripting, which references these assemblies.
// The script doesn't reference the assembly explicitly.
AssertEx.SetEqual(new[] { "<implicit>", "global" }, aliases);
break;
case "Microsoft.CodeAnalysis":
case "System.IO":
case "System.Collections.Immutable":
AssertEx.SetEqual(new[] { "<implicit>", "<host>", "global" }, assemblyAndAliases.Item2);
// The script has a recursive reference to Microsoft.CodeAnalysis.CSharp.Scripting, which references these assemblies.
// Microsoft.CodeAnalysis.Scripting contains host object and is thus referenced recursively with <host> alias.
// The script doesn't reference the assemblies explicitly.
AssertEx.SetEqual(new[] { "<implicit>", "<host>", "global" }, aliases);
break;
default:
if (name == corAssemblyName)
{
// Host object depends on System.Object, thus <host> is applied on CorLib.
AssertEx.SetEqual(new[] { "<host>", "global" }, aliases);
}
else if (name == hostObjectAssemblyName)
{
// Host object is defined in an assembly that CSharpScript depends on.
// CSharpScript assembly was references (recursively) hence host object assembly is
// available to the script (global alias).
AssertEx.SetEqual(new[] { "<host>", "global" }, aliases);
}
break;
}
}
}
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/6532")]
[Fact]
public void HostObjectAssemblyReference3()
{
string source = $@"
#r ""{typeof(CSharpScript).GetTypeInfo().Assembly.ManifestModule.FullyQualifiedName}""
typeof(Microsoft.CodeAnalysis.Scripting.Script)
";
var scriptCompilation = CSharpScript.Create(source, globalsType: typeof(CommandLineScriptGlobals)).GetCompilation();
var scriptCompilation = CSharpScript.Create(
source,
ScriptOptions.Default.WithMetadataResolver(TestRuntimeMetadataReferenceResolver.Instance),
globalsType: typeof(CommandLineScriptGlobals)).GetCompilation();
scriptCompilation.VerifyDiagnostics();
foreach (var assemblyAndAliases in scriptCompilation.GetBoundReferenceManager().GetReferencedAssemblyAliases())
string corAssemblyName = typeof(object).GetTypeInfo().Assembly.GetName().Name;
string hostObjectAssemblyName = scriptCompilation.ScriptCompilationInfo.GlobalsType.GetTypeInfo().Assembly.GetName().Name;
// The host adds
// 1) a reference to typeof(object).Assembly
// 2) a reference to GlobalsType with alias <host> applied recursively.
// References returned from ResolveMissingAssembly have <implicit> alias.
foreach (var (assembly, aliases) in scriptCompilation.GetBoundReferenceManager().GetReferencedAssemblyAliases())
{
switch (assemblyAndAliases.Item1.Identity.Name)
{
case "mscorlib":
AssertEx.SetEqual(new[] { "global", "<host>" }, assemblyAndAliases.Item2);
break;
string name = assembly.Identity.Name;
switch (name)
{
case "Microsoft.CodeAnalysis.CSharp.Scripting":
AssertEx.SetEqual(new string[0], assemblyAndAliases.Item2);
break;
case "Microsoft.CodeAnalysis.Scripting":
AssertEx.SetEqual(new[] { "global", "<host>" }, assemblyAndAliases.Item2);
// we have an explicit reference to CSharpScript assembly:
AssertEx.SetEqual(Array.Empty<string>(), aliases);
break;
case "Microsoft.CodeAnalysis.CSharp":
AssertEx.SetEqual(new[] { "<implicit>", "global" }, assemblyAndAliases.Item2);
// The script has a recursive reference to Microsoft.CodeAnalysis.CSharp.Scripting, which references these assemblies.
// The script doesn't reference the assembly explicitly.
AssertEx.SetEqual(new[] { "<implicit>", "global" }, aliases);
break;
case "Microsoft.CodeAnalysis":
case "System.IO":
case "System.Collections.Immutable":
AssertEx.SetEqual(new[] { "<implicit>", "global", "<host>" }, assemblyAndAliases.Item2);
// The script has a recursive reference to Microsoft.CodeAnalysis.CSharp.Scripting, which references these assemblies.
// Microsoft.CodeAnalysis.Scripting contains host object and is thus referenced recursively with <host> alias.
// The script doesn't reference the assemblies explicitly.
AssertEx.SetEqual(new[] { "<implicit>", "<host>", "global" }, aliases);
break;
default:
if (name == corAssemblyName)
{
// Host object depends on System.Object, thus <host> is applied on CorLib.
AssertEx.SetEqual(new[] { "<host>", "global" }, aliases);
}
else if (name == hostObjectAssemblyName)
{
// Host object is defined in an assembly that CSharpScript depends on.
// CSharpScript assembly was references (recursively) hence host object assembly is
// available to the script (global alias).
AssertEx.SetEqual(new[] { "<host>", "global" }, aliases);
}
break;
}
}
......
src/Scripting/CSharpTest/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
</configuration>
src/Scripting/CSharpTest/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.AppContext": "4.1.0",
"System.ValueTuple": "4.0.1-beta-24425-02"
"System.AppContext": "4.3.0",
"System.ValueTuple": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Scripting/Core/Scripting.csproj
浏览文件 @ 19d6d5ff
......@@ -34,7 +34,7 @@
</PropertyGroup>
<ItemGroup>
<!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0$(CoreFXVersionSuffix)\ref\netstandard1.5\System.Runtime.Loader.dll">
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\$(SystemRuntimeLoaderVersion)\ref\netstandard1.5\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
......
src/Scripting/Core/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Collections": "4.0.11",
"System.Diagnostics.Debug": "4.0.11",
"System.Diagnostics.StackTrace": "4.0.1",
"System.Diagnostics.Tools": "4.0.1",
"System.Globalization": "4.0.11",
"System.IO": "4.1.0",
"System.IO.FileSystem": "4.0.1",
"System.Linq": "4.1.0",
"System.Linq.Expressions": "4.1.0",
"System.Reflection": "4.1.0",
"System.Reflection.Extensions": "4.0.1",
"System.Resources.ResourceManager": "4.0.1",
"System.Runtime": "4.1.0",
"System.Runtime.Extensions": "4.1.0",
"System.Runtime.InteropServices": "4.1.0",
"System.Threading": "4.0.11",
"System.Threading.Tasks": "4.0.11"
"System.Collections": "4.3.0",
"System.Diagnostics.Debug": "4.3.0",
"System.Diagnostics.StackTrace": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.Globalization": "4.3.0",
"System.IO": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.Linq": "4.3.0",
"System.Linq.Expressions": "4.3.0",
"System.Reflection": "4.3.0",
"System.Reflection.Extensions": "4.3.0",
"System.Resources.ResourceManager": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
"System.Runtime.InteropServices": "4.3.0",
"System.Threading": "4.3.0",
"System.Threading.Tasks": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Scripting/CoreTestUtilities/ScriptingTestUtilities.csproj
浏览文件 @ 19d6d5ff
......@@ -50,6 +50,7 @@
<Compile Include="RedirectedOutput.cs" />
<Compile Include="ScriptingTestHelpers.cs" />
<Compile Include="ScriptTaskExtensions.cs" />
<Compile Include="TestRuntimeMetadataReferenceResolver.cs" />
<Compile Include="TestCompilationFactory.cs" />
<Compile Include="TestConsoleIO.cs" />
<Compile Include="TestCSharpObjectFormatter.cs" />
......
src/Scripting/CoreTestUtilities/TestRuntimeMetadataReferenceResolver.cs 0 → 100644
浏览文件 @ 19d6d5ff
// 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.Collections.Immutable;
using System.IO;
using System.Reflection;
using Microsoft.CodeAnalysis;
namespace Roslyn.Test.Utilities
{
public sealed class TestRuntimeMetadataReferenceResolver : MetadataReferenceResolver
{
public static readonly TestRuntimeMetadataReferenceResolver Instance = new TestRuntimeMetadataReferenceResolver();
private static readonly MetadataReferenceProperties s_resolvedMissingAssemblyReferenceProperties = MetadataReferenceProperties.Assembly.WithAliases(ImmutableArray.Create("<implicit>"));
private TestRuntimeMetadataReferenceResolver() { }
public override bool Equals(object other) => other == Instance;
public override int GetHashCode() => 0;
public override bool ResolveMissingAssemblies => true;
public override PortableExecutableReference ResolveMissingAssembly(MetadataReference definition, AssemblyIdentity referenceIdentity)
{
// resolve assemblies from the directory containing the test and from directory containing corlib
string name = referenceIdentity.Name;
string testDir = Path.GetDirectoryName(GetType().GetTypeInfo().Assembly.ManifestModule.FullyQualifiedName);
string testDependencyAssemblyPath = Path.Combine(testDir, name + ".dll");
if (File.Exists(testDependencyAssemblyPath))
{
return MetadataReference.CreateFromFile(testDependencyAssemblyPath, s_resolvedMissingAssemblyReferenceProperties);
}
string fxDir = Path.GetDirectoryName(typeof(object).GetTypeInfo().Assembly.ManifestModule.FullyQualifiedName);
string fxAssemblyPath = Path.Combine(fxDir, name + ".dll");
if (File.Exists(fxAssemblyPath))
{
return MetadataReference.CreateFromFile(fxAssemblyPath, s_resolvedMissingAssemblyReferenceProperties);
}
return null;
}
public override ImmutableArray<PortableExecutableReference> ResolveReference(string reference, string baseFilePath, MetadataReferenceProperties properties)
{
// Note: currently not handling relative paths, since we don't have tests that use them
if (File.Exists(reference))
{
return ImmutableArray.Create(MetadataReference.CreateFromFile(reference, properties));
}
return default(ImmutableArray<PortableExecutableReference>);
}
}
}
\ No newline at end of file
src/Scripting/CoreTestUtilities/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "2.0.0-pre-20160714",
"Microsoft.CSharp": "4.0.1",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.CSharp": "4.3.0",
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Collections.Concurrent": "4.0.12",
"System.Console": "4.0.0",
"System.Diagnostics.Debug": "4.0.11",
"System.Diagnostics.Tools": "4.0.1",
"System.IO.FileSystem": "4.0.1",
"System.Reflection.TypeExtensions": "4.1.0",
"System.Text.RegularExpressions": "4.1.0",
"System.Threading.Thread": "4.0.0",
"System.Xml.XDocument": "4.0.11",
"System.Xml.XmlDocument": "4.0.1",
"System.Collections.Concurrent": "4.3.0",
"System.Console": "4.3.0",
"System.Diagnostics.Debug": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.Reflection.TypeExtensions": "4.3.0",
"System.Text.RegularExpressions": "4.3.0",
"System.Threading.Thread": "4.3.0",
"System.Xml.XDocument": "4.3.0",
"System.Xml.XmlDocument": "4.3.0",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/Scripting/VisualBasic/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.VisualBasic": "10.0.1"
"Microsoft.VisualBasic": "10.1.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Scripting/VisualBasicTest/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"System.AppContext": "4.1.0"
"System.AppContext": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
浏览文件 @ 19d6d5ff
......@@ -149,6 +149,7 @@ Public Class BuildDevDivInsertionFiles
' Files copied to Maddog machines running integration tests that are produced from our builds.
Private ReadOnly IntegrationTestFiles As String() = {
"xunit.*.dll",
"*.UnitTests.dll.config",
"Esent.Interop.dll",
"InteractiveHost.exe",
"Microsoft.CodeAnalysis.CSharp.dll",
......@@ -183,7 +184,6 @@ Public Class BuildDevDivInsertionFiles
"Roslyn.Services.Test.Utilities.dll",
"Roslyn.Test.PdbUtilities.dll",
"Roslyn.Test.Utilities.dll",
"Roslyn.Test.Utilities.dll.config",
"Roslyn.VisualStudio.Test.Setup.vsix"
}
......@@ -279,6 +279,7 @@ Public Class BuildDevDivInsertionFiles
' Files copied to Maddog machines running unit tests that are produced from our open build.
Private ReadOnly UnitTestFiles As String() = {
"*.UnitTests.dll.config",
"Microsoft.*.UnitTests*.dll",
"Roslyn.*.UnitTests*.dll",
"xunit.*.dll",
......@@ -340,7 +341,6 @@ Public Class BuildDevDivInsertionFiles
"Roslyn.Test.PdbUtilities.dll",
"Roslyn.Test.Utilities.Desktop.dll",
"Roslyn.Test.Utilities.dll",
"Roslyn.Test.Utilities.dll.config",
"Roslyn.Test.Utilities.FX45.dll",
"vbc.exe",
"vbc.exe.config",
......@@ -848,7 +848,6 @@ Public Class BuildDevDivInsertionFiles
add("Dlls\PdbUtilities\Roslyn.Test.PdbUtilities.dll")
add("Dlls\TestUtilities.Desktop\Roslyn.Test.Utilities.Desktop.dll")
add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll")
add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll.config")
add("Dlls\TestUtilities.FX45\Roslyn.Test.Utilities.FX45.dll")
add("UnitTests\EditorServicesTest\BasicUndo.dll")
add("UnitTests\EditorServicesTest\Esent.Interop.dll")
......
src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj
浏览文件 @ 19d6d5ff
......@@ -8,6 +8,7 @@
<RootNamespace>Roslyn.BuildDevDivInsertionFiles</RootNamespace>
<AssemblyName>Roslyn.BuildDevDivInsertionFiles</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
......
src/Setup/DevDivInsertionFiles/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"System.Reflection.Metadata": "1.4.1-beta-24430-01"
"System.Reflection.Metadata": "1.4.1"
},
"frameworks": {
"net46": {}
......
src/Setup/DevDivPackages/Debugger/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.DiaSymReader.PortablePdb": "1.2.0-beta1-60831-01",
"System.Diagnostics.Process": "4.1.0",
"System.IO.FileSystem": "4.0.1",
"System.IO.FileSystem.Primitives": "4.0.1",
"System.Net.Security": "4.0.0",
"System.Net.Sockets": "4.1.0",
"System.Reflection.TypeExtensions": "4.1.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.1.0",
"System.Threading.Thread": "4.0.0"
"Microsoft.DiaSymReader.PortablePdb": "1.2.0-beta1-61104-02",
"System.Diagnostics.Process": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.IO.FileSystem.Primitives": "4.3.0",
"System.Net.Security": "4.3.0",
"System.Net.Sockets": "4.3.0",
"System.Reflection.TypeExtensions": "4.3.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
"System.Security.Cryptography.X509Certificates": "4.3.0",
"System.Threading.Thread": "4.3.0"
},
"frameworks": {
"net46": {}
......
src/Setup/DevDivPackages/Roslyn/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"Microsoft.DiaSymReader.Native": "1.5.0-beta1",
"Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2",
"System.Collections.Immutable": "1.2.0",
"System.Reflection.Metadata": "1.4.1-beta-24430-01",
"System.Collections.Immutable": "1.3.0",
"System.Reflection.Metadata": "1.4.1",
"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",
"System.ValueTuple": "4.0.1-beta-24425-02",
"System.AppContext": "4.3.0",
"System.Console": "4.3.0",
"System.Collections": "4.3.0",
"System.Collections.Concurrent": "4.3.0",
"System.Diagnostics.Process": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.Diagnostics.FileVersionInfo": "4.3.0",
"System.Diagnostics.StackTrace": "4.3.0",
"System.IO": "4.3.0",
"System.IO.Compression": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.IO.FileSystem.Primitives": "4.3.0",
"System.IO.Pipes": "4.3.0",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
"System.Runtime.Numerics": "4.3.0",
"System.Security.AccessControl": "4.3.0",
"System.Security.Cryptography.Algorithms": "4.3.0",
"System.Security.Cryptography.Encoding": "4.3.0",
"System.Security.Cryptography.X509Certificates": "4.3.0",
"System.Security.Principal.Windows": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Text.Encoding.CodePages": "4.3.0",
"System.Text.Encoding.Extensions": "4.3.0",
"System.Text.RegularExpressions": "4.3.0",
"System.Threading.Thread": "4.3.0",
"System.Xml.ReaderWriter": "4.3.0",
"System.Xml.XDocument": "4.3.0",
"System.Xml.XmlDocument": "4.3.0",
"System.Xml.XPath.XDocument": "4.3.0",
"System.ValueTuple": "4.3.0",
},
"frameworks": {
"net46": {}
......
src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr
浏览文件 @ 19d6d5ff
use vs
package name=PortableFacades
version=1.2.0.0
version=1.3.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
file source="$(NuGetPackageRoot)\System.AppContext\4.3.0\lib\net46\System.AppContext.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Console\4.3.0\lib\net46\System.Console.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Diagnostics.FileVersionInfo\4.3.0\runtimes\win\lib\net46\System.Diagnostics.FileVersionInfo.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Diagnostics.Process\4.3.0\runtimes\win\lib\net46\System.Diagnostics.Process.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Diagnostics.StackTrace\4.3.0\lib\net46\System.Diagnostics.StackTrace.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.IO.Compression\4.3.0\runtimes\win\lib\net46\System.IO.Compression.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.IO.FileSystem\4.3.0\lib\net46\System.IO.FileSystem.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.IO.FileSystem.Primitives\4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.IO.Pipes\4.3.0\runtimes\win\lib\net46\System.IO.Pipes.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Net.Security\4.3.0\runtimes\win\lib\net46\System.Net.Security.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Net.Sockets\4.3.0\lib\net46\System.Net.Sockets.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Reflection.TypeExtensions\4.3.0\lib\net46\System.Reflection.TypeExtensions.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.AccessControl\4.3.0\runtimes\win\lib\net46\System.Security.AccessControl.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.Claims\4.3.0\lib\net46\System.Security.Claims.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.Cryptography.Algorithms\4.3.0\runtimes\win\lib\net46\System.Security.Cryptography.Algorithms.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.Cryptography.Encoding\4.3.0\runtimes\win\lib\net46\System.Security.Cryptography.Encoding.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.Cryptography.Primitives\4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.Cryptography.X509Certificates\4.3.0\runtimes\win\lib\net46\System.Security.Cryptography.X509Certificates.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Security.Principal.Windows\4.3.0\runtimes\win\lib\net46\System.Security.Principal.Windows.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Threading.Thread\4.3.0\lib\net46\System.Threading.Thread.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Xml.ReaderWriter\4.3.0\lib\net46\System.Xml.ReaderWriter.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Xml.XmlDocument\4.3.0\lib\net46\System.Xml.XmlDocument.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Xml.XPath\4.3.0\lib\net46\System.Xml.XPath.dll" vs.file.ngen=yes
file source="$(NuGetPackageRoot)\System.Xml.XPath.XDocument\4.3.0\lib\net46\System.Xml.XPath.XDocument.dll" vs.file.ngen=yes
src/Setup/Templates/Templates.csproj
浏览文件 @ 19d6d5ff
......@@ -16,7 +16,7 @@
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<DeployVSTemplates>false</DeployVSTemplates>
<CopyZipOutputToOutputDirectory>false</CopyZipOutputToOutputDirectory>
<BaseIntermediateOutputPath>$(BaseIntermediateOutputPath)\$(VersionType)</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>$(BaseIntermediateOutputPath)\$(VersionType)\</BaseIntermediateOutputPath>
<VsixOutDirSuffix>Roslyn Templates\$(VersionType)</VsixOutDirSuffix>
<TargetVsixContainerName>$(VsixOutDirSuffix)\Roslyn SDK.vsix</TargetVsixContainerName>
<ImportVSSDKTargets>true</ImportVSSDKTargets>
......
src/Test/PdbUtilities/Pdb/PdbToXml.cs
浏览文件 @ 19d6d5ff
......@@ -1086,12 +1086,12 @@ private unsafe string FormatLocalConstantSignature(byte[] signature)
fixed (byte* sigPtr = signature.ToArray())
{
var sigReader = new BlobReader(sigPtr, signature.Length);
var decoder = new SignatureDecoder<string>(ConstantSignatureVisualizer.Instance, _metadataReader);
var decoder = new SignatureDecoder<string, object>(ConstantSignatureVisualizer.Instance, _metadataReader, genericContext: null);
return decoder.DecodeType(ref sigReader, allowTypeSpecifications: true);
}
}
private sealed class ConstantSignatureVisualizer : ISignatureTypeProvider<string>
private sealed class ConstantSignatureVisualizer : ISignatureTypeProvider<string, object>
{
public static readonly ConstantSignatureVisualizer Instance = new ConstantSignatureVisualizer();
......@@ -1111,23 +1111,23 @@ public string GetFunctionPointerType(MethodSignature<string> signature)
return "method-ptr";
}
public string GetGenericInstance(string genericType, ImmutableArray<string> typeArguments)
public string GetGenericInstantiation(string genericType, ImmutableArray<string> typeArguments)
{
// using {} since the result is embedded in XML
return genericType + "{" + string.Join(", ", typeArguments) + "}";
}
public string GetGenericMethodParameter(int index)
public string GetGenericMethodParameter(object genericContext, int index)
{
return "!!" + index;
}
public string GetGenericTypeParameter(int index)
public string GetGenericTypeParameter(object genericContext, int index)
{
return "!" + index;
}
public string GetModifiedType(MetadataReader reader, bool isRequired, string modifier, string unmodifiedType)
public string GetModifiedType(string modifier, string unmodifiedType, bool isRequired)
{
return (isRequired ? "modreq" : "modopt") + "(" + modifier + ") " + unmodifiedType;
}
......@@ -1166,10 +1166,10 @@ public string GetTypeFromReference(MetadataReader reader, TypeReferenceHandle ha
return typeRef.Namespace.IsNil ? name : reader.GetString(typeRef.Namespace) + "." + name;
}
public string GetTypeFromSpecification(MetadataReader reader, TypeSpecificationHandle handle, byte rawTypeKind)
public string GetTypeFromSpecification(MetadataReader reader, object genericContext, TypeSpecificationHandle handle, byte rawTypeKind)
{
var sigReader = reader.GetBlobReader(reader.GetTypeSpecification(handle).Signature);
return new SignatureDecoder<string>(Instance, reader).DecodeType(ref sigReader);
return new SignatureDecoder<string, object>(Instance, reader, genericContext).DecodeType(ref sigReader);
}
}
......
src/Test/PdbUtilities/project.json
浏览文件 @ 19d6d5ff
{
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"Microsoft.DiaSymReader.Native": "1.5.0-beta1",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader.PortablePdb": "1.2.0-beta1-60831-01",
"System.Collections.Immutable": "1.2.0",
"System.Reflection.Metadata": "1.4.1-beta-24430-01",
"System.Xml.ReaderWriter": "4.0.11"
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"Microsoft.DiaSymReader.PortablePdb": "1.2.0-beta1-61104-02",
"System.Collections.Immutable": "1.3.0",
"System.Reflection.Metadata": "1.4.1",
"System.Xml.ReaderWriter": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
......
src/Test/Utilities/Desktop/AppDomainUtils.cs
浏览文件 @ 19d6d5ff
......@@ -25,12 +25,11 @@ public static AppDomain Create(string name = null, string basePath = null)
}
}
return AppDomain.CreateDomain(
name,
null,
appBasePath: basePath,
appRelativeSearchPath: null,
shadowCopyFiles: false);
return AppDomain.CreateDomain(name, null, new AppDomainSetup()
{
ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile,
ApplicationBase = basePath
});
}
/// <summary>
......
src/Test/Utilities/Desktop/TestHelpers.cs
浏览文件 @ 19d6d5ff
......@@ -110,11 +110,10 @@ public class TestAnalyzer : DiagnosticAnalyzer
public override void Initialize(AnalysisContext context) { throw new NotImplementedException(); }
}";
var metadata = dir.CopyFile(typeof(System.Reflection.Metadata.MetadataReader).Assembly.Location);
dir.CopyFile(typeof(System.Reflection.Metadata.MetadataReader).Assembly.Location);
var immutable = dir.CopyFile(typeof(ImmutableArray).Assembly.Location);
var analyzer = dir.CopyFile(typeof(DiagnosticAnalyzer).Assembly.Location);
var filesystem = dir.CreateFile("System.IO.FileSystem.dll").WriteAllBytes(
TestResources.NetFX.v4_6_1038_0.Facades.System_IO_FileSystem);
dir.CopyFile(Path.Combine(Path.GetDirectoryName(typeof(CSharpCompilation).Assembly.Location), "System.IO.FileSystem.dll"));
var analyzerCompilation = CSharpCompilation.Create(
assemblyName,
......
src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj
浏览文件 @ 19d6d5ff
......@@ -154,7 +154,6 @@
<InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />
</ItemGroup>
<ItemGroup>
<None Include="..\app.config" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
......
src/Test/Utilities/Desktop/project.json
浏览文件 @ 19d6d5ff
......@@ -2,7 +2,7 @@
"dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "2.0.0-pre-20160714",
"Microsoft.DiaSymReader.Native": "1.5.0-beta1",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj
浏览文件 @ 19d6d5ff
......@@ -109,7 +109,6 @@
<InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />
</ItemGroup>
<ItemGroup>
<None Include="..\app.config" />
<None Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
......
src/Test/Utilities/Portable.FX45/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "2.0.0-pre-20160714",
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03",
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/Test/Utilities/Portable/TestUtilities.csproj
浏览文件 @ 19d6d5ff
......@@ -97,7 +97,6 @@
<InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />
</ItemGroup>
<ItemGroup>
<None Include="..\app.config" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
......
src/Test/Utilities/Portable/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "2.0.0-pre-20160714",
"Microsoft.CSharp": "4.0.1",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.CSharp": "4.3.0",
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Collections.Concurrent": "4.0.12",
"System.Console": "4.0.0",
"System.Diagnostics.Debug": "4.0.11",
"System.Diagnostics.Tools": "4.0.1",
"System.Diagnostics.TraceSource": "4.0.0",
"System.IO.FileSystem": "4.0.1",
"System.Reflection.TypeExtensions": "4.1.0",
"System.Text.RegularExpressions": "4.1.0",
"System.Threading.Thread": "4.0.0",
"System.Xml.XDocument": "4.0.11",
"System.Xml.XmlDocument": "4.0.1",
"System.Collections.Concurrent": "4.3.0",
"System.Console": "4.3.0",
"System.Diagnostics.Debug": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.Diagnostics.TraceSource": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.Reflection.TypeExtensions": "4.3.0",
"System.Text.RegularExpressions": "4.3.0",
"System.Threading.Thread": "4.3.0",
"System.Xml.XDocument": "4.3.0",
"System.Xml.XmlDocument": "4.3.0",
"xunit": "2.1.0",
"xunit.runner.console": "2.2.0-beta1-build3239"
},
......
src/Test/Utilities/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?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. -->
<configuration>
<appSettings>
<add key="xunit.appDomain" value="denied"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<roslyn.unittests>
<emit>
<method assembly="Roslyn.Test.Utilities" type="Microsoft.CodeAnalysis.Test.Utilities.CommonTestBase" name="Emit" />
<method assembly="Microsoft.CodeAnalysis.Scripting.UnitTests" type="Microsoft.CodeAnalysis.Scripting.Test.ScriptingTestHelpers" name="ReflectionEmit" />
</emit>
</roslyn.unittests>
</configuration>
src/Tools/BuildBoss/project.json
浏览文件 @ 19d6d5ff
......@@ -2,7 +2,7 @@
"supports": { },
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"System.Collections.Immutable": "1.2.0"
"System.Collections.Immutable": "1.3.0"
},
"frameworks": {
".NETFramework,Version=v4.6": { }
......
src/Tools/BuildUtil/BuildUtil/project.json
浏览文件 @ 19d6d5ff
......@@ -9,7 +9,7 @@
"Microsoft.NETCore": "5.0.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NuSpec.ReferenceGenerator": "1.4.2",
"System.Collections.Immutable": "1.2.0"
"System.Collections.Immutable": "1.3.0"
},
"frameworks": {
"dotnet": {}
......
src/Tools/CommonCoreClrRuntime/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.3-rc4-24221-02",
"Microsoft.NETCore.TestHost": "1.0.0",
"System.Runtime": "4.1.0"
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0",
"Microsoft.NETCore.TestHost": "1.1.0",
"System.Runtime": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/CommonNetCoreReferences/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.3-rc4-24221-02",
"Microsoft.NETCore.TestHost": "1.0.0",
"System.AppContext": "4.1.0",
"System.Collections": "4.0.11",
"System.Collections.Concurrent": "4.0.12",
"System.Collections.Immutable": "1.2.0",
"System.Console": "4.0.0",
"System.Diagnostics.Debug": "4.0.11",
"System.Diagnostics.FileVersionInfo": "4.0.0",
"System.Diagnostics.Process": "4.1.0",
"System.Diagnostics.StackTrace": "4.0.1",
"System.Diagnostics.Tools": "4.0.1",
"System.Dynamic.Runtime": "4.0.11",
"System.Globalization": "4.0.11",
"System.IO.Compression": "4.1.0",
"System.IO.FileSystem": "4.0.1",
"System.IO.FileSystem.Primitives": "4.0.1",
"System.IO.FileSystem.Watcher": "4.0.0",
"System.IO.Pipes": "4.0.0",
"System.Linq": "4.1.0",
"System.Linq.Expressions": "4.1.0",
"System.Net.NameResolution": "4.0.0",
"System.Net.Sockets": "4.1.0",
"System.Reflection": "4.1.0",
"System.Reflection.Primitives": "4.0.1",
"System.Resources.ResourceManager": "4.0.1",
"System.Runtime": "4.1.0",
"System.Runtime.Extensions": "4.1.0",
"System.Runtime.Handles": "4.0.1",
"System.Runtime.InteropServices": "4.1.0",
"System.Runtime.Loader": "4.0.0",
"System.Runtime.Numerics": "4.0.1",
"System.Security.Cryptography.Algorithms": "4.2.0",
"System.Security.Cryptography.Encoding": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.1.0",
"System.Text.Encoding": "4.0.11",
"System.Text.Encoding.CodePages": "4.0.1",
"System.Text.Encoding.Extensions": "4.0.11",
"System.Threading": "4.0.11",
"System.Threading.Tasks": "4.0.11",
"System.Threading.Tasks.Parallel": "4.0.1",
"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"
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0",
"Microsoft.NETCore.TestHost": "1.1.0",
"System.AppContext": "4.3.0",
"System.Collections": "4.3.0",
"System.Collections.Concurrent": "4.3.0",
"System.Collections.Immutable": "1.3.0",
"System.Console": "4.3.0",
"System.Diagnostics.Debug": "4.3.0",
"System.Diagnostics.FileVersionInfo": "4.3.0",
"System.Diagnostics.Process": "4.3.0",
"System.Diagnostics.StackTrace": "4.3.0",
"System.Diagnostics.Tools": "4.3.0",
"System.Dynamic.Runtime": "4.3.0",
"System.Globalization": "4.3.0",
"System.IO.Compression": "4.3.0",
"System.IO.FileSystem": "4.3.0",
"System.IO.FileSystem.Primitives": "4.3.0",
"System.IO.FileSystem.Watcher": "4.3.0",
"System.IO.Pipes": "4.3.0",
"System.Linq": "4.3.0",
"System.Linq.Expressions": "4.3.0",
"System.Net.NameResolution": "4.3.0",
"System.Net.Sockets": "4.3.0",
"System.Reflection": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
"System.Resources.ResourceManager": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
"System.Runtime.Handles": "4.3.0",
"System.Runtime.InteropServices": "4.3.0",
"System.Runtime.Loader": "4.3.0",
"System.Runtime.Numerics": "4.3.0",
"System.Security.Cryptography.Algorithms": "4.3.0",
"System.Security.Cryptography.Encoding": "4.3.0",
"System.Security.Cryptography.X509Certificates": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Text.Encoding.CodePages": "4.3.0",
"System.Text.Encoding.Extensions": "4.3.0",
"System.Threading": "4.3.0",
"System.Threading.Tasks": "4.3.0",
"System.Threading.Tasks.Parallel": "4.3.0",
"System.Threading.Thread": "4.3.0",
"System.Xml.ReaderWriter": "4.3.0",
"System.Xml.XDocument": "4.3.0",
"System.Xml.XmlDocument": "4.3.0",
"System.Xml.XPath.XDocument": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/ProcessWatchdog/ProcessWatchdog.csproj
浏览文件 @ 19d6d5ff
......@@ -10,6 +10,7 @@
<AssemblyName>ProcessWatchdog</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<SignAssembly>false</SignAssembly>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
......
src/Tools/ProcessWatchdog/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"CommandLineParser": "2.0.273-beta",
"System.Collections.Immutable": "1.2.0",
"System.Reflection.Metadata": "1.4.1-beta-24430-01",
"System.Collections.Immutable": "1.3.0",
"System.Reflection.Metadata": "1.4.1",
},
"frameworks": {
"net46": { }
......
src/Tools/RepoUtil/project.json
浏览文件 @ 19d6d5ff
......@@ -2,7 +2,7 @@
"supports": { },
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"System.Collections.Immutable": "1.2.0"
"System.Collections.Immutable": "1.3.0"
},
"frameworks": {
".NETFramework,Version=v4.6": { }
......
src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.3-rc4-24221-02",
"Microsoft.NETCore.TestHost": "1.0.0"
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0",
"Microsoft.NETCore.TestHost": "1.1.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Xml.XmlDocument": "4.0.1",
"System.Xml.XmlSerializer": "4.0.11"
"NETStandard.Library": "1.6.1",
"System.Xml.XmlDocument": "4.3.0",
"System.Xml.XmlSerializer": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NETStandard.Library": "1.6.0",
"NETStandard.Library": "1.6.1",
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Xml.XmlDocument": "4.0.1",
"System.Xml.XmlSerializer": "4.0.11"
"NETStandard.Library": "1.6.1",
"System.Xml.XmlDocument": "4.3.0",
"System.Xml.XmlSerializer": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NETStandard.Library": "1.6.0"
"NETStandard.Library": "1.6.1"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
浏览文件 @ 19d6d5ff
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Console": "4.0.0",
"System.Security.Cryptography.Algorithms": "4.2.0"
"NETStandard.Library": "1.6.1",
"System.Console": "4.3.0",
"System.Security.Cryptography.Algorithms": "4.3.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
src/Tools/Source/Pdb2Xml/project.json
浏览文件 @ 19d6d5ff
{
{
"dependencies": {
"Microsoft.DiaSymReader": "1.1.0-beta1-60625-03"
"Microsoft.DiaSymReader": "1.1.0-beta1-60818-02"
},
"frameworks": {
"net46": { }
......
src/Tools/Source/RunTests/RunTests.csproj
浏览文件 @ 19d6d5ff
......@@ -10,6 +10,7 @@
<AssemblyName>RunTests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<SignAssembly>false</SignAssembly>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
......
src/Tools/Source/RunTests/project.json
浏览文件 @ 19d6d5ff
......@@ -2,8 +2,8 @@
"dependencies": {
"Newtonsoft.Json": "8.0.3",
"RestSharp": "105.2.3",
"System.Collections.Immutable": "1.2.0",
"System.Reflection.Metadata": "1.4.1-beta-24430-01",
"System.Collections.Immutable": "1.3.0",
"System.Reflection.Metadata": "1.4.1",
},
"frameworks": {
"net46": { }
......
src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj
浏览文件 @ 19d6d5ff
......@@ -249,7 +249,6 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
......
src/VisualStudio/CSharp/Test/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="xunit.appDomain" value="required"/>
<add key="xunit.diagnosticMessages" value="false"/>
<add key="xunit.parallelizeTestCollections" value="false"/>
</appSettings>
<system.diagnostics>
<trace>
<listeners>
<remove name="Default" />
<add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities.Desktop" />
</listeners>
</trace>
</system.diagnostics>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
src/VisualStudio/Core/Test.Next/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
此差异已折叠。
src/VisualStudio/Core/Test/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
此差异已折叠。
src/VisualStudio/Setup/project.json
浏览文件 @ 19d6d5ff
此差异已折叠。
src/Workspaces/CoreTest/app.config 已删除 100644 → 0
浏览文件 @ 9ae8d8bf
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或