diff --git a/.github/ISSUE_TEMPLATE/releases/release_checklist.md b/.github/ISSUE_TEMPLATE/releases/release_checklist.md
index bf9f3a389f..7856281cc9 100644
--- a/.github/ISSUE_TEMPLATE/releases/release_checklist.md
+++ b/.github/ISSUE_TEMPLATE/releases/release_checklist.md
@@ -37,6 +37,7 @@
       - [3.1 / 5.0]
         - [ ] Verify that the `PrivateSourceBuiltArtifactsPackageVersion` in `eng/Versions.props` matches N-1 release artifacts.
         - [ ] Update the `global.json` SDK version to N-1: the latest released "3.1.XYY" SDK version, where "3.1.X" matches the SDK we're building.
+        - [ ] Update the `eng/Versions.props` with the latest product versions.
 1.  - [ ] [2.1] Fetch internal git data for submodules.
       1.  Run `git submodule update --init --recursive` and see errors due to missing commits.
       1.  Run `fetch-vsts-commits.sh` with a PAT to automatically fetch internal refs.
diff --git a/eng/Versions.props b/eng/Versions.props
index 0c170cc8fe..f0e7bdd034 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- SDK/Runtime Version Information -->
+  <PropertyGroup>
+    <MajorVersion>5</MajorVersion>
+    <MinorVersion>0</MinorVersion>
+    <RuntimePatchVersion>2</RuntimePatchVersion>
+    <SdkPatchVersion>102</SdkPatchVersion>
+    <RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
+    <AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
+    <SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
+  </PropertyGroup>
+
   <!-- Repo Version Information -->
   <PropertyGroup>
     <VersionPrefix>0.1.0</VersionPrefix>
diff --git a/patches/aspnetcore/0016-Fix-version-number.patch b/patches/aspnetcore/0016-Fix-version-number.patch
deleted file mode 100644
index 0668c1f144..0000000000
--- a/patches/aspnetcore/0016-Fix-version-number.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a4d1fdddfc3a171ba3858967c54ff0e2082f29b8 Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Thu, 17 Dec 2020 16:11:21 +0000
-Subject: [PATCH] Fix version number
-
-This file is actually a very long minified JS file with a version number at the
-end. The file is treated as binary, making this patch less clear, but it's easy
-to update/reapply it with a text editor.
----
- .../Web.JS/dist/Release/blazor.server.js           | Bin 249682 -> 249683 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-
-diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
-index 6fc91cb4c3d8816f2b4eed7a576e058bdfe57542..6d20cf7d4106bdfae5825ebb73075c321c0a36d0 100644
-GIT binary patch
-delta 23
-ecmcaKkN@&K{)QID7N#xCKIhqulxkx&t+@bkI|u*(
-
-delta 22
-dcmcaSkN?s<{)QID7N#xCKIhpCm1<)(tpRB<2lM~{
-
--- 
-1.8.3.1
-
diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
index 4d0a5df8a4..0b2383ae3a 100644
--- a/repos/aspnetcore.proj
+++ b/repos/aspnetcore.proj
@@ -65,6 +65,27 @@
     <EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
   </ItemGroup>
 
+  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceRegexInFiles" />
+
+  <Target Name="FixAspNetCoreVersion"
+          AfterTargets="ApplyPatches">
+
+    <ItemGroup>
+      <MinifiedJavascriptFile Include="$(ProjectDirectory)**\blazor.server.js" />
+    </ItemGroup>
+
+    <!--
+        Patch the version embedded in minified js files. Because they are
+        minified files, git patch doesn't work too well and produces unreadable
+        binary patches.
+    -->
+    <ReplaceRegexInFiles
+      InputFiles="@(MinifiedJavascriptFile)"
+      OldTextRegex=",l=&quot;5\.0\.\d+&quot;}]\);"
+      NewText=",l=&quot;$(AspNetCoreProductVersion)&quot;}]);" />
+
+  </Target>
+
   <Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
     <ItemGroup>
       <PackagesOutputList Include="$(ShippingPackagesOutput)" />
diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs
new file mode 100644
index 0000000000..9b0d2e10ce
--- /dev/null
+++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceRegexInFiles.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.Build.Tasks
+{
+    public class ReplaceRegexInFiles : Task
+    {
+        [Required]
+        public string[] InputFiles { get; set; }
+
+        [Required]
+        public string OldTextRegex { get; set; }
+
+        [Required]
+        public string NewText { get; set; }
+
+        public override bool Execute()
+        {
+            Log.LogMessage($"Replacing '{OldTextRegex}' with '{NewText}'");
+            foreach (string file in InputFiles)
+            {
+                string fileContents = File.ReadAllText(file);
+
+                fileContents = Regex.Replace(fileContents, OldTextRegex, NewText);
+
+                File.WriteAllText(file, fileContents);
+            }
+
+            return true;
+        }
+    }
+}