Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtm

Update .NET core dependencies to RTM
8 years ago · baa8c31984
parent b5077808fe 0a5a0cab7b
commit baa8c31984
37 changed files with 89 additions and 69 deletions
--- a/src/csharp/Grpc.Auth/project.json
+++ b/src/csharp/Grpc.Auth/project.json
@ -32,9 +32,9 @@
        "net45"
      ],
      "dependencies": {
-        "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027",
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.Threading.Tasks": "4.0.11-rc2-24027"
+        "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+        "NETStandard.Library": "1.6.0",
+        "System.Threading.Tasks": "4.0.11"
      }
    }
  }
--- a/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs
+++ b/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs
@ -40,7 +40,7 @@ namespace Grpc.Core.Tests
 {
    public class AppDomainUnloadTest
    {
-#if NETSTANDARD1_5
+#if NETCOREAPP1_0
        [Test]
        [Ignore("Not supported for CoreCLR")]
        public void AppDomainUnloadHookCanCleanupAbandonedCall()
--- a/src/csharp/Grpc.Core.Tests/NUnitMain.cs
+++ b/src/csharp/Grpc.Core.Tests/NUnitMain.cs
@ -49,7 +49,7 @@ namespace Grpc.Core.Tests
        {
            // Make logger immune to NUnit capturing stdout and stderr to workaround https://github.com/nunit/nunit/issues/1406.
            GrpcEnvironment.SetLogger(new TextWriterLogger(Console.Error));
-#if NETSTANDARD1_5
+#if NETCOREAPP1_0
            return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
            return new AutoRun().Execute(args);
--- a/src/csharp/Grpc.Core.Tests/SanityTest.cs
+++ b/src/csharp/Grpc.Core.Tests/SanityTest.cs
@ -46,7 +46,7 @@ namespace Grpc.Core.Tests
    public class SanityTest
    {
        // TODO: make sanity test work for CoreCLR as well
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
        /// <summary>
        /// Because we depend on a native library, sometimes when things go wrong, the
        /// entire NUnit test process crashes. To be able to track down problems better,
--- a/src/csharp/Grpc.Core.Tests/project.json
+++ b/src/csharp/Grpc.Core.Tests/project.json
@ -61,12 +61,13 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  },
--- a/src/csharp/Grpc.Core/project.json
+++ b/src/csharp/Grpc.Core/project.json
@ -40,8 +40,8 @@
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.Threading.Thread": "4.0.0-rc2-24027"
+        "NETStandard.Library": "1.6.0",
+        "System.Threading.Thread": "4.0.0"
      }
    }
  }
--- a/src/csharp/Grpc.Examples.MathClient/project.json
+++ b/src/csharp/Grpc.Examples.MathClient/project.json
@ -55,12 +55,13 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.Examples.MathServer/project.json
+++ b/src/csharp/Grpc.Examples.MathServer/project.json
@ -55,12 +55,13 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.Examples.Tests/NUnitMain.cs
+++ b/src/csharp/Grpc.Examples.Tests/NUnitMain.cs
@ -49,7 +49,7 @@ namespace Grpc.Examples.Tests
        {
            // Make logger immune to NUnit capturing stdout and stderr to workaround https://github.com/nunit/nunit/issues/1406.
            GrpcEnvironment.SetLogger(new TextWriterLogger(Console.Error));
-#if NETSTANDARD1_5
+#if NETCOREAPP1_0
            return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
            return new AutoRun().Execute(args);
--- a/src/csharp/Grpc.Examples.Tests/project.json
+++ b/src/csharp/Grpc.Examples.Tests/project.json
@ -57,12 +57,13 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.Examples/project.json
+++ b/src/csharp/Grpc.Examples/project.json
@ -20,7 +20,7 @@
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs
+++ b/src/csharp/Grpc.HealthCheck.Tests/NUnitMain.cs
@ -49,7 +49,7 @@ namespace Grpc.HealthCheck.Tests
        {
            // Make logger immune to NUnit capturing stdout and stderr to workaround https://github.com/nunit/nunit/issues/1406.
            GrpcEnvironment.SetLogger(new TextWriterLogger(Console.Error));
-#if NETSTANDARD1_5
+#if NETCOREAPP1_0
            return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
            return new AutoRun().Execute(args);
--- a/src/csharp/Grpc.HealthCheck.Tests/project.json
+++ b/src/csharp/Grpc.HealthCheck.Tests/project.json
@ -57,12 +57,13 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.HealthCheck/project.json
+++ b/src/csharp/Grpc.HealthCheck/project.json
@ -37,7 +37,7 @@
        "portable-net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.IntegrationTesting.Client/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.Client/project.json
@ -57,13 +57,14 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45",
        "net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
@ -57,13 +57,14 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45",
        "net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.IntegrationTesting.Server/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.Server/project.json
@ -57,13 +57,14 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45",
        "net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.IntegrationTesting.StressClient/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.StressClient/project.json
@ -57,13 +57,14 @@
  },
  "frameworks": {
    "net45": { },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45",
        "net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0"
      }
    }
  }
