Merge pull request dotnet-script#152 from filipw/feature/roslyn-2.4.0

seesharper · web-flow · commit 4a59cd89180a · 2017-10-17T13:12:56.000+02:00
Updated to Roslyn 2.4.0
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -31,12 +31,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.4.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
+    <PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -14,6 +14,6 @@
     <Company>dotnet-script</Company>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.4.0" />
    </ItemGroup>
 </Project>
diff --git a/src/Dotnet.Script.DependencyModel.Tests/CompilationDependencyResolverTests.cs b/src/Dotnet.Script.DependencyModel.Tests/CompilationDependencyResolverTests.cs
@@ -21,23 +21,23 @@ public void ShouldGetCompilationDependenciesForPackageContainingInlineNuGetPacka
         {            
             var resolver = CreateResolver();
             var dependencies =  resolver.GetDependencies("../../../../Dotnet.Script.Tests/TestFixtures/InlineNuGetPackage", true, "netcoreapp2.0");
-            Assert.True(dependencies.Any(d => d.Contains("AutoMapper")));
+            Assert.Contains(dependencies, d => d.Contains("AutoMapper"));
         }
 
         [Fact]
         public void ShouldGetCompilationDependenciesForPackageContainingNativeLibrary()
         {
             var resolver = CreateResolver();
             var dependencies = resolver.GetDependencies("../../../../Dotnet.Script.Tests/TestFixtures/NativeLibrary", true, "netcoreapp2.0");
-            Assert.True(dependencies.Any(d => d.Contains("Microsoft.Data.Sqlite")));
+            Assert.Contains(dependencies, d => d.Contains("Microsoft.Data.Sqlite"));
         }
 
         [Fact]
         public void ShouldGetCompilationDependenciesForIssue129()
         {
             var resolver = CreateResolver();
             var dependencies = resolver.GetDependencies("../../../../Dotnet.Script.Tests/TestFixtures/Issue129", true, "netcoreapp2.0");
-            Assert.True(dependencies.Any(d => d.Contains("Auth0.ManagementApi")));
+            Assert.Contains(dependencies, d => d.Contains("Auth0.ManagementApi"));
         }
 
         private CompilationDependencyResolver CreateResolver()
diff --git a/src/Dotnet.Script.DependencyModel.Tests/Dotnet.Script.DependencyModel.Tests.csproj b/src/Dotnet.Script.DependencyModel.Tests/Dotnet.Script.DependencyModel.Tests.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.3.1" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.4.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" />
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.4.0" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,23 @@ public void ShouldGetCompilationDependenciesForPackageContainingInlineNuGetPacka`
`21`	`21`	`{`
`22`	`22`	`var resolver = CreateResolver();`
`23`	`23`	`var dependencies = resolver.GetDependencies("../../../../Dotnet.Script.Tests/TestFixtures/InlineNuGetPackage", true, "netcoreapp2.0");`
`24`		`- Assert.True(dependencies.Any(d => d.Contains("AutoMapper")));`
	`24`	`+ Assert.Contains(dependencies, d => d.Contains("AutoMapper"));`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`[Fact]`
`28`	`28`	`public void ShouldGetCompilationDependenciesForPackageContainingNativeLibrary()`
`29`	`29`	`{`
`30`	`30`	`var resolver = CreateResolver();`
`31`	`31`	`var dependencies = resolver.GetDependencies("../../../../Dotnet.Script.Tests/TestFixtures/NativeLibrary", true, "netcoreapp2.0");`
`32`		`- Assert.True(dependencies.Any(d => d.Contains("Microsoft.Data.Sqlite")));`
	`32`	`+ Assert.Contains(dependencies, d => d.Contains("Microsoft.Data.Sqlite"));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[Fact]`
`36`	`36`	`public void ShouldGetCompilationDependenciesForIssue129()`
`37`	`37`	`{`
`38`	`38`	`var resolver = CreateResolver();`
`39`	`39`	`var dependencies = resolver.GetDependencies("../../../../Dotnet.Script.Tests/TestFixtures/Issue129", true, "netcoreapp2.0");`
`40`		`- Assert.True(dependencies.Any(d => d.Contains("Auth0.ManagementApi")));`
	`40`	`+ Assert.Contains(dependencies, d => d.Contains("Auth0.ManagementApi"));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private CompilationDependencyResolver CreateResolver()`