Misc changes (#226)

* Misc changes * Update VSTS images * Update NuGet test packages * Revert changes to csproj
IronLanguages · Apr 24, 2020 · 47252ae · 47252ae
1 parent 4d72535
commit 47252ae
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -6,7 +6,7 @@ jobs:
   displayName: Windows
   timeoutInMinutes: 180
   pool:
-    vmImage: windows-2019
+    vmImage: windows-latest
   steps:
   - template: Build/steps.yml
     parameters:
@@ -18,7 +18,7 @@ jobs:
   displayName: Linux (Ubuntu)
   timeoutInMinutes: 180
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: ubuntu-latest
   steps:
   - template: Build/steps.yml
     parameters:
@@ -30,7 +30,7 @@ jobs:
   displayName: macOS
   timeoutInMinutes: 180
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: macOS-latest
   steps:
   - template: Build/steps.yml
     parameters:

diff --git a/Src/Microsoft.Dynamic/Ast/ConstantExpression.cs b/Src/Microsoft.Dynamic/Ast/ConstantExpression.cs
@@ -119,11 +119,11 @@ private static Expression CreateArray<T>(T[] array) {
 
         private static Expression ComplexConstant(Complex value) {
             if (value.Real != 0.0) {
-                if (value.Imaginary() != 0.0) {
+                if (value.Imaginary != 0.0) {
                     return Expression.Call(
                         new Func<double, double, Complex>(MathUtils.MakeComplex).GetMethodInfo(),
                         Constant(value.Real),
-                        Constant(value.Imaginary())
+                        Constant(value.Imaginary)
                     );
                 }
 
@@ -135,7 +135,7 @@ private static Expression ComplexConstant(Complex value) {
 
             return Expression.Call(
                 new Func<double, Complex>(MathUtils.MakeImaginary).GetMethodInfo(),
-                Constant(value.Imaginary())
+                Constant(value.Imaginary)
             );
         }
     }

diff --git a/Tests/ClrAssembly/ClrAssembly.csproj b/Tests/ClrAssembly/ClrAssembly.csproj
@@ -127,6 +127,7 @@
 
   <ItemGroup>
     <Compile Include="dummy.cs" />
+    <None Include="Src\**\*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/Metadata/Metadata.csproj b/Tests/Metadata/Metadata.csproj
@@ -15,8 +15,11 @@
 
   <ItemGroup>
     <PackageReference Include="NUnitLite" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
@@ -6,8 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="NUnitLite" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
@@ -6,8 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="NUnitLite" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>