--- a/src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs
+++ b/src/csharp/Grpc.IntegrationTesting/GeneratedClientTest.cs
@ -49,7 +49,7 @@ namespace Grpc.IntegrationTesting
        TestService.TestServiceClient unimplementedClient = new UnimplementedTestServiceClient();

        // TODO: replace Moq by some mocking library with CoreCLR support.
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
        [Test]
        public void ExpandedParamOverloadCanBeMocked()
        {
--- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
+++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
@ -145,7 +145,7 @@ namespace Grpc.IntegrationTesting

            if (options.TestCase == "jwt_token_creds")
            {
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
                var googleCredential = await GoogleCredential.GetApplicationDefaultAsync();
                Assert.IsTrue(googleCredential.IsCreateScopedRequired);
                credentials = ChannelCredentials.Create(credentials, googleCredential.ToCallCredentials());
@ -157,7 +157,7 @@ namespace Grpc.IntegrationTesting

            if (options.TestCase == "compute_engine_creds")
            {
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
                var googleCredential = await GoogleCredential.GetApplicationDefaultAsync();
                Assert.IsFalse(googleCredential.IsCreateScopedRequired);
                credentials = ChannelCredentials.Create(credentials, googleCredential.ToCallCredentials());
@ -395,7 +395,7 @@ namespace Grpc.IntegrationTesting

        public static async Task RunOAuth2AuthTokenAsync(TestService.TestServiceClient client, string oauthScope)
        {
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
            Console.WriteLine("running oauth2_auth_token");
            ITokenAccess credential = (await GoogleCredential.GetApplicationDefaultAsync()).CreateScoped(new[] { oauthScope });
            string oauth2Token = await credential.GetAccessTokenForRequestAsync();
@ -421,7 +421,7 @@ namespace Grpc.IntegrationTesting

        public static async Task RunPerRpcCredsAsync(TestService.TestServiceClient client, string oauthScope)
        {
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
            Console.WriteLine("running per_rpc_creds");
            ITokenAccess googleCredential = await GoogleCredential.GetApplicationDefaultAsync();

@ -731,7 +731,7 @@ namespace Grpc.IntegrationTesting
        // extracts the client_email field from service account file used for auth test cases
        private static string GetEmailFromServiceAccountFile()
        {
-#if !NETSTANDARD1_5
+#if !NETCOREAPP1_0
            string keyFile = Environment.GetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS");
            Assert.IsNotNull(keyFile);
            var jobject = JObject.Parse(File.ReadAllText(keyFile));
--- a/src/csharp/Grpc.IntegrationTesting/NUnitMain.cs
+++ b/src/csharp/Grpc.IntegrationTesting/NUnitMain.cs
@ -49,7 +49,7 @@ namespace Grpc.IntegrationTesting
        {
            // Make logger immune to NUnit capturing stdout and stderr to workaround https://github.com/nunit/nunit/issues/1406.
            GrpcEnvironment.SetLogger(new TextWriterLogger(Console.Error));
-#if NETSTANDARD1_5
+#if NETCOREAPP1_0
            return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
            return new AutoRun().Execute(args);
--- a/src/csharp/Grpc.IntegrationTesting/project.json
+++ b/src/csharp/Grpc.IntegrationTesting/project.json
@ -72,14 +72,15 @@
        "System.IO": ""
      }
    },
-    "netstandard1.5": {
+    "netcoreapp1.0": {
      "imports": [
        "portable-net45",
        "net45"
      ],
      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.Linq.Expressions": "4.0.11-rc2-24027"
+        "Microsoft.NETCore.App": "1.0.0",
+        "NETStandard.Library": "1.6.0",
+        "System.Linq.Expressions": "4.1.0"
      }
    }
  }
--- a/templates/src/csharp/Grpc.Auth/project.json.template
+++ b/templates/src/csharp/Grpc.Auth/project.json.template
@ -34,9 +34,9 @@
          "net45"
        ],
        "dependencies": {
-          "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027",
-          "NETStandard.Library": "1.5.0-rc2-24027",
-          "System.Threading.Tasks": "4.0.11-rc2-24027"
+          "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+          "NETStandard.Library": "1.6.0",
+          "System.Threading.Tasks": "4.0.11"
        }
      }
    }
--- a/templates/src/csharp/Grpc.Core.Tests/project.json.template
+++ b/templates/src/csharp/Grpc.Core.Tests/project.json.template
@ -15,12 +15,13 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    },
--- a/templates/src/csharp/Grpc.Core/project.json.template
+++ b/templates/src/csharp/Grpc.Core/project.json.template
@ -42,8 +42,8 @@
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027",
-          "System.Threading.Thread": "4.0.0-rc2-24027"
+          "NETStandard.Library": "1.6.0",
+          "System.Threading.Thread": "4.0.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.Examples.MathClient/project.json.template
+++ b/templates/src/csharp/Grpc.Examples.MathClient/project.json.template
@ -9,12 +9,13 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.Examples.MathServer/project.json.template
+++ b/templates/src/csharp/Grpc.Examples.MathServer/project.json.template
@ -9,12 +9,13 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.Examples.Tests/project.json.template
+++ b/templates/src/csharp/Grpc.Examples.Tests/project.json.template
@ -11,12 +11,13 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.Examples/project.json.template
+++ b/templates/src/csharp/Grpc.Examples/project.json.template
@ -20,7 +20,7 @@
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.HealthCheck.Tests/project.json.template
+++ b/templates/src/csharp/Grpc.HealthCheck.Tests/project.json.template
@ -11,12 +11,13 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.HealthCheck/project.json.template
+++ b/templates/src/csharp/Grpc.HealthCheck/project.json.template
@ -39,7 +39,7 @@
          "portable-net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template
