diff --git a/build/Defaults/app.config b/build/Defaults/app.config
index 160a172af9be2fe34c92481a8d0747701e3af076..60d330061933a350ecb667ddca5b0199504c85cd 100644
--- a/build/Defaults/app.config
+++ b/build/Defaults/app.config
@@ -19,7 +19,7 @@
-
+
diff --git a/build/Targets/VSL.Versions.targets b/build/Targets/VSL.Versions.targets
index b72e03865585654592a6481f77ad785165bd044e..3151264d135ed8f9ae84af468596ff27bfa76ae2 100644
--- a/build/Targets/VSL.Versions.targets
+++ b/build/Targets/VSL.Versions.targets
@@ -4,9 +4,9 @@
$(RoslynSemanticVersion)
- 1.2.0
- 1.1.37
- 1.0.7
+ 1.3.0-rc3-24005-00
+ 1.2.0-rc3-24005-00
+ 1.0.8-rc2-60325
1.3.3
1.0.0
0.10.6-rc2
diff --git a/build/bootstrap/VBCSCompiler.exe.config b/build/bootstrap/VBCSCompiler.exe.config
index 459729af9f86097b7e15133cd95fc66760809429..aca7d21eb49c146f990399baf742514fe10f1b4d 100644
--- a/build/bootstrap/VBCSCompiler.exe.config
+++ b/build/bootstrap/VBCSCompiler.exe.config
@@ -18,11 +18,11 @@
-
+
-
+
diff --git a/build/bootstrap/csc.exe.config b/build/bootstrap/csc.exe.config
index 9be715f9092c425c97b09109c19e3baf8dee61b6..c7b83e6ff83a57d55c39f5f722ce98255859c38b 100644
--- a/build/bootstrap/csc.exe.config
+++ b/build/bootstrap/csc.exe.config
@@ -18,11 +18,11 @@
-
+
-
+
diff --git a/build/bootstrap/vbc.exe.config b/build/bootstrap/vbc.exe.config
index d6f37ddd737ea43b945df3e1129d45ad43419cec..8ffdbd404a472c58c1ee54697fd4df3db3984f24 100644
--- a/build/bootstrap/vbc.exe.config
+++ b/build/bootstrap/vbc.exe.config
@@ -18,11 +18,11 @@
-
+
-
+
diff --git a/build/scripts/crossgen.sh b/build/scripts/crossgen.sh
index 377d781edbf59d94ee028d63c639490591aaa472..5162042f53fcdb2bfccc78d33b3dde2010b8c0db 100755
--- a/build/scripts/crossgen.sh
+++ b/build/scripts/crossgen.sh
@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then
fi
# 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
diff --git a/src/Compilers/CSharp/Portable/CodeGen/CodeGenerator.cs b/src/Compilers/CSharp/Portable/CodeGen/CodeGenerator.cs
index 4223d874f01475a1ff8254ddc95c1c53c843bb2e..89aaf4b973e4a5a02275926246709940d7f92fb7 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/CodeGenerator.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/CodeGenerator.cs
@@ -15,6 +15,7 @@
using Microsoft.CodeAnalysis.Symbols;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{
diff --git a/src/Compilers/CSharp/Portable/CodeGen/EmitAddress.cs b/src/Compilers/CSharp/Portable/CodeGen/EmitAddress.cs
index 1c27bd37e5f04c3633665d0ae3fa1cfd7e6b9765..55a3a901e0f26312b6af50e80f8da0480eb469fe 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/EmitAddress.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/EmitAddress.cs
@@ -7,6 +7,7 @@
using Microsoft.CodeAnalysis.CodeGen;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Roslyn.Utilities;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{
diff --git a/src/Compilers/CSharp/Portable/CodeGen/EmitArrayInitializer.cs b/src/Compilers/CSharp/Portable/CodeGen/EmitArrayInitializer.cs
index 11a47bf1db4fb557e5125640389a449171996079..777ad14fade5d5c4a87b61ed1836d95989f49dcb 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/EmitArrayInitializer.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/EmitArrayInitializer.cs
@@ -10,6 +10,7 @@
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{
diff --git a/src/Compilers/CSharp/Portable/CodeGen/EmitConversion.cs b/src/Compilers/CSharp/Portable/CodeGen/EmitConversion.cs
index 930d3779aa5c6e9619a0ff99f57f73464628f03f..4dc18ad5be2b896b311cd77a46ea2400de47fe36 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/EmitConversion.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/EmitConversion.cs
@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{
diff --git a/src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs b/src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs
index 2023912e829c3782a20f7cd3885e909517fd7edd..4ea2e81f7fb70e41fe449489c36eb61794e9cc1f 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs
@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CodeGen;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Roslyn.Utilities;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{
diff --git a/src/Compilers/CSharp/Portable/CodeGen/EmitOperators.cs b/src/Compilers/CSharp/Portable/CodeGen/EmitOperators.cs
index 4a5e32fd35574e0f5e0cf69c12fc84bfe0009fa1..7d5927c6f2c9a31ca12e01eceea0ca20b2f73be5 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/EmitOperators.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/EmitOperators.cs
@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Microsoft.CodeAnalysis.CSharp.CodeGen
{
diff --git a/src/Compilers/CSharp/Test/Emit/project.json b/src/Compilers/CSharp/Test/Emit/project.json
index 516576678f2cc505005a856e3cb385fcd63f5a1c..8df815e349ae11fdbc99d317f03421e18ec6fdee 100644
--- a/src/Compilers/CSharp/Test/Emit/project.json
+++ b/src/Compilers/CSharp/Test/Emit/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Compilers/CSharp/csc/csc.exe.config b/src/Compilers/CSharp/csc/csc.exe.config
index da6ab72526571a3dd89830aaa38691c1462c9258..ec3970f8baa00f9a3322190f0c1fd61bcbd16469 100644
--- a/src/Compilers/CSharp/csc/csc.exe.config
+++ b/src/Compilers/CSharp/csc/csc.exe.config
@@ -20,11 +20,11 @@
-
+
-
+
diff --git a/src/Compilers/Core/MSBuildTask/Portable/project.json b/src/Compilers/Core/MSBuildTask/Portable/project.json
index 7f6de431cfd2323ca4d322ee2c542abe74b15574..449056c633239d85e1abb1d12e6f4417ae78ddaa 100644
--- a/src/Compilers/Core/MSBuildTask/Portable/project.json
+++ b/src/Compilers/Core/MSBuildTask/Portable/project.json
@@ -5,12 +5,13 @@
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00005",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00005",
"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.Process": "4.1.0-rc2-23931",
- "System.IO.Pipes": "4.0.0-rc2-23931",
- "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931",
- "System.IO.FileSystem.DriveInfo": "4.0.0-rc2-23931"
+ "System.Diagnostics.Process": "4.1.0-rc3-24005-00",
+ "System.IO.Pipes": "4.0.0-rc3-24005-00",
+ "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24005-00",
+ "System.IO.FileSystem": "4.0.1-rc3-24005-00",
+ "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-24005-00"
},
"frameworks": {
"netstandard1.3": {
diff --git a/src/Compilers/Core/MSBuildTaskTests/project.json b/src/Compilers/Core/MSBuildTaskTests/project.json
index 16d0c09f79719711d80397b9770704964f73c1d2..6e967c3cc16d3e68ae28060dad2e68b3c2d6fcf2 100644
--- a/src/Compilers/Core/MSBuildTaskTests/project.json
+++ b/src/Compilers/Core/MSBuildTaskTests/project.json
@@ -1,7 +1,6 @@
{
"dependencies": {
-
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Moq": "4.2.1402.2112",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
diff --git a/src/Compilers/Core/Portable/project.json b/src/Compilers/Core/Portable/project.json
index eef1946998e86150975d3f6a3905bdd5221c1e27..68a61ab11f715019f57a02704be1582d41d02439 100644
--- a/src/Compilers/Core/Portable/project.json
+++ b/src/Compilers/Core/Portable/project.json
@@ -1,8 +1,8 @@
{
"supports": {},
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
diff --git a/src/Compilers/Server/VBCSCompiler/app.config b/src/Compilers/Server/VBCSCompiler/app.config
index bdbdf7e893bb86caa31047da97ab2ee90468edaa..1a7a5252dc9914324c38ec8ae13415e940699b9e 100644
--- a/src/Compilers/Server/VBCSCompiler/app.config
+++ b/src/Compilers/Server/VBCSCompiler/app.config
@@ -20,11 +20,11 @@
-
+
-
+
@@ -33,4 +33,4 @@
Set to -1 to never shut down the server. -->
-
\ No newline at end of file
+
diff --git a/src/Compilers/Server/VBCSCompiler/project.json b/src/Compilers/Server/VBCSCompiler/project.json
index e71fca7af2487fe704ed6fa3356f0c9e433a48fc..055234a4f920e9831c6953cddd7e93a08d15b683 100644
--- a/src/Compilers/Server/VBCSCompiler/project.json
+++ b/src/Compilers/Server/VBCSCompiler/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
},
"frameworks": {
"net45": { }
diff --git a/src/Compilers/Server/VBCSCompilerTests/project.json b/src/Compilers/Server/VBCSCompilerTests/project.json
index a0df76ffa4f53c190a20a81b31416c9ab80884e6..3ad0504e5c3765a623f699993bda14849e97e719 100644
--- a/src/Compilers/Server/VBCSCompilerTests/project.json
+++ b/src/Compilers/Server/VBCSCompilerTests/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Moq": "4.2.1402.2112",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
diff --git a/src/Compilers/Test/Utilities/CSharp/project.json b/src/Compilers/Test/Utilities/CSharp/project.json
index dbe0216cc568e1c6a91c28117dfb5f7f7af2b064..dc440631920b348583ae3f23707014bcb4801a46 100644
--- a/src/Compilers/Test/Utilities/CSharp/project.json
+++ b/src/Compilers/Test/Utilities/CSharp/project.json
@@ -1,6 +1,5 @@
{
"dependencies": {
- "System.Reflection.TypeExtensions": "4.0.0"
},
"frameworks": {
"netstandard1.3": {
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/CodeGenerator.vb b/src/Compilers/VisualBasic/Portable/CodeGen/CodeGenerator.vb
index ab716ef49f074cee883d846ced69d7efc3945b35..3f481b5c382afec8560c12b77dc5b9b68cdbec4e 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/CodeGenerator.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/CodeGenerator.vb
@@ -9,6 +9,7 @@ Imports Microsoft.CodeAnalysis.Symbols
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Emit
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
Friend NotInheritable Class CodeGenerator
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/EmitAddress.vb b/src/Compilers/VisualBasic/Portable/CodeGen/EmitAddress.vb
index d0beb772c822856d0633ce4c3530bffb36f7515f..59f85e756dd02d0152eb1630d554f67e91b1a471 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/EmitAddress.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/EmitAddress.vb
@@ -3,6 +3,7 @@
Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/EmitArrayInitializer.vb b/src/Compilers/VisualBasic/Portable/CodeGen/EmitArrayInitializer.vb
index 8123b8b3a868cd6c8a3888de533aa793b65c6d79..432d9b97de0c2691e424d37a269f17f7a1467561 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/EmitArrayInitializer.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/EmitArrayInitializer.vb
@@ -12,6 +12,7 @@ Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports TypeKind = Microsoft.CodeAnalysis.TypeKind
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/EmitConversion.vb b/src/Compilers/VisualBasic/Portable/CodeGen/EmitConversion.vb
index 978e4f9d8f93d9086890e9f88a7d5a2590afc4e1..c211dae11080431079477eed9897b58219a80cc5 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/EmitConversion.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/EmitConversion.vb
@@ -4,6 +4,7 @@ Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports PrimitiveTypeCode = Microsoft.Cci.PrimitiveTypeCode
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/EmitExpression.vb b/src/Compilers/VisualBasic/Portable/CodeGen/EmitExpression.vb
index 760dd61bed1eb4806a417f485f071597c3474a5d..b7a86ce20f98e4cf63a2b2dfc4c0e27cfcc9fb44 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/EmitExpression.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/EmitExpression.vb
@@ -9,6 +9,7 @@ Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports TypeKind = Microsoft.CodeAnalysis.TypeKind
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/EmitOperators.vb b/src/Compilers/VisualBasic/Portable/CodeGen/EmitOperators.vb
index f0ab6754743e7286371b0b016220d8b5db41075e..21d8303516fc70a7b430afacf3949be307fcee3a 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/EmitOperators.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/EmitOperators.vb
@@ -3,6 +3,7 @@
Imports System.Reflection.Metadata
Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
diff --git a/src/Compilers/VisualBasic/Portable/CodeGen/EmitStatement.vb b/src/Compilers/VisualBasic/Portable/CodeGen/EmitStatement.vb
index c49f4dea46cc9e8913656d7c885d0374fb055e62..f7dafe473a2c79dd2ab6dc3a6a9679319b132798 100644
--- a/src/Compilers/VisualBasic/Portable/CodeGen/EmitStatement.vb
+++ b/src/Compilers/VisualBasic/Portable/CodeGen/EmitStatement.vb
@@ -7,6 +7,7 @@ Imports Microsoft.CodeAnalysis.CodeGen
Imports Microsoft.CodeAnalysis.Collections
Imports Microsoft.CodeAnalysis.Emit
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
+Imports ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode
Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
diff --git a/src/Compilers/VisualBasic/Test/Emit/project.json b/src/Compilers/VisualBasic/Test/Emit/project.json
index 516576678f2cc505005a856e3cb385fcd63f5a1c..8df815e349ae11fdbc99d317f03421e18ec6fdee 100644
--- a/src/Compilers/VisualBasic/Test/Emit/project.json
+++ b/src/Compilers/VisualBasic/Test/Emit/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Compilers/VisualBasic/vbc/vbc.exe.config b/src/Compilers/VisualBasic/vbc/vbc.exe.config
index da6ab72526571a3dd89830aaa38691c1462c9258..ec3970f8baa00f9a3322190f0c1fd61bcbd16469 100644
--- a/src/Compilers/VisualBasic/vbc/vbc.exe.config
+++ b/src/Compilers/VisualBasic/vbc/vbc.exe.config
@@ -20,11 +20,11 @@
-
+
-
+
diff --git a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
index 0a5b56226c9fbc527a19ce4fc78c4267dc475fa5..afa7af797a68eba27202609ea21fbc8384d3b329 100644
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
@@ -1,13 +1,12 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "System.Collections": "4.0.10",
- "System.Diagnostics.Debug": "4.0.10",
- "System.Runtime": "4.0.20",
- "System.Runtime.Extensions": "4.0.10",
- "System.Runtime.InteropServices": "4.0.20",
- "System.IO.FileSystem": "4.0.0",
- "System.Runtime.InteropServices": "4.0.20",
+ "System.Collections": "4.0.11-rc3-24005-00",
+ "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
+ "System.Runtime": "4.1.0-rc3-24005-00",
+ "System.Runtime.Extensions": "4.1.0-rc3-24005-00",
+ "System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
+ "System.IO.FileSystem": "4.0.1-rc3-24005-00",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec
index 213608d7c80f5bd3535066cf022643fa47c146bb..4686aa13625094c92f810159bea28b212a5b56e8 100644
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec
@@ -13,22 +13,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
en-US
diff --git a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json
index 7c529c56f634dd0705d3f03fa07d5ed6fd745529..af111613388bd586ba0e5337488c964fe6d1a597 100644
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
diff --git a/src/Dependencies/Microsoft.DiaSymReader/Microsoft.DiaSymReader.nuspec b/src/Dependencies/Microsoft.DiaSymReader/Microsoft.DiaSymReader.nuspec
index 2a3ce3abb836fe00e676466da04b8d1af7178ece..8133be46bf9d961598380d5487a29d14342d759b 100644
--- a/src/Dependencies/Microsoft.DiaSymReader/Microsoft.DiaSymReader.nuspec
+++ b/src/Dependencies/Microsoft.DiaSymReader/Microsoft.DiaSymReader.nuspec
@@ -8,9 +8,9 @@
-
-
-
+
+
+
en-US
diff --git a/src/EditorFeatures/CSharpTest/app.config b/src/EditorFeatures/CSharpTest/app.config
index 4bf71e201e0b1885ff607ff5b6a7fce721060214..7de1ee10bb46ca6cd080c7665efbf41bf2a02443 100644
--- a/src/EditorFeatures/CSharpTest/app.config
+++ b/src/EditorFeatures/CSharpTest/app.config
@@ -17,7 +17,7 @@
-
+
diff --git a/src/EditorFeatures/Core/project.json b/src/EditorFeatures/Core/project.json
index fc80438addd941e7e47af710958c69917a645b58..645f90a7fa263c1320d6a80d30ae17a3d89b16a9 100644
--- a/src/EditorFeatures/Core/project.json
+++ b/src/EditorFeatures/Core/project.json
@@ -1,6 +1,5 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37"
},
"frameworks": {
"net46": {}
diff --git a/src/EditorFeatures/Test/app.config b/src/EditorFeatures/Test/app.config
index 4bf71e201e0b1885ff607ff5b6a7fce721060214..7de1ee10bb46ca6cd080c7665efbf41bf2a02443 100644
--- a/src/EditorFeatures/Test/app.config
+++ b/src/EditorFeatures/Test/app.config
@@ -17,7 +17,7 @@
-
+
diff --git a/src/EditorFeatures/Test2/app.config b/src/EditorFeatures/Test2/app.config
index 4bf71e201e0b1885ff607ff5b6a7fce721060214..7de1ee10bb46ca6cd080c7665efbf41bf2a02443 100644
--- a/src/EditorFeatures/Test2/app.config
+++ b/src/EditorFeatures/Test2/app.config
@@ -17,7 +17,7 @@
-
+
diff --git a/src/EditorFeatures/VisualBasicTest/app.config b/src/EditorFeatures/VisualBasicTest/app.config
index 4bf71e201e0b1885ff607ff5b6a7fce721060214..7de1ee10bb46ca6cd080c7665efbf41bf2a02443 100644
--- a/src/EditorFeatures/VisualBasicTest/app.config
+++ b/src/EditorFeatures/VisualBasicTest/app.config
@@ -17,7 +17,7 @@
-
+
diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
index 516576678f2cc505005a856e3cb385fcd63f5a1c..8df815e349ae11fdbc99d317f03421e18ec6fdee 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json
index e1b7a1f9b2efbfd1651a74b8dfc8e28799e0aea1..9f9e011da7edba87faf9f19d4e4e6025916ef4d7 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.Portable.il b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.Portable.il
index 224b81b4d34d7663c7903e73c969c8a8bd4ab649..3fc1ebd1a9b282541179d2aa2dac4aaa9527c3ab 100644
--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.Portable.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.Portable.il
@@ -6,17 +6,17 @@
.assembly extern System.Globalization
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:10:0
+ .ver 4:0:0:0
}
.assembly extern System.Runtime
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:20:0
+ .ver 4:0:0:0
}
.assembly extern System.Runtime.InteropServices
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:20:0
+ .ver 4:0:0:0
}
.assembly Microsoft.VisualStudio.Debugger.Engine
{
diff --git a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.Portable.il b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.Portable.il
index a89571bdca9b59d240c263a574602957f693d72d..22baf5c1fa804f7976ace9ce0580de72586ffbff 100644
--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.Portable.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.Portable.il
@@ -1,17 +1,17 @@
.assembly extern 'System.Globalization'
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:10:0
+ .ver 4:0:0:0
}
.assembly extern 'System.IO'
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:10:0
+ .ver 4:0:0:0
}
.assembly extern 'System.Reflection'
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:10:0
+ .ver 4:0:0:0
}
.assembly extern 'System.Reflection.Extensions'
{
@@ -26,12 +26,12 @@
.assembly extern 'System.Runtime'
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:20:0
+ .ver 4:0:0:0
}
.assembly extern 'System.Runtime.InteropServices'
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A)
- .ver 4:0:20:0
+ .ver 4:0:0:0
}
.assembly 'Microsoft.VisualStudio.Debugger.Metadata'
{
diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
index e10b5dd6970e9b250a6ab375f99d65f071ab1eb1..3356b6535dbc8f0bf1d827c42be0cd8fcb009e07 100644
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7"
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
index c4bf42440ed75cb50984209ca98531ff5641adbf..df3773ac4b229f6ad1780e89cdff6510acc7f0e2 100644
--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
index 855ee153c5647578c58be9446c77ecfc4a68b6c3..505efff2f782ee6a1e018f59817b5ccad454b724 100644
--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
index 516576678f2cc505005a856e3cb385fcd63f5a1c..8df815e349ae11fdbc99d317f03421e18ec6fdee 100644
--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Interactive/CsiCore/Csi.cs b/src/Interactive/CsiCore/Csi.cs
index 9d383690563e0a1d06b352148e7acb2e0ae26d9f..ebec3d79e6155974669e2be9f2d05aa605ee8a99 100644
--- a/src/Interactive/CsiCore/Csi.cs
+++ b/src/Interactive/CsiCore/Csi.cs
@@ -24,6 +24,7 @@ internal static int Main(string[] args)
baseDirectory: Directory.GetCurrentDirectory(),
sdkDirectoryOpt: CorLightup.Desktop.TryGetRuntimeDirectory(),
args: args,
+ clientDirectory: AppContext.BaseDirectory,
analyzerLoader: new NotImplementedAnalyzerLoader());
var runner = new CommandLineRunner(
diff --git a/src/Interactive/CsiCore/project.json b/src/Interactive/CsiCore/project.json
index 7a792911bbc63ee822806636c0d84d85d1d7cc96..e769de2d368a929b59c0d01341f4e76e038d1d40 100644
--- a/src/Interactive/CsiCore/project.json
+++ b/src/Interactive/CsiCore/project.json
@@ -1,5 +1,7 @@
{
- "dependencies": { },
+ "dependencies": {
+ "System.AppContext": "4.1.0-rc3-24005-00"
+ },
"frameworks": {
"dnxcore50": {
"imports": "portable-net452"
diff --git a/src/Interactive/VbiCore/Vbi.vb b/src/Interactive/VbiCore/Vbi.vb
index 9849112cceae5076862228bbd35df82e5fa44476..418bc5909eb9a7cc351e906c327eca0537cc60b0 100644
--- a/src/Interactive/VbiCore/Vbi.vb
+++ b/src/Interactive/VbiCore/Vbi.vb
@@ -17,6 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting
responseFile,
AppContext.BaseDirectory,
CorLightup.Desktop.TryGetRuntimeDirectory(),
+ AppContext.BaseDirectory,
args,
New NotImplementedAnalyzerLoader())
diff --git a/src/Interactive/VbiCore/project.json b/src/Interactive/VbiCore/project.json
index 7a792911bbc63ee822806636c0d84d85d1d7cc96..7353d83201ce252cfddd90bf28b4f03fca8f8675 100644
--- a/src/Interactive/VbiCore/project.json
+++ b/src/Interactive/VbiCore/project.json
@@ -1,5 +1,7 @@
{
- "dependencies": { },
+ "dependencies": {
+ "System.AppContext": "4.1.0-rc3-24005-00"
+ },
"frameworks": {
"dnxcore50": {
"imports": "portable-net452"
diff --git a/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec
index 2a9cef0efe6c307e6ba2e34f9cef21ee6e0e98e5..d46cb2317292ac3a7abb71676c206b57b3da6553 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec
+++ b/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec
@@ -21,44 +21,44 @@ Supported Platforms:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
index 639dcdf1bab4ba4833ebea6a369d566870d0a38f..527f9a76fb58ba26d96ea755b5a4789181a4842e 100644
--- a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
+++ b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
@@ -19,30 +19,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
index ebc3f68d8e414c60bf96517681e8be358fc4abfe..fe504e03fa140a8527f028501ba76633c2f3646a 100644
--- a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
+++ b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
@@ -18,44 +18,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Samples/CSharp/APISampleUnitTests/project.json b/src/Samples/CSharp/APISampleUnitTests/project.json
index 6585037c5ed1f33231f0debab99994851851e978..31b584a1a6f9579c9ef91919d927b4f80949b8ad 100644
--- a/src/Samples/CSharp/APISampleUnitTests/project.json
+++ b/src/Samples/CSharp/APISampleUnitTests/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json
index 2d955c53d9e70224c576263773257ef29e6c44c3..237973dbfd212d521154d7c3c5b53abc463e06ec 100644
--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json
index 99bbe9be9c02772df0586f68f2c53b729c5b75b0..2eeeddbae3e52cf8202ad33cd0638dd2e30fb278 100644
--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
diff --git a/src/Samples/CSharp/ConsoleClassifier/project.json b/src/Samples/CSharp/ConsoleClassifier/project.json
index 7933a7dad6a8334b9848f1bc23dce3f240ba5335..1dad17c2c86a8861fbc161024ba7dc5449e12c77 100644
--- a/src/Samples/CSharp/ConsoleClassifier/project.json
+++ b/src/Samples/CSharp/ConsoleClassifier/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"Microsoft.Composition": "1.0.27"
},
"frameworks": {
diff --git a/src/Samples/CSharp/ConvertToAutoProperty/project.json b/src/Samples/CSharp/ConvertToAutoProperty/project.json
index 7d01885baa3e50cb9e022029d75f555402e4f113..8e058ff4e70f366e8dcd05bd25dfee186349d613 100644
--- a/src/Samples/CSharp/ConvertToAutoProperty/project.json
+++ b/src/Samples/CSharp/ConvertToAutoProperty/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/CSharp/ConvertToConditional/Impl/project.json b/src/Samples/CSharp/ConvertToConditional/Impl/project.json
index 75444879df1c7175f7fd633cdea8cc6c4aace8ec..8c2108ef7953f108346b3f4a6668dc58edfc3745 100644
--- a/src/Samples/CSharp/ConvertToConditional/Impl/project.json
+++ b/src/Samples/CSharp/ConvertToConditional/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net46": {}
diff --git a/src/Samples/CSharp/ConvertToConditional/Test/project.json b/src/Samples/CSharp/ConvertToConditional/Test/project.json
index 26f5725b71c3a63d12508ecdfa64783fa71c6aa4..c3bd1845280cb93aee00a332f4129ae1419c3a31 100644
--- a/src/Samples/CSharp/ConvertToConditional/Test/project.json
+++ b/src/Samples/CSharp/ConvertToConditional/Test/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Samples/CSharp/CopyPasteWithUsing/project.json b/src/Samples/CSharp/CopyPasteWithUsing/project.json
index 75444879df1c7175f7fd633cdea8cc6c4aace8ec..8c2108ef7953f108346b3f4a6668dc58edfc3745 100644
--- a/src/Samples/CSharp/CopyPasteWithUsing/project.json
+++ b/src/Samples/CSharp/CopyPasteWithUsing/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net46": {}
diff --git a/src/Samples/CSharp/FormatSolution/project.json b/src/Samples/CSharp/FormatSolution/project.json
index 7d01885baa3e50cb9e022029d75f555402e4f113..8e058ff4e70f366e8dcd05bd25dfee186349d613 100644
--- a/src/Samples/CSharp/FormatSolution/project.json
+++ b/src/Samples/CSharp/FormatSolution/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json
index 7d01885baa3e50cb9e022029d75f555402e4f113..8e058ff4e70f366e8dcd05bd25dfee186349d613 100644
--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json
index 2515feed1b098be43fb991e59e77d5d48ac71f56..ac5aa7bfc6d3efcdc38a4692bc97bc6d0239eae3 100644
--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Samples/CSharp/MakeConst/Impl/project.json b/src/Samples/CSharp/MakeConst/Impl/project.json
index 7d01885baa3e50cb9e022029d75f555402e4f113..8e058ff4e70f366e8dcd05bd25dfee186349d613 100644
--- a/src/Samples/CSharp/MakeConst/Impl/project.json
+++ b/src/Samples/CSharp/MakeConst/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/CSharp/RefOutModifier/project.json b/src/Samples/CSharp/RefOutModifier/project.json
index 3b6a562337673313052d49a2e00b76275b707d7c..d1a48e8607c264e8bc3f24e1fb1ea3fa9e141575 100644
--- a/src/Samples/CSharp/RefOutModifier/project.json
+++ b/src/Samples/CSharp/RefOutModifier/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Reflection.Metadata": "1.2.0",
- "System.Collections.Immutable": "1.1.37"
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"net46": {}
diff --git a/src/Samples/CSharp/TreeTransforms/project.json b/src/Samples/CSharp/TreeTransforms/project.json
index 7fdfe3a1099916e9b898ec6ccbcf5cb8eca64814..ea1d17fbb9bcc5ff65fa2b6f7c2399698a225bc2 100644
--- a/src/Samples/CSharp/TreeTransforms/project.json
+++ b/src/Samples/CSharp/TreeTransforms/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/Shared/UnitTestFramework/project.json b/src/Samples/Shared/UnitTestFramework/project.json
index f7f0706a4c815cf1c881cd7c87c5be3a7c21fdd4..8cfe8f57fe7dc9ac3c753ce613fdab04e1f9276e 100644
--- a/src/Samples/Shared/UnitTestFramework/project.json
+++ b/src/Samples/Shared/UnitTestFramework/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
"Moq": "4.2.1402.2112",
- "System.Collections.Immutable": "1.1.37",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/Samples/VisualBasic/APISampleUnitTests/project.json b/src/Samples/VisualBasic/APISampleUnitTests/project.json
index 2515feed1b098be43fb991e59e77d5d48ac71f56..ac5aa7bfc6d3efcdc38a4692bc97bc6d0239eae3 100644
--- a/src/Samples/VisualBasic/APISampleUnitTests/project.json
+++ b/src/Samples/VisualBasic/APISampleUnitTests/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json
index 07a8a3d3b534ee71cd6bc323d9f6fe391e4aa1ca..17cdd55dd4eb5aa4201004c170aa94f1a1ca48f0 100644
--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json
index 38df0f6c3269fe05ddc53172d4851beccac46d9c..1cdb38660110fadc883eb7929aba98e4c901cac8 100644
--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
diff --git a/src/Samples/VisualBasic/ConsoleClassifier/project.json b/src/Samples/VisualBasic/ConsoleClassifier/project.json
index 060ccaa9bb35b6bb8de8a01fba4c5c67ad796520..7dd6e7c3b5c0e2418837c23fad89f50bfe615fbc 100644
--- a/src/Samples/VisualBasic/ConsoleClassifier/project.json
+++ b/src/Samples/VisualBasic/ConsoleClassifier/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json
index 3f5aa604a43163dc00e52946c85b5e7407219de8..52d479c06d66f6956f92ad56095a78071899d7f4 100644
--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json
index 2ae001bf50e9a726f76f7a716f1d08e3a94136fe..6e68c8c2576a7b93a1767fd2541efcea38d4e018 100644
--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Samples/VisualBasic/FormatSolution/project.json b/src/Samples/VisualBasic/FormatSolution/project.json
index 060ccaa9bb35b6bb8de8a01fba4c5c67ad796520..7dd6e7c3b5c0e2418837c23fad89f50bfe615fbc 100644
--- a/src/Samples/VisualBasic/FormatSolution/project.json
+++ b/src/Samples/VisualBasic/FormatSolution/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json
index 3f5aa604a43163dc00e52946c85b5e7407219de8..52d479c06d66f6956f92ad56095a78071899d7f4 100644
--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json
index 2515feed1b098be43fb991e59e77d5d48ac71f56..ac5aa7bfc6d3efcdc38a4692bc97bc6d0239eae3 100644
--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Samples/VisualBasic/MakeConst/Impl/project.json b/src/Samples/VisualBasic/MakeConst/Impl/project.json
index 3f5aa604a43163dc00e52946c85b5e7407219de8..52d479c06d66f6956f92ad56095a78071899d7f4 100644
--- a/src/Samples/VisualBasic/MakeConst/Impl/project.json
+++ b/src/Samples/VisualBasic/MakeConst/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Samples/VisualBasic/RemoveByVal/Impl/project.json b/src/Samples/VisualBasic/RemoveByVal/Impl/project.json
index b703ac3e3fed615cf10749d7fe431502fbb84171..01ede6c0b7a8b3bdef6b13d073bc7c94c0fe6f83 100644
--- a/src/Samples/VisualBasic/RemoveByVal/Impl/project.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Impl/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net46": {}
diff --git a/src/Samples/VisualBasic/RemoveByVal/Test/project.json b/src/Samples/VisualBasic/RemoveByVal/Test/project.json
index 874b88d72f61431788fe2da860ed1db49131ba9d..e1abd1d776a0f53a46fbdfbd4d25cc5e5a38d325 100644
--- a/src/Samples/VisualBasic/RemoveByVal/Test/project.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0",
"xunit.runner.console": "2.1.0"
},
diff --git a/src/Samples/VisualBasic/TreeTransforms/project.json b/src/Samples/VisualBasic/TreeTransforms/project.json
index 0f19a1cebcea1f4a626cccfe853d0f9952d6f3bc..0170f0e3f09a35e840fa73a6cdc34c4c3e1b4091 100644
--- a/src/Samples/VisualBasic/TreeTransforms/project.json
+++ b/src/Samples/VisualBasic/TreeTransforms/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.Composition": "1.0.27",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net452": {}
diff --git a/src/Scripting/CSharp/Hosting/CommandLine/Csi.cs b/src/Scripting/CSharp/Hosting/CommandLine/Csi.cs
index f7bf287efd434080278e896875318b271034ef67..e0fe237949f4517f45c77dfb4dbc09a2713d0f1d 100644
--- a/src/Scripting/CSharp/Hosting/CommandLine/Csi.cs
+++ b/src/Scripting/CSharp/Hosting/CommandLine/Csi.cs
@@ -13,9 +13,9 @@ namespace Microsoft.CodeAnalysis.CSharp.Scripting.Hosting
{
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.
- : base(CSharpCommandLineParser.ScriptRunner, responseFile, args, AppContext.BaseDirectory, baseDirectory, sdkDirectoryOpt, null, analyzerLoader)
+ : base(CSharpCommandLineParser.ScriptRunner, responseFile, args, clientDirectory, baseDirectory, sdkDirectoryOpt, null, analyzerLoader)
{
}
diff --git a/src/Scripting/CSharp/project.json b/src/Scripting/CSharp/project.json
index b42ca6dd417a152dc0380b703b6d1aa2e850dd12..a51f8d90d5d1234f4230e74310a35063d68d72bf 100644
--- a/src/Scripting/CSharp/project.json
+++ b/src/Scripting/CSharp/project.json
@@ -1,7 +1,6 @@
{
"dependencies": {
"Microsoft.CSharp": "4.0.0",
- "System.AppContext": "4.0.0",
"System.Dynamic.Runtime": "4.0.10"
},
"frameworks": {
diff --git a/src/Scripting/CSharpTest.Desktop/project.json b/src/Scripting/CSharpTest.Desktop/project.json
index 98ba848a6b306a4972a8c5f3e61c4cfae0323ed2..4de3cb5569bbb4b09f117cfdaa54e59f0514bf17 100644
--- a/src/Scripting/CSharpTest.Desktop/project.json
+++ b/src/Scripting/CSharpTest.Desktop/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "System.Diagnostics.Process": "4.1.0-rc2-23931"
+ "System.Diagnostics.Process": "4.1.0-rc3-24005-00"
},
"frameworks": {
"net46": {}
diff --git a/src/Scripting/CSharpTest/CommandLineRunnerTests.cs b/src/Scripting/CSharpTest/CommandLineRunnerTests.cs
index 43d8abbaf114a6ba4c496d5a9d9059a0a6b580e1..73bf86c71338a10ae8ffde15304809e1440c5e24 100644
--- a/src/Scripting/CSharpTest/CommandLineRunnerTests.cs
+++ b/src/Scripting/CSharpTest/CommandLineRunnerTests.cs
@@ -42,6 +42,7 @@ public class CommandLineRunnerTests : TestBase
responseFile,
workingDirectory ?? AppContext.BaseDirectory,
null,
+ AppContext.BaseDirectory,
args ?? s_defaultArgs,
new NotImplementedAnalyzerLoader());
diff --git a/src/Scripting/CSharpTest/project.json b/src/Scripting/CSharpTest/project.json
index bf91c4d4aa39376226cfcf8a06b017f8c0950b6c..d4997e04007190a3b91c0a7cbdead71fc48b8cc0 100644
--- a/src/Scripting/CSharpTest/project.json
+++ b/src/Scripting/CSharpTest/project.json
@@ -1,5 +1,7 @@
{
- "dependencies": { },
+ "dependencies": {
+ "System.AppContext": "4.0.0"
+ },
"frameworks": {
"netstandard1.3": {
"imports": [ "portable-net452", "dotnet5.4" ]
diff --git a/src/Scripting/Core/Scripting.csproj b/src/Scripting/Core/Scripting.csproj
index c71de3ddbb74bab5edffc65797afaf6e5357251d..307e17052e668d0ad7e796fc73de5dcef2b1d7b8 100644
--- a/src/Scripting/Core/Scripting.csproj
+++ b/src/Scripting/Core/Scripting.csproj
@@ -39,7 +39,7 @@
-
+
False
diff --git a/src/Scripting/Core/project.json b/src/Scripting/Core/project.json
index 62eea8522a9398e1ceb332141d04360dd14c9745..08a3617d77dc27e3a497db39a8f3d3fd67299aca 100644
--- a/src/Scripting/Core/project.json
+++ b/src/Scripting/Core/project.json
@@ -1,25 +1,24 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "System.AppContext": "4.0.0",
- "System.Collections": "4.0.10",
- "System.Collections.Immutable": "1.1.37",
- "System.Diagnostics.Debug": "4.0.10",
- "System.Diagnostics.StackTrace": "4.0.0",
- "System.Diagnostics.Tools": "4.0.0",
- "System.Globalization": "4.0.10",
- "System.IO": "4.0.10",
- "System.IO.FileSystem": "4.0.0",
- "System.Linq": "4.0.0",
- "System.Linq.Expressions": "4.0.10",
- "System.Reflection": "4.0.10",
- "System.Reflection.Extensions": "4.0.0",
- "System.Resources.ResourceManager": "4.0.0",
- "System.Runtime": "4.0.20",
- "System.Runtime.Extensions": "4.0.10",
- "System.Runtime.InteropServices": "4.0.20",
- "System.Threading": "4.0.10",
- "System.Threading.Tasks": "4.0.10"
+ "System.Collections": "4.0.11-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
+ "System.Diagnostics.StackTrace": "4.0.1-rc3-24005-00",
+ "System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
+ "System.Globalization": "4.0.11-rc3-24005-00",
+ "System.IO": "4.1.0-rc3-24005-00",
+ "System.IO.FileSystem": "4.0.1-rc3-24005-00",
+ "System.Linq": "4.1.0-rc3-24005-00",
+ "System.Linq.Expressions": "4.0.11-rc3-24005-00",
+ "System.Reflection": "4.1.0-rc3-24005-00",
+ "System.Reflection.Extensions": "4.0.1-rc3-24005-00",
+ "System.Resources.ResourceManager": "4.0.1-rc3-24005-00",
+ "System.Runtime": "4.1.0-rc3-24005-00",
+ "System.Runtime.Extensions": "4.1.0-rc3-24005-00",
+ "System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
+ "System.Threading": "4.0.11-rc3-24005-00",
+ "System.Threading.Tasks": "4.0.11-rc3-24005-00"
},
"frameworks": {
"netstandard1.3": {
diff --git a/src/Scripting/VisualBasic/Hosting/CommandLine/Vbi.vb b/src/Scripting/VisualBasic/Hosting/CommandLine/Vbi.vb
index 5728035252210c9636e8381e9b18b5d01275250a..0b78c41e848e2ecba59c397701809b804b1c2297 100644
--- a/src/Scripting/VisualBasic/Hosting/CommandLine/Vbi.vb
+++ b/src/Scripting/VisualBasic/Hosting/CommandLine/Vbi.vb
@@ -12,8 +12,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting
Friend NotInheritable Class VisualBasicInteractiveCompiler
Inherits VisualBasicCompiler
- Friend Sub New(responseFile As String, baseDirectory As String, sdkDirectoryOpt As String, args As String(), analyzerLoader As IAnalyzerAssemblyLoader)
- MyBase.New(VisualBasicCommandLineParser.ScriptRunner, responseFile, args, AppContext.BaseDirectory, baseDirectory, sdkDirectoryOpt, Nothing, analyzerLoader)
+ 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, clientDirectory, baseDirectory, sdkDirectoryOpt, Nothing, analyzerLoader)
End Sub
Friend Overrides Function GetCommandLineMetadataReferenceResolver(loggerOpt As TouchedFileLogger) As MetadataReferenceResolver
diff --git a/src/Scripting/VisualBasic/project.json b/src/Scripting/VisualBasic/project.json
index fbe0a6d8dfcadbf9cea3ebae9c8ec90807ff3e5d..8f6a768fb267fc3fd0973e529cb397cc5fecbcd5 100644
--- a/src/Scripting/VisualBasic/project.json
+++ b/src/Scripting/VisualBasic/project.json
@@ -1,7 +1,6 @@
{
"dependencies": {
- "Microsoft.VisualBasic": "10.0.0",
- "System.AppContext": "4.0.0"
+ "Microsoft.VisualBasic": "10.0.0"
},
"frameworks": {
"netstandard1.3": {
diff --git a/src/Scripting/VisualBasicTest/CommandLineRunnerTests.vb b/src/Scripting/VisualBasicTest/CommandLineRunnerTests.vb
index a18a52911aa2ca2bbdf2fa8216232d9b9b1d5d51..408c0456ad5fc982f9ccbd664921fb036fb6fedc 100644
--- a/src/Scripting/VisualBasicTest/CommandLineRunnerTests.vb
+++ b/src/Scripting/VisualBasicTest/CommandLineRunnerTests.vb
@@ -32,6 +32,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
responseFile,
If(workingDirectory, AppContext.BaseDirectory),
CorLightup.Desktop.TryGetRuntimeDirectory(),
+ AppContext.BaseDirectory,
If(args, s_defaultArgs),
New NotImplementedAnalyzerLoader())
diff --git a/src/Scripting/VisualBasicTest/project.json b/src/Scripting/VisualBasicTest/project.json
index 22e92d7d211c8518f2cb79b5f16b5c0a8c41389e..6955c0a51fb5f01fcf134cd2917886b7ae4c3145 100644
--- a/src/Scripting/VisualBasicTest/project.json
+++ b/src/Scripting/VisualBasicTest/project.json
@@ -1,5 +1,7 @@
{
- "dependencies": { },
+ "dependencies": {
+ "System.AppContext": "4.0.0"
+ },
"frameworks": {
"netstandard1.3": {
"imports": [ "portable-net452", "dotnet5.4" ]
diff --git a/src/Test/PdbUtilities/project.json b/src/Test/PdbUtilities/project.json
index 272910e106242942d11c53b08933bb264fcab35e..020a7c2dcf5397ac9c34b9b0dc2be3a71f129fe4 100644
--- a/src/Test/PdbUtilities/project.json
+++ b/src/Test/PdbUtilities/project.json
@@ -1,10 +1,10 @@
{
"supports": {},
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Microsoft.DiaSymReader.Native": "1.3.3",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
diff --git a/src/Test/Utilities/Desktop/project.json b/src/Test/Utilities/Desktop/project.json
index 45400319a7373b324408116cc3b1504c77001d26..15819975dc6bedec1d50497f5c1f72a875c742ee 100644
--- a/src/Test/Utilities/Desktop/project.json
+++ b/src/Test/Utilities/Desktop/project.json
@@ -1,10 +1,10 @@
{
"dependencies": {
"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",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/Test/Utilities/Portable.FX45/project.json b/src/Test/Utilities/Portable.FX45/project.json
index 14959e3c6dd85af68890882093f5bd47069717b1..a8e16bc296d4adf10a0caad798c4cd3b17ee94b1 100644
--- a/src/Test/Utilities/Portable.FX45/project.json
+++ b/src/Test/Utilities/Portable.FX45/project.json
@@ -1,9 +1,9 @@
{
"dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
- "Microsoft.DiaSymReader": "1.0.7",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00",
"xunit": "2.1.0"
},
"frameworks": {
diff --git a/src/Test/Utilities/Portable/project.json b/src/Test/Utilities/Portable/project.json
index 9d29b3c13cebe7932378a0a03c1824ddc9044075..fa420c069978b4c66f7654df368d8cae931e31a9 100644
--- a/src/Test/Utilities/Portable/project.json
+++ b/src/Test/Utilities/Portable/project.json
@@ -1,18 +1,18 @@
{
"dependencies": {
- "Microsoft.CSharp": "4.0.0",
- "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "System.Collections.Concurrent": "4.0.10",
- "System.Collections.Immutable": "1.1.37",
- "System.Console": "4.0.0-rc2-23931",
- "System.Diagnostics.Debug": "4.0.10",
- "System.Diagnostics.Tools": "4.0.0",
- "System.IO.FileSystem": "4.0.0",
- "System.Reflection.TypeExtensions": "4.0.0",
- "System.Threading.Thread": "4.0.0-rc2-23931",
- "System.Xml.XDocument": "4.0.10",
- "System.Xml.XmlDocument": "4.0.0",
+ "Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
+ "Microsoft.CSharp": "4.0.0",
+ "System.Collections.Concurrent": "4.0.12-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Console": "4.0.0-rc3-24005-00",
+ "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
+ "System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
+ "System.IO.FileSystem": "4.0.1-rc3-24005-00",
+ "System.Reflection.TypeExtensions": "4.1.0-rc3-24005-00",
+ "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.extensibility.execution": "2.1.0"
},
diff --git a/src/Test/Utilities/Shared/Metadata/ILBuilderVisualizer.cs b/src/Test/Utilities/Shared/Metadata/ILBuilderVisualizer.cs
index ad62ed0d4b376e91997de2bd57f27c9f7d7a26a7..7b8086c52bce04ab9587b0baa4d50a5c7352aa6d 100644
--- a/src/Test/Utilities/Shared/Metadata/ILBuilderVisualizer.cs
+++ b/src/Test/Utilities/Shared/Metadata/ILBuilderVisualizer.cs
@@ -10,6 +10,7 @@
using Roslyn.Test.MetadataUtilities;
using Roslyn.Utilities;
using Cci = Microsoft.Cci;
+using ILOpCode = Microsoft.CodeAnalysis.CodeGen.ILOpCode;
namespace Roslyn.Test.Utilities
{
diff --git a/src/Tools/BuildUtil/BuildUtil/project.json b/src/Tools/BuildUtil/BuildUtil/project.json
index 7930d2cb3ba1164e68345e56bd47be2f080609de..4b1a786bafe2efff0ba317da1fe5763886cd4ffd 100644
--- a/src/Tools/BuildUtil/BuildUtil/project.json
+++ b/src/Tools/BuildUtil/BuildUtil/project.json
@@ -10,7 +10,7 @@
"Microsoft.NETCore": "5.0.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NuSpec.ReferenceGenerator": "1.4.2",
- "System.Collections.Immutable": "1.1.37"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00"
},
"frameworks": {
"dotnet": {}
diff --git a/src/Tools/CommonNetCoreReferences/project.json b/src/Tools/CommonNetCoreReferences/project.json
index 0c542625662458ea639de59953037122ff9eaa99..5f1772482dca0add8b72686eb078808c4142b55e 100644
--- a/src/Tools/CommonNetCoreReferences/project.json
+++ b/src/Tools/CommonNetCoreReferences/project.json
@@ -1,52 +1,52 @@
{
"dependencies": {
- "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-23931",
- "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
- "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931",
- "Microsoft.NETCore.TestHost": "1.0.0-rc2-23931",
- "System.AppContext": "4.1.0-rc2-23931",
- "System.Collections": "4.0.11-rc2-23931",
- "System.Collections.Concurrent": "4.0.12-rc2-23931",
- "System.Collections.Immutable": "1.2.0-rc2-23931",
- "System.Console": "4.0.0-rc2-23931",
- "System.Diagnostics.Debug": "4.0.11-rc2-23931",
- "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23931",
- "System.Diagnostics.Process": "4.1.0-rc2-23931",
- "System.Diagnostics.StackTrace": "4.0.1-rc2-23931",
- "System.Diagnostics.Tools": "4.0.1-rc2-23931",
- "System.Dynamic.Runtime": "4.0.11-rc2-23931",
- "System.Globalization": "4.0.11-rc2-23931",
- "System.IO.FileSystem": "4.0.1-rc2-23931",
- "System.IO.FileSystem.Primitives": "4.0.1-rc2-23931",
- "System.IO.FileSystem.Watcher": "4.0.0-rc2-23931",
- "System.IO.Pipes": "4.0.0-rc2-23931",
- "System.Linq": "4.1.0-rc2-23931",
- "System.Linq.Expressions": "4.0.11-rc2-23931",
- "System.Net.NameResolution": "4.0.0-rc2-23931",
- "System.Net.Sockets": "4.1.0-rc2-23931",
- "System.Reflection": "4.1.0-rc2-23931",
- "System.Reflection.Primitives": "4.0.1-rc2-23931",
- "System.Resources.ResourceManager": "4.0.1-rc2-23931",
- "System.Runtime": "4.1.0-rc2-23931",
- "System.Runtime.Extensions": "4.1.0-rc2-23931",
- "System.Runtime.Handles": "4.0.1-rc2-23931",
- "System.Runtime.InteropServices": "4.1.0-rc2-23931",
- "System.Runtime.Loader": "4.0.0-rc2-23931",
- "System.Runtime.Numerics": "4.0.1-rc2-23931",
- "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931",
- "System.Security.Cryptography.Encoding": "4.0.0-rc2-23931",
- "System.Security.Cryptography.X509Certificates": "4.1.0-rc2-23931",
- "System.Text.Encoding": "4.0.11-rc2-23931",
- "System.Text.Encoding.CodePages": "4.0.1-rc2-23931",
- "System.Text.Encoding.Extensions": "4.0.11-rc2-23931",
- "System.Threading": "4.0.11-rc2-23931",
- "System.Threading.Tasks": "4.0.11-rc2-23931",
- "System.Threading.Tasks.Parallel": "4.0.1-rc2-23931",
- "System.Threading.Thread": "4.0.0-rc2-23931",
- "System.Xml.ReaderWriter": "4.0.11-rc2-23931",
- "System.Xml.XDocument": "4.0.11-rc2-23931",
- "System.Xml.XmlDocument": "4.0.1-rc2-23931",
- "System.Xml.XPath.XDocument": "4.0.1-rc2-23931"
+ "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24005-00",
+ "Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24005-00",
+ "Microsoft.NETCore.TestHost": "1.0.0-rc3-24005-00",
+ "System.AppContext": "4.1.0-rc3-24005-00",
+ "System.Collections": "4.0.11-rc3-24005-00",
+ "System.Collections.Concurrent": "4.0.12-rc3-24005-00",
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Console": "4.0.0-rc3-24005-00",
+ "System.Diagnostics.Debug": "4.0.11-rc3-24005-00",
+ "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24005-00",
+ "System.Diagnostics.Process": "4.1.0-rc3-24005-00",
+ "System.Diagnostics.StackTrace": "4.0.1-rc3-24005-00",
+ "System.Diagnostics.Tools": "4.0.1-rc3-24005-00",
+ "System.Dynamic.Runtime": "4.0.11-rc3-24005-00",
+ "System.Globalization": "4.0.11-rc3-24005-00",
+ "System.IO.FileSystem": "4.0.1-rc3-24005-00",
+ "System.IO.FileSystem.Primitives": "4.0.1-rc3-24005-00",
+ "System.IO.FileSystem.Watcher": "4.0.0-rc3-24005-00",
+ "System.IO.Pipes": "4.0.0-rc3-24005-00",
+ "System.Linq": "4.1.0-rc3-24005-00",
+ "System.Linq.Expressions": "4.0.11-rc3-24005-00",
+ "System.Net.NameResolution": "4.0.0-rc3-24005-00",
+ "System.Net.Sockets": "4.1.0-rc3-24005-00",
+ "System.Reflection": "4.1.0-rc3-24005-00",
+ "System.Reflection.Primitives": "4.0.1-rc3-24005-00",
+ "System.Resources.ResourceManager": "4.0.1-rc3-24005-00",
+ "System.Runtime": "4.1.0-rc3-24005-00",
+ "System.Runtime.Extensions": "4.1.0-rc3-24005-00",
+ "System.Runtime.Handles": "4.0.1-rc3-24005-00",
+ "System.Runtime.InteropServices": "4.1.0-rc3-24005-00",
+ "System.Runtime.Loader": "4.0.0-rc3-24005-00",
+ "System.Runtime.Numerics": "4.0.1-rc3-24005-00",
+ "System.Security.Cryptography.Algorithms": "4.1.0-rc3-24005-00",
+ "System.Security.Cryptography.Encoding": "4.0.0-rc3-24005-00",
+ "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24005-00",
+ "System.Text.Encoding": "4.0.11-rc3-24005-00",
+ "System.Text.Encoding.CodePages": "4.0.1-rc3-24005-00",
+ "System.Text.Encoding.Extensions": "4.0.11-rc3-24005-00",
+ "System.Threading": "4.0.11-rc3-24005-00",
+ "System.Threading.Tasks": "4.0.11-rc3-24005-00",
+ "System.Threading.Tasks.Parallel": "4.0.1-rc3-24005-00",
+ "System.Threading.Thread": "4.0.0-rc3-24005-00",
+ "System.Xml.ReaderWriter": "4.0.11-rc3-24005-00",
+ "System.Xml.XDocument": "4.0.11-rc3-24005-00",
+ "System.Xml.XmlDocument": "4.0.1-rc3-24005-00",
+ "System.Xml.XPath.XDocument": "4.0.1-rc3-24005-00"
},
"frameworks": {
"dnxcore50": {
diff --git a/src/Tools/ProcessWatchdog/project.json b/src/Tools/ProcessWatchdog/project.json
index db17ffb6fbdcd510eef5dd4bb80523641fe33d48..b3da26711f4650c419445eb4e4b96430304ab846 100644
--- a/src/Tools/ProcessWatchdog/project.json
+++ b/src/Tools/ProcessWatchdog/project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
"CommandLineParser": "2.0.273-beta",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0-rc2-23826"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net45": {}
diff --git a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
index 60afd65d9efdd27998b04f1f2f05404b6528a0be..49911e4999ce91455633e720bd4fab079ef8f8b6 100644
--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
@@ -1,9 +1,9 @@
{
"dependencies": {
- "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-23931",
- "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
- "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931",
- "Microsoft.NETCore.TestHost": "1.0.0-rc2-23931"
+ "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc3-24005-00",
+ "Microsoft.NETCore.Platforms": "1.0.1-rc3-24005-00",
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24005-00",
+ "Microsoft.NETCore.TestHost": "1.0.0-rc3-24005-00"
},
"frameworks": {
"dnxcore50": {
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
index 11fa54616b641652c223b926b55fa1d467bb1297..d6476edd04a085951f0b9bf4529ff4c6a19aaaa0 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "NETStandard.Library": "1.5.0-rc2-23931",
+ "NETStandard.Library": "1.5.0-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.0",
"System.Xml.XmlSerializer": "4.0.10"
},
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
index 50bdebe167c86caded214e952010c8a8215d1c16..edae5fcb0348162177a650767d9c6458db8ee3b2 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "NETStandard.Library": "1.5.0-rc2-23931",
+ "NETStandard.Library": "1.5.0-rc3-24005-00"
},
"frameworks": {
"dnxcore50": {}
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
index 457e9c00f82901d82226db3ed49a07656c831eb1..599ee2567388462d585dbd6d45084f41d72d398d 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "NETStandard.Library": "1.5.0-rc2-23931",
+ "NETStandard.Library": "1.5.0-rc3-24005-00",
"System.Xml.XmlDocument": "4.0.0",
"System.Xml.XmlSerializer": "4.0.10"
},
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
index 157887e9962871c6f2b999330f7d0a3d1629a4b8..09b594cd792003740b45c350e407e8d25ddaba06 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "NETStandard.Library": "1.5.0-rc2-23931"
+ "NETStandard.Library": "1.5.0-rc3-24005-00"
},
"frameworks": {
"dnxcore50": { }
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
index a8b335df526fcc234d7063e58f9ec2db24f52420..45dd93718673ce1bd7fc2e1e88654914a7140503 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
@@ -1,9 +1,9 @@
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "NETStandard.Library": "1.5.0-rc2-23931",
- "System.Console": "4.0.0-rc2-23931",
- "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931"
+ "NETStandard.Library": "1.5.0-rc3-24005-00",
+ "System.Console": "4.0.0-rc3-24005-00",
+ "System.Security.Cryptography.Algorithms": "4.1.0-rc3-24005-00"
},
"frameworks": {
"dnxcore50": {}
diff --git a/src/Tools/Source/Pdb2Xml/project.json b/src/Tools/Source/Pdb2Xml/project.json
index 7d5e43654888f3bd84477778dc933affdf7beea9..08a38c36c396abe72f8e7c595847d2c8b9e300e8 100644
--- a/src/Tools/Source/Pdb2Xml/project.json
+++ b/src/Tools/Source/Pdb2Xml/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.DiaSymReader": "1.0.7"
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325"
},
"frameworks": {
"net45": {}
diff --git a/src/Tools/Source/RunTests/project.json b/src/Tools/Source/RunTests/project.json
index 028b8f438a066c9e461376d68057b98eb9dcda57..6e42594a6b1908e2758aa420e6d371e42752cdce 100644
--- a/src/Tools/Source/RunTests/project.json
+++ b/src/Tools/Source/RunTests/project.json
@@ -2,8 +2,8 @@
"dependencies": {
"Newtonsoft.Json": "8.0.2",
"RestSharp": "105.2.3",
- "System.Collections.Immutable": "1.1.37",
- "System.Reflection.Metadata": "1.2.0"
+ "System.Collections.Immutable": "1.2.0-rc3-24005-00",
+ "System.Reflection.Metadata": "1.3.0-rc3-24005-00"
},
"frameworks": {
"net45": { }
diff --git a/src/VisualStudio/CSharp/Test/app.config b/src/VisualStudio/CSharp/Test/app.config
index 4bf71e201e0b1885ff607ff5b6a7fce721060214..7de1ee10bb46ca6cd080c7665efbf41bf2a02443 100644
--- a/src/VisualStudio/CSharp/Test/app.config
+++ b/src/VisualStudio/CSharp/Test/app.config
@@ -17,7 +17,7 @@
-
+
diff --git a/src/VisualStudio/Core/Def/project.json b/src/VisualStudio/Core/Def/project.json
index 83ca8db65bfd8b4e6b38c3a550ae96a8261f309b..1e4b279b8c3a9dc24d1a8aa2d345d84c94040ae2 100644
--- a/src/VisualStudio/Core/Def/project.json
+++ b/src/VisualStudio/Core/Def/project.json
@@ -2,13 +2,7 @@
"dependencies": {
"ManagedEsent": "1.9.2.0",
"Microsoft.Composition": "1.0.27",
- "Microsoft.DiaSymReader": "1.0.7",
- "System.Collections": "4.0.10",
- "System.Diagnostics.Debug": "4.0.10",
- "System.Globalization": "4.0.10",
- "System.Runtime": "4.0.20",
- "System.Runtime.Extensions": "4.0.10",
- "System.Threading": "4.0.10",
+ "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
"Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2",
"Microsoft.VisualStudio.Shell.Immutable.14.0": "14.1.24720",
"NuGet.VisualStudio": { "version": "3.3.0", "suppressParent": "all" },
@@ -16,4 +10,4 @@
"frameworks": {
"net46": {}
}
-}
\ No newline at end of file
+}
diff --git a/src/VisualStudio/Core/Test/app.config b/src/VisualStudio/Core/Test/app.config
index 4bf71e201e0b1885ff607ff5b6a7fce721060214..7de1ee10bb46ca6cd080c7665efbf41bf2a02443 100644
--- a/src/VisualStudio/Core/Test/app.config
+++ b/src/VisualStudio/Core/Test/app.config
@@ -17,7 +17,7 @@
-
+
diff --git a/src/VisualStudio/Setup/AssemblyRedirects.cs b/src/VisualStudio/Setup/AssemblyRedirects.cs
index a9da077ca311c6a3163e5c4bd3da42292b6dfef7..599e467d11dc5c7fe3edb8adcde88d467f72323d 100644
--- a/src/VisualStudio/Setup/AssemblyRedirects.cs
+++ b/src/VisualStudio/Setup/AssemblyRedirects.cs
@@ -25,7 +25,15 @@
[assembly: ProvideBindingRedirection(
AssemblyName = "System.Reflection.Metadata",
- OldVersionLowerBound = "1.0.0.0",
+ OldVersionLowerBound = "0.0.0.0",
+ OldVersionUpperBound = "1.2.0.0",
+ NewVersion = "1.3.0.0",
+ PublicKeyToken = "b03f5f7f11d50a3a",
+ GenerateCodeBase = true)]
+
+[assembly: ProvideBindingRedirection(
+ AssemblyName = "System.Collections.Immutable",
+ OldVersionLowerBound = "0.0.0.0",
OldVersionUpperBound = "1.2.0.0",
NewVersion = "1.2.0.0",
PublicKeyToken = "b03f5f7f11d50a3a",
@@ -36,9 +44,9 @@
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.DiaSymReader",
- OldVersionLowerBound = "1.0.0.0",
+ OldVersionLowerBound = "0.0.0.0",
OldVersionUpperBound = "1.0.7.0",
- NewVersion = "1.0.7.0",
+ NewVersion = "1.0.8.0",
PublicKeyToken = "31bf3856ad364e35",
GenerateCodeBase = true)]