migrate everything to netstandard1.5

src/csharp/Grpc.Auth/project.json

@@ -18,14 +18,14 @@
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "net45"
       ],
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23516",
-        "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23516",
-        "System.Threading.Tasks": "4.0.11-beta-23516"
+        "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027",
+        "NETStandard.Library": "1.5.0-rc2-24027",
+        "System.Threading.Tasks": "4.0.11-rc2-24027"
       }
     }
   }

src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs

@@ -40,7 +40,7 @@ namespace Grpc.Core.Tests
 {
     public class AppDomainUnloadTest
     {
-#if DOTNET5_4
+#if NETSTANDARD1_5
         [Test]
         [Ignore("Not supported for CoreCLR")]
         public void AppDomainUnloadHookCanCleanupAbandonedCall()

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 DOTNET5_4
+#if NETSTANDARD1_5
             return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
             return new AutoRun().Execute(args);

src/csharp/Grpc.Core.Tests/SanityTest.cs

@@ -45,7 +45,8 @@ namespace Grpc.Core.Tests
 {
     public class SanityTest
     {
-#if !DOTNET5_4
+        // TODO: make sanity test work for CoreCLR as well
+#if !NETSTANDARD1_5
         /// <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,

src/csharp/Grpc.Core.Tests/project.json

@@ -10,23 +10,26 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.Core": "0.14.0-anexperiment",
+    "Grpc.Core": {
+      "version": "0.0.1",
+      "taget": "project"
+    },
     "Newtonsoft.Json": "8.0.3",
     "NUnit": "3.2.0",
     "NUnitLite": "3.2.0-*"
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-23931"
-        }
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

src/csharp/Grpc.Core/GrpcEnvironment.cs

@@ -353,7 +353,7 @@ namespace Grpc.Core
                     if (!hooksRegistered)
                     {
                         // TODO(jtattermusch): register shutdownhooks for CoreCLR as well
-#if !DOTNET5_4
+#if !NETSTANDARD1_5
 
                         AppDomain.CurrentDomain.ProcessExit += ShutdownHookHandler;
                         AppDomain.CurrentDomain.DomainUnload += ShutdownHookHandler;

src/csharp/Grpc.Core/Internal/NativeExtension.cs

@@ -117,7 +117,7 @@ namespace Grpc.Core.Internal
         private static string GetAssemblyPath()
         {
             var assembly = typeof(NativeExtension).GetTypeInfo().Assembly;
-#if DOTNET5_4
+#if NETSTANDARD1_5
             // Assembly.EscapedCodeBase does not exist under CoreCLR, but assemblies imported from a nuget package
             // don't seem to be shadowed by DNX-based projects at all.
             return assembly.Location;
@@ -136,7 +136,7 @@ namespace Grpc.Core.Internal
 #endif
         }
 
-#if !DOTNET5_4
+#if !NETSTANDARD1_5
         private static bool IsFileUri(string uri)
         {
             return uri.ToLowerInvariant().StartsWith(Uri.UriSchemeFile);

src/csharp/Grpc.Core/Internal/PlatformApis.cs

@@ -53,7 +53,7 @@ namespace Grpc.Core.Internal
 
         static PlatformApis()
         {
-#if DOTNET5_4
+#if NETSTANDARD1_5
             isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
             isMacOSX = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
             isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);

src/csharp/Grpc.Core/project.json

@@ -30,24 +30,13 @@
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23516",
-        "System.Collections": "4.0.11-beta-23516",
-        "System.Collections.Concurrent": "4.0.11-beta-23516",
-        "System.Console": "4.0.0-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Threading": "4.0.11-beta-23516",
-        "System.Threading.Thread": "4.0.0-beta-23516",
-        "System.Reflection": "4.1.0-beta-23516",
-        "System.Text.Encoding": "4.0.11-beta-23516",
-        "System.Text.RegularExpressions": "4.0.11-beta-23516",
-        "System.IO": "4.0.11-beta-23516",
-        "System.IO.FileSystem": "4.0.1-beta-23516",
-        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23516"
+        "NETStandard.Library": "1.5.0-rc2-24027",
+        "System.Threading.Thread": "4.0.0-rc2-24027"
       }
     }
   }

src/csharp/Grpc.Examples.MathClient/project.json

@@ -10,20 +10,23 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.Examples": "1.0.0"
+    "Grpc.Examples": {
+      "version": "1.0.0",
+      "taget": "project"
+    }
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-23931"
-        }
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

src/csharp/Grpc.Examples.MathServer/project.json

@@ -10,20 +10,23 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.Examples": "1.0.0"
+    "Grpc.Examples": {
+      "version": "1.0.0",
+      "taget": "project"
+    }
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-23931"
-        }
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

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 DOTNET5_4
+#if NETSTANDARD1_5
             return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
             return new AutoRun().Execute(args);

