diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj
index 2752b1c0c300c..6a23f9a79795a 100644
--- a/dotnet/src/webdriver/WebDriver.csproj
+++ b/dotnet/src/webdriver/WebDriver.csproj
@@ -44,13 +44,6 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="WebDriver.Common.Tests" />
-
-    <Compile Remove="cdp\**" />
-    <Compile Remove="obj\**" />
-    <EmbeddedResource Remove="cdp\**" />
-    <EmbeddedResource Remove="obj\**" />
-    <None Remove="cdp\**" />
-    <None Remove="obj\**" />
   </ItemGroup>
 
   <ItemGroup>
@@ -58,43 +51,11 @@
     <None Remove="WebDriver.ruleset" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="$(ProjectDir)..\..\..\third_party\js\selenium\webdriver.json">
-      <Visible>False</Visible>
-      <LogicalName>webdriver_prefs.json</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\webdriver\atoms\get-attribute.js">
-      <Visible>False</Visible>
-      <LogicalName>get-attribute.js</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\is-displayed.js">
-      <Visible>False</Visible>
-      <LogicalName>is-displayed.js</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\find-elements.js">
-      <Visible>False</Visible>
-      <LogicalName>find-elements.js</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\..\javascript\cdp-support\mutation-listener.js">
-      <Visible>False</Visible>
-      <LogicalName>mutation-listener.js</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Remote\JsonConverters\" />
-  </ItemGroup>
-
   <PropertyGroup>
-    <BaseSeleniumManagerPath>..\..\..\bazel-bin\dotnet\src\webdriver\manager</BaseSeleniumManagerPath>
     <BaseImagePath>..\..\..\bazel-bin\dotnet\src\webdriver\images</BaseImagePath>
   </PropertyGroup>
 
@@ -109,12 +70,50 @@
     <None Include="$(BaseSeleniumManagerPath)\windows\selenium-manager.exe" Pack="true" PackagePath="manager\windows" Visible="false" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
-    <Exec Command="call $(ProjectDir)WebDriver.csproj.prebuild.cmd $(ProjectDir)" />
+  <Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="PrepareForBuild">
+    <Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos"
+          WorkingDirectory="..\..\.." />
+
+    <PropertyGroup>
+      <BaseSeleniumManagerPath>..\..\..\bazel-bin\dotnet\src\webdriver\manager</BaseSeleniumManagerPath>
+    </PropertyGroup>
   </Target>
 
-  <Target Name="PreBuildNonWindows" BeforeTargets="PreBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
-    <Exec Command="$(ProjectDir)WebDriver.csproj.prebuild.sh $(ProjectDir)" />
+  <Target Name="GenerateAtoms" BeforeTargets="PrepareForBuild">
+    <Exec Command="bazel build //javascript/webdriver/atoms:get-attribute.js //javascript/atoms/fragments:is-displayed.js //javascript/atoms/fragments:find-elements.js"
+          WorkingDirectory="..\..\.." />
+
+    <ItemGroup>
+      <EmbeddedResource Include="$(ProjectDir)..\..\..\third_party\js\selenium\webdriver.json">
+        <Visible>False</Visible>
+        <LogicalName>webdriver_prefs.json</LogicalName>
+      </EmbeddedResource>
+      <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\webdriver\atoms\get-attribute.js">
+        <Visible>False</Visible>
+        <LogicalName>get-attribute.js</LogicalName>
+      </EmbeddedResource>
+      <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\is-displayed.js">
+        <Visible>False</Visible>
+        <LogicalName>is-displayed.js</LogicalName>
+      </EmbeddedResource>
+      <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\find-elements.js">
+        <Visible>False</Visible>
+        <LogicalName>find-elements.js</LogicalName>
+      </EmbeddedResource>
+      <EmbeddedResource Include="$(ProjectDir)..\..\..\javascript\cdp-support\mutation-listener.js">
+        <Visible>False</Visible>
+        <LogicalName>mutation-listener.js</LogicalName>
+      </EmbeddedResource>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="GenerateCdp" BeforeTargets="PrepareForBuild">
+    <Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v118 //dotnet/src/webdriver/cdp:generate-v119 //dotnet/src/webdriver/cdp:generate-v120"
+          WorkingDirectory="..\..\.." />
+
+    <ItemGroup>
+      <Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />
+    </ItemGroup>
   </Target>
 
 </Project>
diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd b/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd
deleted file mode 100644
index 084839ae475b8..0000000000000
--- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-echo Building Selenium Manager binaries
-bazel build //dotnet/src/webdriver:manager-linux
-bazel build //dotnet/src/webdriver:manager-windows
-bazel build //dotnet/src/webdriver:manager-macos
-
-echo Building atoms
-bazel build //javascript/webdriver/atoms:get-attribute.js
-bazel build //javascript/atoms/fragments:is-displayed.js
-bazel build //javascript/atoms/fragments:find-elements.js
-
-echo Generating CDP code
-bazel build //dotnet/src/webdriver/cdp:generate-v85
-bazel build //dotnet/src/webdriver/cdp:generate-v118
-bazel build //dotnet/src/webdriver/cdp:generate-v119
-bazel build //dotnet/src/webdriver/cdp:generate-v120
diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh b/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh
deleted file mode 100755
index 7eb67769b47dc..0000000000000
--- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-echo "Building Selenium Manager binaries"
-bazel build //dotnet/src/webdriver:manager-linux
-bazel build //dotnet/src/webdriver:manager-windows
-bazel build //dotnet/src/webdriver:manager-macos
-
-echo "Building atoms"
-bazel build //javascript/webdriver/atoms:get-attribute.js
-bazel build //javascript/atoms/fragments:is-displayed.js
-bazel build //javascript/atoms/fragments:find-elements.js
-
-echo "Generating CDP code"
-bazel build //dotnet/src/webdriver/cdp:generate-v85
-bazel build //dotnet/src/webdriver/cdp:generate-v118
-bazel build //dotnet/src/webdriver/cdp:generate-v119
-bazel build //dotnet/src/webdriver/cdp:generate-v120