From ece5fbdcb0aecc152da6cce81b33695c7adad453 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 5 Sep 2019 08:06:39 -0400
Subject: [PATCH] partially revert alpine distribtest attempts

---
 .../csharp/DistribTest/DistribTestDotNet.csproj      | 12 +++++-------
 test/distrib/csharp/run_distrib_test_dotnetcli.sh    | 11 +++--------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/test/distrib/csharp/DistribTest/DistribTestDotNet.csproj b/test/distrib/csharp/DistribTest/DistribTestDotNet.csproj
index 8cdf926f07f..c855feb3fb3 100644
--- a/test/distrib/csharp/DistribTest/DistribTestDotNet.csproj
+++ b/test/distrib/csharp/DistribTest/DistribTestDotNet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -23,10 +23,8 @@
     <Protobuf Include="**\*.proto" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
-    <!-- Workaround for https://github.com/dotnet/sdk/issues/335 -->
-    <FrameworkPathOverride Condition="Exists('/usr/lib/mono/4.5-api')">/usr/lib/mono/4.5-api</FrameworkPathOverride>
-    <FrameworkPathOverride Condition="Exists('/usr/local/lib/mono/4.5-api')">/usr/local/lib/mono/4.5-api</FrameworkPathOverride>
-    <FrameworkPathOverride Condition="Exists('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api</FrameworkPathOverride>
-  </PropertyGroup>
+  <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/distrib/csharp/run_distrib_test_dotnetcli.sh b/test/distrib/csharp/run_distrib_test_dotnetcli.sh
index 357ce136cb7..ca22bce9d85 100755
--- a/test/distrib/csharp/run_distrib_test_dotnetcli.sh
+++ b/test/distrib/csharp/run_distrib_test_dotnetcli.sh
@@ -29,20 +29,15 @@ dotnet restore DistribTestDotNet.csproj
 
 dotnet build DistribTestDotNet.csproj
 dotnet publish -f netcoreapp2.1 DistribTestDotNet.csproj
-#dotnet publish -f net45 DistribTestDotNet.csproj
+dotnet publish -f net45 DistribTestDotNet.csproj
 
 ls -R bin
 
-#ldd /root/.nuget/packages/grpc.core/*/lib/netstandard1.5/../../runtimes/linux/native/libgrpc_csharp_ext.x64.so
-
-#ldd /root/.nuget/packages/grpc.tools/*/tools/linux_x64/grpc_csharp_plugin
-
-#exit 1
 # .NET 4.5 target after dotnet build
-#mono bin/Debug/net45/publish/DistribTestDotNet.exe
+mono bin/Debug/net45/publish/DistribTestDotNet.exe
 
 # .NET 4.5 target after dotnet publish
-#mono bin/Debug/net45/publish/DistribTestDotNet.exe
+mono bin/Debug/net45/publish/DistribTestDotNet.exe
 
 # .NET Core target after dotnet build
 dotnet exec bin/Debug/netcoreapp2.1/DistribTestDotNet.dll