Apply code review feedback

run-build.ps1

@@ -9,17 +9,7 @@ param(
     [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters
 )
 
-#$env:CONFIGURATION = $Configuration;
 $RepoRoot = "$PSScriptRoot"
-# if(!$env:NUGET_PACKAGES){
-#   $env:NUGET_PACKAGES = "$RepoRoot\.nuget\packages"
-# }
-
-# $InstallArchitecture = $Architecture
-# if($Architecture.StartsWith("arm", [StringComparison]::OrdinalIgnoreCase))
-# {
-#     $InstallArchitecture = "x64"
-# }
 
 $ArchitectureParam="/p:Architecture=$Architecture"
 $ConfigurationParam="-configuration $Configuration"

src/redist/targets/GenerateLayout.targets

@@ -115,7 +115,6 @@
         <DownloadFileName>dotnet-toolset-internal-$(ToolsetVersion).zip</DownloadFileName>
         <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
         <RelativeLayoutPath>sdk/$(SdkVersion)</RelativeLayoutPath>
-        <IncludeInInternalLayout>true</IncludeInInternalLayout>
       </BundledLayoutComponent>
     </ItemGroup>
     
@@ -246,10 +245,6 @@
     <Copy SourceFiles="@(SdkInternalFiles)"
           DestinationFolder="$(SdkInternalLayoutPath)sdk/$(SdkVersion)"/>
 
-    <!--<ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)"
-                               DestinationDirectory="$(SdkInternalLayoutPath)/%(BundledLayoutComponent.RelativeLayoutPath)"
-                               Condition="'%(BundledLayoutComponent.IncludeInInternalLayout)' == 'true'"/>-->
-
 
   </Target>
 </Project>

test/EndToEnd/EndToEnd.Tests.csproj

@@ -11,8 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="xunit" Version="2.2.0" /> -->
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
   </ItemGroup>