admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Replace win7 runtime with win8 and remove APISets (#18304)" (#18322)

Browse Source
This commit is contained in:
Aditya Patwardhan
2022-10-18 16:48:07 -07:00
committed by GitHub
parent 01948aedb6
commit 813d38875d
20 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/ci.psm1
+1 -1
View File
@@ -467,7 +467,7 @@ function Get-ReleaseTag
function Invoke-CIFinish
{
param(
[string] $Runtime = 'win81-x64',
[string] $Runtime = 'win7-x64',
[string] $Channel = 'preview',
[Validateset('Build','Package')]
[string[]] $Stage = ('Build','Package')
tools/findMissingNotices.ps1
+5 -5
View File
@@ -166,8 +166,8 @@ function Get-CGRegistrations {
"osx-x64",
"win-arm",
"win-arm64",
"win81-x64",
"win81-x86",
"win7-x64",
"win7-x86",
"modules")]
[string]$Runtime,
@@ -196,7 +196,7 @@ function Get-CGRegistrations {
$folder = $unixProjectName
$target = "$dotnetTargetName|$Runtime"
}
"win81-.*" {
"win7-.*" {
$sdkToUse = $winDesktopSdk
$folder = $windowsProjectName
$target = "$dotnetTargetNameWin7|$Runtime"
@@ -264,7 +264,7 @@ function Get-CGRegistrations {
$registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
$lastCount = 0
$registrationChanged = $false
foreach ($runtime in "win81-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win81-x86") {
foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
$registrationChanged = (Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations) -or $registrationChanged
$count = $registrations.Count
$newCount = $count - $lastCount
@@ -276,7 +276,7 @@ $newRegistrations = $registrations.Keys | Sort-Object | ForEach-Object { $regist
$count = $newRegistrations.Count
$newJson = @{
Registrations = $newRegistrations
Registrations = $newRegistrations
'$schema' = "https://json.schemastore.org/component-detection-manifest.json"
} | ConvertTo-Json -depth 99
tools/packaging/packaging.psm1
+4 -4
View File
@@ -41,7 +41,7 @@ function Start-PSPackage {
[string[]]$Type,
# Generate windows downlevel package
[ValidateSet("win81-x86", "win81-x64", "win-arm", "win-arm64")]
[ValidateSet("win7-x86", "win7-x64", "win-arm", "win-arm64")]
[ValidateScript({$Environment.IsWindows})]
[string] $WindowsRuntime,
@@ -102,7 +102,7 @@ function Start-PSPackage {
}
if ($Environment.IsWindows) {
# Runtime will be one of win81-x64, win81-x86, "win-arm" and "win-arm64" on Windows.
# Runtime will be one of win7-x64, win7-x86, "win-arm" and "win-arm64" on Windows.
# Build the name suffix for universal win-plat packages.
switch ($Runtime) {
"win-arm" { $NameSuffix = "win-arm32" }
@@ -3200,7 +3200,7 @@ function New-MSIPatch
# This example shows how to produce a Debug-x64 installer for development purposes.
cd $RootPathOfPowerShellRepo
Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win81-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
#>
function New-MSIPackage
{
@@ -3591,7 +3591,7 @@ function Start-MsiBuild {
# This example shows how to produce a Debug-x64 installer for development purposes.
cd $RootPathOfPowerShellRepo
Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win81-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
#>
function New-MSIXPackage
{
tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+2 -2
View File
@@ -11,8 +11,8 @@ param (
[string] $destination = "$env:WORKSPACE",
[ValidateSet("win81-x64", "win81-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
[string] $Runtime = 'win81-x64',
[ValidateSet("win7-x64", "win7-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
[string] $Runtime = 'win7-x64',
[switch] $ForMinimalSize,
tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+4 -4
View File
@@ -35,8 +35,8 @@ jobs:
switch ($runtime)
{
win81-x64 { $packageName = "TestPackage-win-x64.zip" }
win81-x86 { $packageName = "TestPackage-win-x86.zip" }
win7-x64 { $packageName = "TestPackage-win-x64.zip" }
win7-x86 { $packageName = "TestPackage-win-x86.zip" }
win-arm64 { $packageName = "TestPackage-win-arm64.zip" }
linux-x64 { $packageName = "TestPackage-linux-x64.zip" }
linux-arm { $packageName = "TestPackage-linux-arm.zip" }
@@ -49,8 +49,8 @@ jobs:
Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
}
BuildTestPackage -runtime win81-x64
BuildTestPackage -runtime win81-x86
BuildTestPackage -runtime win7-x64
BuildTestPackage -runtime win7-x86
BuildTestPackage -runtime win-arm64
BuildTestPackage -runtime linux-x64
BuildTestPackage -runtime linux-arm
tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+2 -2
View File
@@ -50,8 +50,8 @@ jobs:
$runtime = switch ($env:Architecture)
{
"x64" { "win81-x64" }
"x86" { "win81-x86" }
"x64" { "win7-x64" }
"x86" { "win7-x86" }
"arm" { "win-arm"}
"arm64" { "win-arm64" }
"fxdependent" { "fxdependent" }
tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+2 -2
View File
@@ -239,8 +239,8 @@ jobs:
- pwsh: |
$runtime = switch ($env:Architecture)
{
"x64" { "win81-x64" }
"x86" { "win81-x86" }
"x64" { "win7-x64" }
"x86" { "win7-x86" }
"arm" { "win-arm"}
"arm64" { "win-arm64" }
"fxdependent" { "fxdependent" }