src/csharp/Grpc.Examples.Tests/project.json

@@ -10,22 +10,25 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.Examples": "1.0.0",
+    "Grpc.Examples": {
+      "version": "1.0.0",
+      "taget": "project"
+    },
     "NUnit": "3.2.0",
     "NUnitLite": "3.2.0-*"
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-23931"
-        }
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

src/csharp/Grpc.Examples/project.json

@@ -4,7 +4,10 @@
   },
 
   "dependencies": {
-    "Grpc.Core": "0.0.1",
+    "Grpc.Core": {
+      "version": "0.0.1",
+      "taget": "project"
+    },
     "Google.Protobuf": "3.0.0-beta3"
   },
   "frameworks": {
@@ -14,15 +17,12 @@
         "System.IO": ""
       }
     },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-23931"
-        }
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
   }

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 DOTNET5_4
+#if NETSTANDARD1_5
             return new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
 #else
             return new AutoRun().Execute(args);

src/csharp/Grpc.HealthCheck.Tests/project.json

@@ -10,22 +10,25 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.HealthCheck": "0.0.1",
+    "Grpc.HealthCheck": {
+      "version": "0.0.1",
+      "taget": "project"
+    },
     "NUnit": "3.2.0",
     "NUnitLite": "3.2.0-*"
   },
   "frameworks": {
     "net45": { },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-23931"
-        }
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

src/csharp/Grpc.HealthCheck/project.json

@@ -26,12 +26,12 @@
         "System.IO": ""
       }
     },
-    "dotnet54": {
+    "netstandard1.5": {
       "imports": [
         "portable-net45"
       ],
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23516"
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
   }

src/csharp/Grpc.IntegrationTesting.Client/project.json

@@ -10,9 +10,24 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.IntegrationTesting": "1.0.0"
+    "Grpc.IntegrationTesting": {
+      "version": "1.0.0",
+      "taget": "project"
+    }
   },
   "frameworks": {
-    "net45": { }
+    "net45": { },
+    "netstandard1.5": {
+      "imports": [
+        "portable-net45",
+        "net45"
+      ],
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-24027"
+      }
+    }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json

@@ -10,9 +10,24 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.IntegrationTesting": "1.0.0"
+    "Grpc.IntegrationTesting": {
+      "version": "1.0.0",
+      "taget": "project"
+    }
   },
   "frameworks": {
-    "net45": { }
+    "net45": { },
+    "netstandard1.5": {
+      "imports": [
+        "portable-net45",
+        "net45"
+      ],
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-24027"
+      }
+    }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }

src/csharp/Grpc.IntegrationTesting.Server/project.json

@@ -10,9 +10,24 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Grpc.IntegrationTesting": "1.0.0"
+    "Grpc.IntegrationTesting": {
+      "version": "1.0.0",
+      "taget": "project"
+    }
   },
   "frameworks": {
-    "net45": { }
+    "net45": { },
+    "netstandard1.5": {
+      "imports": [
+        "portable-net45",
+        "net45"
+      ],
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-24027"
+      }
+    }
+  },
+  "runtimes": {
+    "win7-x64": { }
   }
 }