Skip to content

change the default windows RID to win7-<arch> #4701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 2 commits into from
Aug 30, 2017
Merged

change the default windows RID to win7-<arch> #4701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257d8d0
use the options that powershell was built with to find the output ins…
TravisEz13 Aug 29, 2017
73a7e6b
change the default windows RID to win7-<arch>
TravisEz13 Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,13 @@ function New-PSOptions {
}
}

# We plan to release packages targetting win7-x64 and win7-x86 RIDs,
# which supports all supported windows platforms.
# So we, will change the RID to win7-<arch>
if ($Environment.IsWindows) {
$Runtime = $Runtime -replace "win\d+", "win7"
}

if (-not $Runtime) {
Throw "Could not determine Runtime Identifier, please update dotnet"
} else {
Expand Down
2 changes: 1 addition & 1 deletion tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ function Invoke-AppVeyorTest
#
# CoreCLR

$env:CoreOutput = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -Configuration 'Release'))
$env:CoreOutput = Split-Path -Parent (Get-PSOutput -Options (Get-PSOptions))
Write-Host -Foreground Green 'Run CoreCLR tests'
$testResultsNonAdminFile = "$pwd\TestsResultsNonAdmin.xml"
$testResultsAdminFile = "$pwd\TestsResultsAdmin.xml"
Expand Down