diff --git a/NuGet.config b/NuGet.config
index 90d97a596e..7619e87bea 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
     <clear />
     <add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
     <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
-    <!-- dotnet-core-test needs to be changed to dotnet-core once the netstandard1.3 DependencyModel package is available -->
+    <!-- TODO: https://github.com/dotnet/sdk/issues/14 dotnet-core-test needs to be changed to dotnet-core once the netstandard1.3 DependencyModel package is available -->
     <add key="dotnet-core-test" value="https://dotnet.myget.org/F/dotnet-core-test/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
diff --git a/build.ps1 b/build.ps1
index 7b6e825be3..627023fd54 100644
--- a/build.ps1
+++ b/build.ps1
@@ -50,6 +50,6 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 dotnet restore $RepoRoot
 if($LASTEXITCODE -ne 0) { throw "Failed to restore" }
 
-# TODO: add /m when the https://github.com/Microsoft/msbuild/pull/859 is in the CLI that we are using to build
+# TODO: https://github.com/dotnet/sdk/issues/13 add back `/m` when the MSBuild hang is fixed
 dotnet build3 $RepoRoot\core-sdk.sln /nologo /p:Configuration=$Configuration /p:Platform=$Platform
 if($LASTEXITCODE -ne 0) { throw "Failed to build" }
