diff --git a/src/core-sdk-tasks/GenerateGuidFromName.cs b/src/core-sdk-tasks/GenerateGuidFromName.cs
deleted file mode 100644
index 3ae0834..0000000
--- a/src/core-sdk-tasks/GenerateGuidFromName.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using System.Security.Cryptography;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.DotNet.Cli.Build
-{
- public class GenerateGuidFromName : Task
- {
- [Required]
- public string Name { get; set; }
-
- [Output]
- public string OutputGuid { get; set; }
-
- public override bool Execute()
- {
- OutputGuid = GenerateGuid(Name).ToString().ToUpper();
-
- return true;
- }
-
- // Generate a Version 5 (SHA1 Name Based) Guid from a name.
- public static Guid GenerateGuid(string name)
- {
- // Any fixed GUID will do for a namespace.
- Guid namespaceId = new Guid("28F1468D-672B-489A-8E0C-7C5B3030630C");
-
- using (SHA1 hasher = SHA1.Create())
- {
- var nameBytes = System.Text.Encoding.UTF8.GetBytes(name ?? string.Empty);
- var namespaceBytes = namespaceId.ToByteArray();
-
- SwapGuidByteOrder(namespaceBytes);
-
- var streamToHash = new byte[namespaceBytes.Length + nameBytes.Length];
-
- Array.Copy(namespaceBytes, streamToHash, namespaceBytes.Length);
- Array.Copy(nameBytes, 0, streamToHash, namespaceBytes.Length, nameBytes.Length);
-
- var hashResult = hasher.ComputeHash(streamToHash);
-
- var res = new byte[16];
-
- Array.Copy(hashResult, res, res.Length);
-
- unchecked { res[6] = (byte)(0x50 | (res[6] & 0x0F)); }
- unchecked { res[8] = (byte)(0x40 | (res[8] & 0x3F)); }
-
- SwapGuidByteOrder(res);
-
- return new Guid(res);
- }
- }
-
- // Do a byte order swap, .NET GUIDs store multi byte components in little
- // endian.
- private static void SwapGuidByteOrder(byte[] b)
- {
- Swap(b, 0, 3);
- Swap(b, 1, 2);
- Swap(b, 5, 6);
- Swap(b, 7, 8);
- }
-
- private static void Swap(byte[] b, int x, int y)
- {
- byte t = b[x];
- b[x] = b[y];
- b[y] = t;
- }
- }
-}
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
index a01a7c5..a12fdf0 100644
--- a/src/redist/targets/BuildCoreSdkTasks.targets
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -23,7 +23,7 @@
-
+