Skip to content

Commit ad97e80

Browse files
filipwfilipw
committed
updated to Roslyn 2.3.1
1 parent fded1de commit ad97e80

8 files changed

Lines changed: 46 additions & 31 deletions

File tree

‎src/ScriptCs.Engine.Roslyn/ScriptCs.Engine.Roslyn.csproj‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Microsoft.CodeAnalysis, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
36+
<Reference Include="Microsoft.CodeAnalysis, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
37+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
39+
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
42+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Microsoft.CodeAnalysis.Scripting, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
45+
<Reference Include="Microsoft.CodeAnalysis.Scripting, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -71,9 +71,8 @@
7171
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7272
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
7373
</Reference>
74-
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
76-
<Private>True</Private>
74+
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
75+
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
7776
</Reference>
7877
<Reference Include="System.Xml.Linq" />
7978
<Reference Include="System.Data.DataSetExtensions" />

‎src/ScriptCs.Engine.Roslyn/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
4747
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
4848
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
52+
</dependentAssembly>
4953
</assemblyBinding>
5054
</runtime>
5155
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎src/ScriptCs.Engine.Roslyn/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
4-
<package id="Microsoft.CodeAnalysis.Common" version="2.2.0" targetFramework="net461" />
5-
<package id="Microsoft.CodeAnalysis.CSharp" version="2.2.0" targetFramework="net461" />
6-
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.2.0" targetFramework="net461" />
7-
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="2.2.0" targetFramework="net461" />
4+
<package id="Microsoft.CodeAnalysis.Common" version="2.3.1" targetFramework="net461" />
5+
<package id="Microsoft.CodeAnalysis.CSharp" version="2.3.1" targetFramework="net461" />
6+
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.3.1" targetFramework="net461" />
7+
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="2.3.1" targetFramework="net461" />
88
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
99
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
1010
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
@@ -41,7 +41,7 @@
4141
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
4242
<package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
4343
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
44-
<package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
44+
<package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
4545
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
4646
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
4747
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />

‎src/ScriptCs/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
4242
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
4343
</dependentAssembly>
44+
<dependentAssembly>
45+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
46+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
47+
</dependentAssembly>
4448
</assemblyBinding>
4549
</runtime>
4650
</configuration>

‎test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@
5858
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
5959
</ItemGroup>
6060
<ItemGroup>
61-
<Reference Include="Microsoft.CodeAnalysis, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
61+
<Reference Include="Microsoft.CodeAnalysis, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
6363
</Reference>
64-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
64+
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
67+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.CodeAnalysis.Scripting, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.2.0\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
70+
<Reference Include="Microsoft.CodeAnalysis.Scripting, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.3.1\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
7272
</Reference>
7373
<Reference Include="Moq">
7474
<HintPath>..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
@@ -110,8 +110,8 @@
110110
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
111111
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
112112
</Reference>
113-
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
114-
<HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
113+
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
114+
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
115115
</Reference>
116116
<Reference Include="System.Xml" />
117117
<Reference Include="System.Xml.Linq" />

‎test/ScriptCs.Engine.Roslyn.Tests/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
5959
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
6060
</dependentAssembly>
61+
<dependentAssembly>
62+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
63+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
64+
</dependentAssembly>
6165
</assemblyBinding>
6266
</runtime>
6367
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎test/ScriptCs.Engine.Roslyn.Tests/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<package id="AutoFixture.AutoMoq" version="3.18.8" targetFramework="net45" />
55
<package id="AutoFixture.Xunit" version="3.18.8" targetFramework="net45" />
66
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
7-
<package id="Microsoft.CodeAnalysis.Common" version="2.2.0" targetFramework="net461" />
8-
<package id="Microsoft.CodeAnalysis.CSharp" version="2.2.0" targetFramework="net461" />
9-
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.2.0" targetFramework="net461" />
10-
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="2.2.0" targetFramework="net461" />
7+
<package id="Microsoft.CodeAnalysis.Common" version="2.3.1" targetFramework="net461" />
8+
<package id="Microsoft.CodeAnalysis.CSharp" version="2.3.1" targetFramework="net461" />
9+
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.3.1" targetFramework="net461" />
10+
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="2.3.1" targetFramework="net461" />
1111
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
1212
<package id="Should" version="1.1.20" targetFramework="net45" />
1313
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
@@ -47,7 +47,7 @@
4747
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
4848
<package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
4949
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
50-
<package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
50+
<package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
5151
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
5252
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
5353
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />

‎test/ScriptCs.Tests/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
4747
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
4848
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
52+
</dependentAssembly>
4953
</assemblyBinding>
5054
</runtime>
5155
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

0 commit comments

Comments
 (0)