diff --git a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/DependencyContextBuilder.cs b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/DependencyContextBuilder.cs
index b3d8b9ef72..896183027f 100644
--- a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/DependencyContextBuilder.cs
+++ b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/DependencyContextBuilder.cs
@@ -30,7 +30,7 @@ public DependencyContext Build(
             LockFileTarget lockFileTarget = lockFile.GetTarget(framework, runtime);
             IEnumerable<LockFileTargetLibrary> runtimeExports = lockFileTarget.Libraries;
 
-            // TODO: get this from the lock file once https://github.com/NuGet/Home/issues/2695 is fixed.
+            // TODO: https://github.com/dotnet/sdk/issues/17 get this from the lock file
             var platformPackageName = "Microsoft.NETCore.App";
             var platformExport = lockFileTarget
                 .Libraries
@@ -57,7 +57,7 @@ public DependencyContext Build(
             return new DependencyContext(
                 new TargetInfo(framework.DotNetFrameworkName, runtime, runtimeSignature, portable),
                 compilerOptions ?? CompilationOptions.Default,
-                Enumerable.Empty<CompilationLibrary>(), //GetLibraries(compilationExports, dependencyLookup, runtime: false).Cast<CompilationLibrary>(),
+                Enumerable.Empty<CompilationLibrary>(), //GetLibraries(compilationExports, dependencyLookup, runtime: false).Cast<CompilationLibrary>(), - https://github.com/dotnet/sdk/issues/11
                 runtimeLibraries,
                 new RuntimeFallbacks[] { });
         }
@@ -132,6 +132,8 @@ private RuntimeLibrary GetProjectLibrary(
             LockFileTarget lockFileTarget,
             Dictionary<string, Dependency> dependencyLookup)
         {
+            // TODO: What other information about the current project needs to be included here? - https://github.com/dotnet/sdk/issues/12
+
             RuntimeAssetGroup[] runtimeAssemblyGroups = new[] { new RuntimeAssetGroup(string.Empty, $"{projectName}.dll") };
 
             List<Dependency> dependencies = new List<Dependency>();
@@ -219,6 +221,7 @@ private Library GetLibrary(
                     serviceable
                     );
             }
+            // TODO: PreserveCompilationContext - https://github.com/dotnet/sdk/issues/11
             //else
             //{
             //    IEnumerable<string> assemblies = export
@@ -244,7 +247,7 @@ private IReadOnlyList<RuntimeAssetGroup> CreateRuntimeAssemblyGroups(LockFileTar
             assemblyGroups.Add(
                 new RuntimeAssetGroup(string.Empty, export.RuntimeAssemblies.Select(a => a.Path)));
 
-            // TODO RuntimeTargets
+            // TODO RuntimeTargets - https://github.com/dotnet/sdk/issues/12
             //export.RuntimeTargets.GroupBy(l => l.)
 
             return assemblyGroups;
@@ -257,7 +260,7 @@ private IReadOnlyList<RuntimeAssetGroup> CreateNativeLibraryGroups(LockFileTarge
 
         private ResourceAssembly CreateResourceAssembly(LockFileItem resourceAssembly)
         {
-            // TODO: implement
+            // TODO: implement - https://github.com/dotnet/sdk/issues/12
             return null;
 
             //return new ResourceAssembly(
diff --git a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateDepsFile.cs b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateDepsFile.cs
index bb45989c29..d12f17c8db 100644
--- a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateDepsFile.cs
+++ b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateDepsFile.cs
@@ -40,7 +40,7 @@ public override bool Execute()
             DependencyContext dependencyContext = new DependencyContextBuilder().Build(
                 projectName: AssemblyName,
                 projectVersion: AssemblyVersion,
-                compilerOptions: null, // TODO: PreservceCompliationContext
+                compilerOptions: null, // TODO: PreserveCompilationContext - https://github.com/dotnet/sdk/issues/11
                 lockFile: lockFile,
                 framework: TargetFramework == null ? null : NuGetFramework.Parse(TargetFramework),
                 runtime: RuntimeIdentifier);
diff --git a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateRuntimeConfigurationFiles.cs
index 7b60aab6ff..67d37c3599 100644
--- a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateRuntimeConfigurationFiles.cs
+++ b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/GenerateRuntimeConfigurationFiles.cs
@@ -59,7 +59,7 @@ private void WriteRuntimeConfig()
 
         private void AddFramework(RuntimeOptions runtimeOptions)
         {
-            // TODO: get this from the lock file once https://github.com/NuGet/Home/issues/2695 is fixed.
+            // TODO: https://github.com/dotnet/sdk/issues/17 get this from the lock file
             var packageName = "Microsoft.NETCore.App";
 
             var redistExport = LockFile
diff --git a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/LockFileCache.cs b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/LockFileCache.cs
index f0aec7fd20..a999865bbb 100644
--- a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/LockFileCache.cs
+++ b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/LockFileCache.cs
@@ -43,7 +43,7 @@ private static string GetTaskObjectKey(string lockFilePath)
 
         private LockFile LoadLockFile(string path)
         {
-            // TODO adapt task logger to Nuget Logger
+            // TODO - https://github.com/dotnet/sdk/issues/18 adapt task logger to Nuget Logger
             return LockFileUtilities.GetLockFile(path, NullLogger.Instance);
         }
     }
diff --git a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/Microsoft.DotNet.Core.Sdk.targets b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/Microsoft.DotNet.Core.Sdk.targets
index 74ff3579dc..e6b9666012 100644
--- a/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/Microsoft.DotNet.Core.Sdk.targets
+++ b/src/Tasks/Microsoft.DotNet.Core.Build.Tasks/Microsoft.DotNet.Core.Sdk.targets
@@ -66,7 +66,7 @@ Copyright (c) .NET Foundation. All rights reserved.
           Outputs="$(_ProjectDepsFilePath)">
 
     <!--
-    TODO: Get RuntimeIdentifier
+    TODO: https://github.com/dotnet/sdk/issues/19 - Get RuntimeIdentifier
     -->
     <GenerateDepsFile LockFilePath="$(_ProjectLockFilePath)"
                       DepsFilePath="$(_ProjectDepsFilePath)"
@@ -76,7 +76,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                       RuntimeIdentifier="" />
 
     <!--
-    TODO: When OutputType == 'exe' and !IsPortable, we need to verify CoreClr is present in the deps graph, and copy in a host to the output
+    TODO: https://github.com/dotnet/sdk/issues/21
+    When OutputType == 'exe' and !IsPortable, we need to verify CoreClr is present in the deps graph, and copy in a host to the output
     See https://github.com/dotnet/cli/blob/6b54ae0bcc5c63e7c989ac19d851f234f9172bea/src/Microsoft.DotNet.Compiler.Common/Executable.cs#L102-L107
     -->
   </Target>
@@ -116,7 +117,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target Name="GenerateRunInformation">
     <ItemGroup>
       <RunInformation Include="$(MSBuildProjectFullPath)">
-        <!-- TODO: Need to get the Muxer path from MSBuild -->
+        <!-- TODO: https://github.com/dotnet/sdk/issues/20 Need to get the DotNetHost path from MSBuild -->
         <CommandName>dotnet</CommandName>
         <Args>exec;$(TargetDir)/$(AssemblyName).dll</Args>
       </RunInformation>