Added Valleysoft.DockerCredsProvider.dll exclusion back as it is necessary. Updated or removed TODO comments. Fixed some tabbing from merging. Fixed a compilation bug if this code is ever built against 4.5.1(????)

eng/Signing.props

@@ -36,6 +36,7 @@
     <FileSignInfo Include="apphost.exe" CertificateName="None" />
     <FileSignInfo Include="comhost.dll" CertificateName="None" />
     <FileSignInfo Include="singlefilehost.exe" CertificateName="None" />
+    <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="None" />
 
     <!-- These are 3rd party nupkgs and should not be signed with an MS cert -->
     <FileSignInfo Include="nunit3.dotnetnew.template.$(NUnit3Templates21PackageVersion).nupkg" CertificateName="None" />

eng/Version.Details.xml

@@ -201,7 +201,7 @@
       <Sha>63958aab19b7120862ff55eac32ab6a155596a59</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
-    <!-- TODO -->
+    <!-- This is only used by source build SmokeTests. -->
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
       <Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
       <Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>

eng/Versions.props

@@ -88,7 +88,6 @@
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
-  <!-- TODO -->
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.2.24123.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
@@ -138,7 +137,6 @@
     <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24113.2</MicrosoftDeploymentDotNetReleasesVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- TODO -->
     <!-- Automated versions for asp.net templates -->
     <!-- Grab just the patch version from MicrosoftNETSdkPackageVersion (7.0.103-servicing becomes 03) -->
     <MicrosoftNETSdkFeatureAndPatchVersion>$(MicrosoftNETSdkPackageVersion.Split('.')[2])</MicrosoftNETSdkFeatureAndPatchVersion>
@@ -196,9 +194,7 @@
   <PropertyGroup>
     <!-- 9.0 Template versions -->
     <AspNetCorePackageVersionFor90Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor90Templates>
-    <!-- TODO -->
     <MicrosoftDotNetCommonItemTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates90PackageVersion>
-    <!-- TODO -->
     <MicrosoftDotNetCommonProjectTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates90PackageVersion>
     <MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>
     <MicrosoftDotNetWpfProjectTemplates90PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates90PackageVersion>

src/redist/targets/GenerateMSIs.targets

@@ -317,10 +317,10 @@
       <Output TaskParameter="Lines" PropertyName="MinimumVSVersion" />
     </ReadLinesFromFile>
 
-          <PropertyGroup Condition=" '$(VersionSDKMinor)' == '1' and '$(StabilizePackageVersion)' == 'true' ">
-            <MinimumVSVersion>$(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.'))))</MinimumVSVersion>
-            <MinimumVSVersion >$([MSBuild]::Add($(MinimumVSVersion), .1))</MinimumVSVersion>
-          </PropertyGroup>
+    <PropertyGroup Condition=" '$(VersionSDKMinor)' == '1' and '$(StabilizePackageVersion)' == 'true' ">
+      <MinimumVSVersion>$(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.'))))</MinimumVSVersion>
+      <MinimumVSVersion >$([MSBuild]::Add($(MinimumVSVersion), .1))</MinimumVSVersion>
+    </PropertyGroup>
   </Target>
 
   <Target Name="GenerateSdkBundle"

test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs

@@ -190,7 +190,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
 
         private string GetBaseDirectory() =>
 #if NET451
-            return AppDomain.CurrentDomain.BaseDirectory;
+            AppDomain.CurrentDomain.BaseDirectory;
 #else
             AppContext.BaseDirectory;
 #endif