feat: drop grpc-web for .NET 4.62 build. (#543)

Since we bumped the minimum .NET Framework build version from 4.61 to 4.62, we gained access to an Http/2 handler for .NET Framework. Because 4.61 did not have an Http/2 handler, we had to resort to gRPC-Web. Now we only need gRPC-Web for the Unity build. In order to exercise the gRPC-Web build, we add that to the testing matrix.
momentohq · Mar 6, 2024 · 2825ab8 · 2825ab8
1 parent e1e1727
commit 2825ab8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -8,13 +8,16 @@ jobs:
   build_csharp:
     strategy:
       matrix:
+        os: [ubuntu-latest, windows-latest]
+        target-framework: [net6.0]
+        grpc-web: [false, true]
         include:
-          - os: ubuntu-latest
-            target-framework: net6.0
           - os: windows-latest
-            target-framework: net6.0
+            target-framework: net462
+            grpc-web: false
           - os: windows-latest
             target-framework: net462
+            grpc-web: true
     runs-on: ${{ matrix.os }}
     env:
       TEST_AUTH_TOKEN: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
@@ -47,7 +50,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        run: dotnet build
+        run: dotnet build ${{ matrix.grpc-web && '-p:DefineConstants=USE_GRPC_WEB' || '' }}
 
       - name: Unit Test
         run: dotnet test --logger "console;verbosity=detailed" -f ${{ matrix.target-framework }} tests/Unit/Momento.Sdk.Tests

diff --git a/.github/workflows/on-push-to-main-branch.yaml b/.github/workflows/on-push-to-main-branch.yaml
@@ -8,11 +8,16 @@ jobs:
   build_csharp:
     strategy:
       matrix:
+        os: [ubuntu-latest, windows-latest]
+        target-framework: [net6.0]
+        grpc-web: [false, true]
         include:
-          - os: ubuntu-latest
-            target-framework: net6.0
           - os: windows-latest
             target-framework: net462
+            grpc-web: false
+          - os: windows-latest
+            target-framework: net462
+            grpc-web: true
     runs-on: ${{ matrix.os }}
     env:
       TEST_AUTH_TOKEN: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
@@ -32,7 +37,7 @@ jobs:
           dotnet-version: "6.0.x"
 
       - name: Build
-        run: dotnet build
+        run: dotnet build ${{ matrix.grpc-web && '-p:DefineConstants=USE_GRPC_WEB' || '' }}
 
       - name: Unit Test
         run: dotnet test -f ${{ matrix.target-framework }} tests/Unit/Momento.Sdk.Tests

diff --git a/src/Momento.Sdk/Momento.Sdk.csproj b/src/Momento.Sdk/Momento.Sdk.csproj
@@ -30,13 +30,6 @@
 		<RepositoryUrl>https://github.com/momentohq/client-sdk-dotnet</RepositoryUrl>
 	</PropertyGroup>
 
-	<!-- Because .NET Framework doesn't support HTTP/2, we use gRPC-Web over HTTP/1.1.
-		 Dependency resolution: .NET Framework binaries or libraries >= v4.62 that link
-		 to Momento.Sdk will link to the .NET Framework 4.62 build. -->
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net462' ">
-    	<DefineConstants>USE_GRPC_WEB</DefineConstants>
-  	</PropertyGroup>
-
 	<ItemGroup>
 	  <None Remove="System.Threading.Channels" />
 	  <None Remove="Internal\Middleware\" />
@@ -66,7 +59,7 @@
 	  <PackageReference Include="System.Threading" Version="4.3.0" />
 	</ItemGroup>
 	<ItemGroup Condition=" $(DefineConstants.Contains('USE_GRPC_WEB')) ">
-	  <!-- Because .NET Framework does not support HTTP/2, we fall back to gRPC-Web over HTTP/1.1 -->
+	  <!-- Currently the Unity build needs gRPC-Web -->
 	  <PackageReference Include="Grpc.Net.Client.Web" Version="2.52.0" />
 	</ItemGroup>
 	<ProjectExtensions>