提交 1003b4f9 编写于 作者: T Tomáš Matoušek

Merge pull request #10419 from tmat/SCISRM_F

Update SRM to 1.3.0-rc3-24005-00, SCI to 1.2.0-rc3-24005-00 and DSR to 1.0.8-rc2-60325.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="1.0.0.0-1.65535.65535.65535" newVersion="1.1.37.0"/> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<!-- Currently we version IW the same as Roslyn. --> <!-- Currently we version IW the same as Roslyn. -->
<MicrosoftVisualStudioInteractiveWindowVersion>$(RoslynSemanticVersion)</MicrosoftVisualStudioInteractiveWindowVersion> <MicrosoftVisualStudioInteractiveWindowVersion>$(RoslynSemanticVersion)</MicrosoftVisualStudioInteractiveWindowVersion>
<!-- These are the versions of dependencies we insert into VS --> <!-- These are the versions of dependencies we insert into VS -->
<SystemReflectionMetadataVersion>1.2.0</SystemReflectionMetadataVersion> <SystemReflectionMetadataVersion>1.3.0-rc3-24005-00</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>1.1.37</SystemCollectionsImmutableVersion> <SystemCollectionsImmutableVersion>1.2.0-rc3-24005-00</SystemCollectionsImmutableVersion>
<MicrosoftDiaSymReaderVersion>1.0.7</MicrosoftDiaSymReaderVersion> <MicrosoftDiaSymReaderVersion>1.0.8-rc2-60325</MicrosoftDiaSymReaderVersion>
<MicrosoftDiaSymReaderNativeVersion>1.3.3</MicrosoftDiaSymReaderNativeVersion> <MicrosoftDiaSymReaderNativeVersion>1.3.3</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.0.0</MicrosoftDiaSymReaderPortablePdbVersion> <MicrosoftDiaSymReaderPortablePdbVersion>1.0.0</MicrosoftDiaSymReaderPortablePdbVersion>
<MicrosoftCodeAnalysisElfieVersion>0.10.6-rc2</MicrosoftCodeAnalysisElfieVersion> <MicrosoftCodeAnalysisElfieVersion>0.10.6-rc2</MicrosoftCodeAnalysisElfieVersion>
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then ...@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then
fi fi
# Replace with a robust method for finding the right crossgen.exe # Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc2-23931/tools/crossgen CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc3-24005-00/tools/crossgen
cd $BIN_DIR cd $BIN_DIR
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
using Microsoft.CodeAnalysis.Symbols; using Microsoft.CodeAnalysis.Symbols;
using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities; using Roslyn.Utilities;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{ {
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CodeGen;
using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols;
using Roslyn.Utilities; using Roslyn.Utilities;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{ {
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Text;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{ {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities; using Roslyn.Utilities;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{ {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CodeGen;
using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols;
using Roslyn.Utilities; using Roslyn.Utilities;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{ {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities; using Roslyn.Utilities;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{ {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00005", "Microsoft.Build.Tasks.Core": "0.1.0-preview-00005",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00005", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00005",
"Microsoft.Win32.Primitives": "4.0.0", "Microsoft.Win32.Primitives": "4.0.0",
"System.Console": "4.0.0-rc2-23931", "System.Console": "4.0.0-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tools": "4.0.0",
"System.Diagnostics.Process": "4.1.0-rc2-23931", "System.Diagnostics.Process": "4.1.0-rc3-24005-00",
"System.IO.Pipes": "4.0.0-rc2-23931", "System.IO.Pipes": "4.0.0-rc3-24005-00",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24005-00",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc2-23931" "System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Microsoft.DiaSymReader": "1.0.7",
"Moq": "4.2.1402.2112", "Moq": "4.2.1402.2112",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
......
{ {
"supports": {}, "supports": {},
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
...@@ -33,4 +33,4 @@ ...@@ -33,4 +33,4 @@
Set to -1 to never shut down the server. --> Set to -1 to never shut down the server. -->
<add key="keepalive" value="600"/> <add key="keepalive" value="600"/>
</appSettings> </appSettings>
</configuration> </configuration>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
}, },
"frameworks": { "frameworks": {
"net45": { } "net45": { }
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Moq": "4.2.1402.2112", "Moq": "4.2.1402.2112",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
......
{ {
"dependencies": { "dependencies": {
"System.Reflection.TypeExtensions": "4.0.0"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
...@@ -9,6 +9,7 @@ Imports Microsoft.CodeAnalysis.Symbols ...@@ -9,6 +9,7 @@ Imports Microsoft.CodeAnalysis.Symbols
Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Emit Imports Microsoft.CodeAnalysis.VisualBasic.Emit
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
Friend NotInheritable Class CodeGenerator Friend NotInheritable Class CodeGenerator
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
Imports System.Reflection.Metadata Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
......
...@@ -12,6 +12,7 @@ Imports Microsoft.CodeAnalysis.Text ...@@ -12,6 +12,7 @@ Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports TypeKind = Microsoft.CodeAnalysis.TypeKind Imports TypeKind = Microsoft.CodeAnalysis.TypeKind
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
......
...@@ -4,6 +4,7 @@ Imports System.Reflection.Metadata ...@@ -4,6 +4,7 @@ Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports PrimitiveTypeCode = Microsoft.Cci.PrimitiveTypeCode Imports PrimitiveTypeCode = Microsoft.Cci.PrimitiveTypeCode
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
......
...@@ -9,6 +9,7 @@ Imports System.Reflection.Metadata ...@@ -9,6 +9,7 @@ Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports TypeKind = Microsoft.CodeAnalysis.TypeKind Imports TypeKind = Microsoft.CodeAnalysis.TypeKind
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
Imports System.Reflection.Metadata Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
......
...@@ -7,6 +7,7 @@ Imports Microsoft.CodeAnalysis.CodeGen ...@@ -7,6 +7,7 @@ Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Collections
Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Emit
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.1.0.0-1.1.65535.65535" newVersion="1.1.37.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /> <assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="1.0.0.0-1.1.65535.65535" newVersion="1.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.Collections": "4.0.10", "System.Collections": "4.0.11-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Runtime": "4.0.20", "System.Runtime": "4.1.0-rc3-24005-00",
"System.Runtime.Extensions": "4.0.10", "System.Runtime.Extensions": "4.1.0-rc3-24005-00",
"System.Runtime.InteropServices": "4.0.20", "System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
"System.IO.FileSystem": "4.0.0", "System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.Runtime.InteropServices": "4.0.20",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
...@@ -13,22 +13,22 @@ ...@@ -13,22 +13,22 @@
<dependency id="System.Collections.Immutable" version="1.1.37" /> <dependency id="System.Collections.Immutable" version="1.1.37" />
</group> </group>
<group targetFramework="netstandard1.1"> <group targetFramework="netstandard1.1">
<dependency id="Microsoft.DiaSymReader" version="1.0.8-rc2-60409-05" /> <dependency id="Microsoft.DiaSymReader" version="1.0.8-rc2-60406-06" />
<dependency id="System.Collections" version="4.0.11-rc2-24008" /> <dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24008" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24008" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.0-rc2-24008" /> <dependency id="System.Globalization" version="4.0.0-rc3-24005-00" />
<dependency id="System.IO" version="4.1.0-rc2-24008" /> <dependency id="System.IO" version="4.1.0-rc3-24005-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24008" /> <dependency id="System.Linq" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24008" /> <dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc2-24008" /> <dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24008" /> <dependency id="System.Threading" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24008" /> <dependency id="System.Xml.XDocument" version="4.0.11-rc3-24005-00" />
</group> </group>
</dependencies> </dependencies>
<language>en-US</language> <language>en-US</language>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
</description> </description>
<dependencies> <dependencies>
<group targetFramework="netstandard1.1"> <group targetFramework="netstandard1.1">
<dependency id="System.Runtime" version="4.1.0-rc2-23931" /> <dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-23931" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-23931" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
</group> </group>
</dependencies> </dependencies>
<language>en-US</language> <language>en-US</language>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="1.0.0.0-1.65535.65535.65535" newVersion="1.1.37.0"/> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="1.0.0.0-1.65535.65535.65535" newVersion="1.1.37.0"/> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="1.0.0.0-1.65535.65535.65535" newVersion="1.1.37.0"/> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="1.0.0.0-1.65535.65535.65535" newVersion="1.1.37.0"/> <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
.assembly extern System.Globalization .assembly extern System.Globalization
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:10:0 .ver 4:0:0:0
} }
.assembly extern System.Runtime .assembly extern System.Runtime
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:20:0 .ver 4:0:0:0
} }
.assembly extern System.Runtime.InteropServices .assembly extern System.Runtime.InteropServices
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:20:0 .ver 4:0:0:0
} }
.assembly Microsoft.VisualStudio.Debugger.Engine .assembly Microsoft.VisualStudio.Debugger.Engine
{ {
.assembly extern 'System.Globalization' .assembly extern 'System.Globalization'
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:10:0 .ver 4:0:0:0
} }
.assembly extern 'System.IO' .assembly extern 'System.IO'
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:10:0 .ver 4:0:0:0
} }
.assembly extern 'System.Reflection' .assembly extern 'System.Reflection'
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:10:0 .ver 4:0:0:0
} }
.assembly extern 'System.Reflection.Extensions' .assembly extern 'System.Reflection.Extensions'
{ {
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
.assembly extern 'System.Runtime' .assembly extern 'System.Runtime'
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:20:0 .ver 4:0:0:0
} }
.assembly extern 'System.Runtime.InteropServices' .assembly extern 'System.Runtime.InteropServices'
{ {
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A) .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
.ver 4:0:20:0 .ver 4:0:0:0
} }
.assembly 'Microsoft.VisualStudio.Debugger.Metadata' .assembly 'Microsoft.VisualStudio.Debugger.Metadata'
{ {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7" "Microsoft.DiaSymReader": "1.0.8-rc2-60325"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
...@@ -24,6 +24,7 @@ internal static int Main(string[] args) ...@@ -24,6 +24,7 @@ internal static int Main(string[] args)
baseDirectory: Directory.GetCurrentDirectory(), baseDirectory: Directory.GetCurrentDirectory(),
sdkDirectoryOpt: CorLightup.Desktop.TryGetRuntimeDirectory(), sdkDirectoryOpt: CorLightup.Desktop.TryGetRuntimeDirectory(),
args: args, args: args,
clientDirectory: AppContext.BaseDirectory,
analyzerLoader: new NotImplementedAnalyzerLoader()); analyzerLoader: new NotImplementedAnalyzerLoader());
var runner = new CommandLineRunner( var runner = new CommandLineRunner(
......
{ {
"dependencies": { }, "dependencies": {
"System.AppContext": "4.1.0-rc3-24005-00"
},
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
"imports": "portable-net452" "imports": "portable-net452"
......
...@@ -17,6 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting ...@@ -17,6 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting
responseFile, responseFile,
AppContext.BaseDirectory, AppContext.BaseDirectory,
CorLightup.Desktop.TryGetRuntimeDirectory(), CorLightup.Desktop.TryGetRuntimeDirectory(),
AppContext.BaseDirectory,
args, args,
New NotImplementedAnalyzerLoader()) New NotImplementedAnalyzerLoader())
......
{ {
"dependencies": { }, "dependencies": {
"System.AppContext": "4.1.0-rc3-24005-00"
},
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
"imports": "portable-net452" "imports": "portable-net452"
......
...@@ -21,44 +21,44 @@ Supported Platforms: ...@@ -21,44 +21,44 @@ Supported Platforms:
<group targetFramework="netstandard1.3"> <group targetFramework="netstandard1.3">
<dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" /> <dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" />
<dependency id="System.AppContext" version="4.1.0-rc2-24008" /> <dependency id="System.AppContext" version="4.1.0-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc2-24008" /> <dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc2-24008" /> <dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24008" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Console" version="4.0.0-rc2-24008" /> <dependency id="System.Console" version="4.0.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24008" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-24008" exclude="Compile" /> <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24005-00" exclude="Compile" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-24008" exclude="Compile" /> <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24008" /> <dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24005-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24008" /> <dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.11-rc2-24008" /> <dependency id="System.Globalization" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24008" /> <dependency id="System.IO.FileSystem" version="4.0.1-rc3-24005-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24008" /> <dependency id="System.Linq" version="4.1.0-rc3-24005-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24008" /> <dependency id="System.Linq.Expressions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24008" /> <dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc2-24008" /> <dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24008" /> <dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc2-24008" /> <dependency id="System.Runtime.Handles" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc2-24008" /> <dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-24008" /> <dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-24008" /> <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc2-24008" /> <dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-24008" exclude="Compile" /> <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24008" exclude="Compile" /> <dependency id="System.Threading" version="4.0.11-rc3-24005-00" exclude="Compile" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24008" /> <dependency id="System.Threading.Tasks" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-24008" /> <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24005-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc2-24008" exclude="Compile" /> <dependency id="System.Threading.Thread" version="4.0.0-rc3-24005-00" exclude="Compile" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-24008" /> <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24008" /> <dependency id="System.Xml.XDocument" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-24008" exclude="Compile" /> <dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24005-00" exclude="Compile" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-24008" exclude="Compile" /> <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24005-00" exclude="Compile" />
</group> </group>
</dependencies> </dependencies>
......
...@@ -19,30 +19,30 @@ ...@@ -19,30 +19,30 @@
<group targetFramework="dnxcore50"> <group targetFramework="dnxcore50">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" /> <dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" />
<dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" /> <dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" />
<dependency id="System.AppContext" version="4.0.1-rc2-24008" /> <dependency id="System.AppContext" version="4.0.1-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc2-24008" /> <dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.1.37" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24008" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-24008" /> <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24005-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24008" /> <dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.11-rc2-24008" /> <dependency id="System.Globalization" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO" version="4.0.11-rc2-24008" /> <dependency id="System.IO" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24008" /> <dependency id="System.IO.FileSystem" version="4.0.1-rc3-24005-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq" version="4.0.1-rc2-24008" /> <dependency id="System.Linq" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24008" /> <dependency id="System.Linq.Expressions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24008" /> <dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Metadata" version="1.1.0-rc2-24008" /> <dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24008" /> <dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.0.21-rc2-24008" /> <dependency id="System.Runtime" version="4.0.21-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.0.11-rc2-24008" /> <dependency id="System.Runtime.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc2-24008" /> <dependency id="System.Runtime.Handles" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.0.21-rc2-24008" /> <dependency id="System.Runtime.InteropServices" version="4.0.21-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24008" /> <dependency id="System.Threading" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24008" /> <dependency id="System.Threading.Tasks" version="4.0.11-rc3-24005-00" />
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>
......
...@@ -18,44 +18,44 @@ ...@@ -18,44 +18,44 @@
<dependencies> <dependencies>
<group targetFramework="dnxcore50"> <group targetFramework="dnxcore50">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" /> <dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" />
<dependency id="System.AppContext" version="4.1.0-rc2-24008" /> <dependency id="System.AppContext" version="4.1.0-rc3-24005-00" />
<dependency id="System.Collections" version="4.0.11-rc2-24008" /> <dependency id="System.Collections" version="4.0.11-rc3-24005-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc2-24008" /> <dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24005-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-24008" /> <dependency id="System.Collections.Immutable" version="1.2.0-rc3-24005-00" />
<dependency id="System.Console" version="4.0.0-rc2-24008" /> <dependency id="System.Console" version="4.0.0-rc3-24005-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24008" /> <dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24005-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-24008" /> <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24005-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-24008" /> <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24005-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24008" /> <dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24005-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24008" /> <dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24005-00" />
<dependency id="System.Globalization" version="4.0.11-rc2-24008" /> <dependency id="System.Globalization" version="4.0.11-rc3-24005-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24008" /> <dependency id="System.IO.FileSystem" version="4.0.1-rc3-24005-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Linq" version="4.1.0-rc2-24008" /> <dependency id="System.Linq" version="4.1.0-rc3-24005-00" />
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24008" /> <dependency id="System.Linq.Expressions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Reflection" version="4.1.0-rc2-24008" /> <dependency id="System.Reflection" version="4.1.0-rc3-24005-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24008" /> <dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24005-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24008" /> <dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc2-24008" /> <dependency id="System.Runtime.Handles" version="4.0.1-rc3-24005-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24008" /> <dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24005-00" />
<dependency id="System.Runtime.Loader" version="4.0.0-rc2-24008" /> <dependency id="System.Runtime.Loader" version="4.0.0-rc3-24005-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc2-24008" /> <dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-24008" /> <dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-24008" /> <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24005-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc2-24008" /> <dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24005-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding" version="4.0.11-rc3-24005-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-24008" /> <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24005-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-24008" /> <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading" version="4.0.11-rc2-24008" /> <dependency id="System.Threading" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24008" /> <dependency id="System.Threading.Tasks" version="4.0.11-rc3-24005-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-24008" /> <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24005-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc2-24008" /> <dependency id="System.Threading.Thread" version="4.0.0-rc3-24005-00" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-24008" /> <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24008" /> <dependency id="System.Xml.XDocument" version="4.0.11-rc3-24005-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-24008" /> <dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24005-00" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-24008" /> <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24005-00" />
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"Microsoft.Composition": "1.0.27" "Microsoft.Composition": "1.0.27"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Moq": "4.2.1402.2112", "Moq": "4.2.1402.2112",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
...@@ -13,9 +13,9 @@ namespace Microsoft.CodeAnalysis.CSharp.Scripting.Hosting ...@@ -13,9 +13,9 @@ namespace Microsoft.CodeAnalysis.CSharp.Scripting.Hosting
{ {
internal sealed class CSharpInteractiveCompiler : CSharpCompiler internal sealed class CSharpInteractiveCompiler : CSharpCompiler
{ {
internal CSharpInteractiveCompiler(string responseFile, string baseDirectory, string sdkDirectoryOpt, string[] args, IAnalyzerAssemblyLoader analyzerLoader) internal CSharpInteractiveCompiler(string responseFile, string baseDirectory, string sdkDirectoryOpt, string clientDirectory, string[] args, IAnalyzerAssemblyLoader analyzerLoader)
// Unlike C# compiler we do not use LIB environment variable. It's only supported for historical reasons. // Unlike C# compiler we do not use LIB environment variable. It's only supported for historical reasons.
: base(CSharpCommandLineParser.ScriptRunner, responseFile, args, AppContext.BaseDirectory, baseDirectory, sdkDirectoryOpt, null, analyzerLoader) : base(CSharpCommandLineParser.ScriptRunner, responseFile, args, clientDirectory, baseDirectory, sdkDirectoryOpt, null, analyzerLoader)
{ {
} }
......
{ {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.0", "Microsoft.CSharp": "4.0.0",
"System.AppContext": "4.0.0",
"System.Dynamic.Runtime": "4.0.10" "System.Dynamic.Runtime": "4.0.10"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"System.Diagnostics.Process": "4.1.0-rc2-23931" "System.Diagnostics.Process": "4.1.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
...@@ -42,6 +42,7 @@ public class CommandLineRunnerTests : TestBase ...@@ -42,6 +42,7 @@ public class CommandLineRunnerTests : TestBase
responseFile, responseFile,
workingDirectory ?? AppContext.BaseDirectory, workingDirectory ?? AppContext.BaseDirectory,
null, null,
AppContext.BaseDirectory,
args ?? s_defaultArgs, args ?? s_defaultArgs,
new NotImplementedAnalyzerLoader()); new NotImplementedAnalyzerLoader());
......
{ {
"dependencies": { }, "dependencies": {
"System.AppContext": "4.0.0"
},
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
"imports": [ "portable-net452", "dotnet5.4" ] "imports": [ "portable-net452", "dotnet5.4" ]
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Workaround for https://github.com/NuGet/Home/issues/1471 --> <!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc2-23931\ref\netstandard1.5\System.Runtime.Loader.dll"> <Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc3-24005-00\ref\netstandard1.5\System.Runtime.Loader.dll">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.AppContext": "4.0.0", "System.Collections": "4.0.11-rc3-24005-00",
"System.Collections": "4.0.10", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Collections.Immutable": "1.1.37", "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.StackTrace": "4.0.1-rc3-24005-00",
"System.Diagnostics.StackTrace": "4.0.0", "System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.11-rc3-24005-00",
"System.Globalization": "4.0.10", "System.IO": "4.1.0-rc3-24005-00",
"System.IO": "4.0.10", "System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.IO.FileSystem": "4.0.0", "System.Linq": "4.1.0-rc3-24005-00",
"System.Linq": "4.0.0", "System.Linq.Expressions": "4.0.11-rc3-24005-00",
"System.Linq.Expressions": "4.0.10", "System.Reflection": "4.1.0-rc3-24005-00",
"System.Reflection": "4.0.10", "System.Reflection.Extensions": "4.0.1-rc3-24005-00",
"System.Reflection.Extensions": "4.0.0", "System.Resources.ResourceManager": "4.0.1-rc3-24005-00",
"System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.1.0-rc3-24005-00",
"System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.1.0-rc3-24005-00",
"System.Runtime.Extensions": "4.0.10", "System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
"System.Runtime.InteropServices": "4.0.20", "System.Threading": "4.0.11-rc3-24005-00",
"System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.11-rc3-24005-00"
"System.Threading.Tasks": "4.0.10"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
...@@ -12,8 +12,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting ...@@ -12,8 +12,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting
Friend NotInheritable Class VisualBasicInteractiveCompiler Friend NotInheritable Class VisualBasicInteractiveCompiler
Inherits VisualBasicCompiler Inherits VisualBasicCompiler
Friend Sub New(responseFile As String, baseDirectory As String, sdkDirectoryOpt As String, args As String(), analyzerLoader As IAnalyzerAssemblyLoader) Friend Sub New(responseFile As String, baseDirectory As String, sdkDirectoryOpt As String, clientDirectory As String, args As String(), analyzerLoader As IAnalyzerAssemblyLoader)
MyBase.New(VisualBasicCommandLineParser.ScriptRunner, responseFile, args, AppContext.BaseDirectory, baseDirectory, sdkDirectoryOpt, Nothing, analyzerLoader) MyBase.New(VisualBasicCommandLineParser.ScriptRunner, responseFile, args, clientDirectory, baseDirectory, sdkDirectoryOpt, Nothing, analyzerLoader)
End Sub End Sub
Friend Overrides Function GetCommandLineMetadataReferenceResolver(loggerOpt As TouchedFileLogger) As MetadataReferenceResolver Friend Overrides Function GetCommandLineMetadataReferenceResolver(loggerOpt As TouchedFileLogger) As MetadataReferenceResolver
......
{ {
"dependencies": { "dependencies": {
"Microsoft.VisualBasic": "10.0.0", "Microsoft.VisualBasic": "10.0.0"
"System.AppContext": "4.0.0"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
......
...@@ -32,6 +32,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests ...@@ -32,6 +32,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
responseFile, responseFile,
If(workingDirectory, AppContext.BaseDirectory), If(workingDirectory, AppContext.BaseDirectory),
CorLightup.Desktop.TryGetRuntimeDirectory(), CorLightup.Desktop.TryGetRuntimeDirectory(),
AppContext.BaseDirectory,
If(args, s_defaultArgs), If(args, s_defaultArgs),
New NotImplementedAnalyzerLoader()) New NotImplementedAnalyzerLoader())
......
{ {
"dependencies": { }, "dependencies": {
"System.AppContext": "4.0.0"
},
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.3": {
"imports": [ "portable-net452", "dotnet5.4" ] "imports": [ "portable-net452", "dotnet5.4" ]
......
{ {
"supports": {}, "supports": {},
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Microsoft.DiaSymReader.Native": "1.3.3", "Microsoft.DiaSymReader.Native": "1.3.3",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04", "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Microsoft.DiaSymReader.Native": "1.3.3", "Microsoft.DiaSymReader.Native": "1.3.3",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04", "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Reflection.Metadata": "1.2.0", "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.0",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.Collections.Concurrent": "4.0.10", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
"System.Collections.Immutable": "1.1.37", "Microsoft.CSharp": "4.0.0",
"System.Console": "4.0.0-rc2-23931", "System.Collections.Concurrent": "4.0.12-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.10", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.0", "System.Console": "4.0.0-rc3-24005-00",
"System.IO.FileSystem": "4.0.0", "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Reflection.TypeExtensions": "4.0.0", "System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
"System.Threading.Thread": "4.0.0-rc2-23931", "System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.Xml.XDocument": "4.0.10", "System.Reflection.TypeExtensions": "4.1.0-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.0", "System.Threading.Thread": "4.0.0-rc3-24005-00",
"System.Xml.XDocument": "4.0.11-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.1-rc3-24005-00",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.extensibility.execution": "2.1.0" "xunit.extensibility.execution": "2.1.0"
}, },
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
using Roslyn.Test.MetadataUtilities; using Roslyn.Test.MetadataUtilities;
using Roslyn.Utilities; using Roslyn.Utilities;
using Cci = Microsoft.Cci; using Cci = Microsoft.Cci;
using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Roslyn.Test.Utilities namespace Roslyn.Test.Utilities
{ {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"Microsoft.NETCore": "5.0.0", "Microsoft.NETCore": "5.0.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NuSpec.ReferenceGenerator": "1.4.2", "NuSpec.ReferenceGenerator": "1.4.2",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.2.0-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"dotnet": {} "dotnet": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-23931", "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", "Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24005-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23931", "Microsoft.NETCore.TestHost": "1.0.0-rc3-24005-00",
"System.AppContext": "4.1.0-rc2-23931", "System.AppContext": "4.1.0-rc3-24005-00",
"System.Collections": "4.0.11-rc2-23931", "System.Collections": "4.0.11-rc3-24005-00",
"System.Collections.Concurrent": "4.0.12-rc2-23931", "System.Collections.Concurrent": "4.0.12-rc3-24005-00",
"System.Collections.Immutable": "1.2.0-rc2-23931", "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"System.Console": "4.0.0-rc2-23931", "System.Console": "4.0.0-rc3-24005-00",
"System.Diagnostics.Debug": "4.0.11-rc2-23931", "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23931", "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24005-00",
"System.Diagnostics.Process": "4.1.0-rc2-23931", "System.Diagnostics.Process": "4.1.0-rc3-24005-00",
"System.Diagnostics.StackTrace": "4.0.1-rc2-23931", "System.Diagnostics.StackTrace": "4.0.1-rc3-24005-00",
"System.Diagnostics.Tools": "4.0.1-rc2-23931", "System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
"System.Dynamic.Runtime": "4.0.11-rc2-23931", "System.Dynamic.Runtime": "4.0.11-rc3-24005-00",
"System.Globalization": "4.0.11-rc2-23931", "System.Globalization": "4.0.11-rc3-24005-00",
"System.IO.FileSystem": "4.0.1-rc2-23931", "System.IO.FileSystem": "4.0.1-rc3-24005-00",
"System.IO.FileSystem.Primitives": "4.0.1-rc2-23931", "System.IO.FileSystem.Primitives": "4.0.1-rc3-24005-00",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-23931", "System.IO.FileSystem.Watcher": "4.0.0-rc3-24005-00",
"System.IO.Pipes": "4.0.0-rc2-23931", "System.IO.Pipes": "4.0.0-rc3-24005-00",
"System.Linq": "4.1.0-rc2-23931", "System.Linq": "4.1.0-rc3-24005-00",
"System.Linq.Expressions": "4.0.11-rc2-23931", "System.Linq.Expressions": "4.0.11-rc3-24005-00",
"System.Net.NameResolution": "4.0.0-rc2-23931", "System.Net.NameResolution": "4.0.0-rc3-24005-00",
"System.Net.Sockets": "4.1.0-rc2-23931", "System.Net.Sockets": "4.1.0-rc3-24005-00",
"System.Reflection": "4.1.0-rc2-23931", "System.Reflection": "4.1.0-rc3-24005-00",
"System.Reflection.Primitives": "4.0.1-rc2-23931", "System.Reflection.Primitives": "4.0.1-rc3-24005-00",
"System.Resources.ResourceManager": "4.0.1-rc2-23931", "System.Resources.ResourceManager": "4.0.1-rc3-24005-00",
"System.Runtime": "4.1.0-rc2-23931", "System.Runtime": "4.1.0-rc3-24005-00",
"System.Runtime.Extensions": "4.1.0-rc2-23931", "System.Runtime.Extensions": "4.1.0-rc3-24005-00",
"System.Runtime.Handles": "4.0.1-rc2-23931", "System.Runtime.Handles": "4.0.1-rc3-24005-00",
"System.Runtime.InteropServices": "4.1.0-rc2-23931", "System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
"System.Runtime.Loader": "4.0.0-rc2-23931", "System.Runtime.Loader": "4.0.0-rc3-24005-00",
"System.Runtime.Numerics": "4.0.1-rc2-23931", "System.Runtime.Numerics": "4.0.1-rc3-24005-00",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931", "System.Security.Cryptography.Algorithms": "4.1.0-rc3-24005-00",
"System.Security.Cryptography.Encoding": "4.0.0-rc2-23931", "System.Security.Cryptography.Encoding": "4.0.0-rc3-24005-00",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-23931", "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24005-00",
"System.Text.Encoding": "4.0.11-rc2-23931", "System.Text.Encoding": "4.0.11-rc3-24005-00",
"System.Text.Encoding.CodePages": "4.0.1-rc2-23931", "System.Text.Encoding.CodePages": "4.0.1-rc3-24005-00",
"System.Text.Encoding.Extensions": "4.0.11-rc2-23931", "System.Text.Encoding.Extensions": "4.0.11-rc3-24005-00",
"System.Threading": "4.0.11-rc2-23931", "System.Threading": "4.0.11-rc3-24005-00",
"System.Threading.Tasks": "4.0.11-rc2-23931", "System.Threading.Tasks": "4.0.11-rc3-24005-00",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-23931", "System.Threading.Tasks.Parallel": "4.0.1-rc3-24005-00",
"System.Threading.Thread": "4.0.0-rc2-23931", "System.Threading.Thread": "4.0.0-rc3-24005-00",
"System.Xml.ReaderWriter": "4.0.11-rc2-23931", "System.Xml.ReaderWriter": "4.0.11-rc3-24005-00",
"System.Xml.XDocument": "4.0.11-rc2-23931", "System.Xml.XDocument": "4.0.11-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.1-rc2-23931", "System.Xml.XmlDocument": "4.0.1-rc3-24005-00",
"System.Xml.XPath.XDocument": "4.0.1-rc2-23931" "System.Xml.XPath.XDocument": "4.0.1-rc3-24005-00"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册