@ -9,13 +9,14 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45",
          "net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
@ -9,13 +9,14 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45",
          "net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.IntegrationTesting.Server/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting.Server/project.json.template
@ -9,13 +9,14 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45",
          "net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template
@ -9,13 +9,14 @@
    },
    "frameworks": {
      "net45": { },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45",
          "net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0"
        }
      }
    }
--- a/templates/src/csharp/Grpc.IntegrationTesting/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting/project.json.template
@ -24,14 +24,15 @@
          "System.IO": ""
        }
      },
-      "netstandard1.5": {
+      "netcoreapp1.0": {
        "imports": [
          "portable-net45",
          "net45"
        ],
        "dependencies": {
-          "NETStandard.Library": "1.5.0-rc2-24027",
-          "System.Linq.Expressions": "4.0.11-rc2-24027"
+          "Microsoft.NETCore.App": "1.0.0",
+          "NETStandard.Library": "1.6.0",
+          "System.Linq.Expressions": "4.1.0"
        }
      }
    }
--- a/tools/run_tests/build_csharp_coreclr.sh
+++ b/tools/run_tests/build_csharp_coreclr.sh
@ -35,4 +35,4 @@ cd $(dirname $0)/../../src/csharp
 # TODO(jtattermusch): introduce caching
 dotnet restore .

-dotnet build -f netstandard1.5 --configuration $MSBUILD_CONFIG '**/project.json'
+dotnet build --configuration $MSBUILD_CONFIG '**/project.json'