mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Apply code review feedback

Browse source
This commit is contained in:
Daniel Plaisted 2018-11-21 18:43:34 -08:00
parent 4783b9a537
commit d8b5dbb44b
3 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
run-build.ps1
View file

@ -9,17 +9,7 @@ param(
[Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters
) )
#$env:CONFIGURATION = $Configuration;
$RepoRoot = "$PSScriptRoot" $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" $ArchitectureParam="/p:Architecture=$Architecture"
$ConfigurationParam="-configuration $Configuration" $ConfigurationParam="-configuration $Configuration"

5
src/redist/targets/GenerateLayout.targets
View file

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

2
test/EndToEnd/EndToEnd.Tests.csproj
View file

@ -11,8 +11,6 @@
</ItemGroup> </ItemGroup>
<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)" /> <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
</ItemGroup> </ItemGroup>