mirrors/PowerShell
0
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell.git synced 2024-11-23 09:43:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the release build by moving to the official .NET 8-rc.1 release build version (#20333)

Browse Source
This commit is contained in:
Aditya Patwardhan 2023-09-25 09:28:14 -07:00 committed by GitHub
parent 77e8021256
commit 242af6adb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.psm1
View File

@ -273,7 +273,7 @@ function Test-IsReleaseCandidate
return $false
}
$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win7|osx)-(x64|x86|arm64|arm)'
$optimizedFddRegex = 'fxdependent-(linux|linux-musl|win|win7|osx)-(x64|x86|arm64|arm)'
function Start-PSBuild {
[CmdletBinding(DefaultParameterSetName="Default")]
@ -307,9 +307,9 @@ function Start-PSBuild {
# These runtimes must match those in project.json
# We do not use ValidateScript since we want tab completion
# If this parameter is not provided it will get determined automatically.
[ValidateSet("alpine-x64",
[ValidateSet("linux-musl-x64",
"fxdependent",
"fxdependent-alpine-x64",
"fxdependent-linux-musl-x64",
"fxdependent-linux-x64",
"fxdependent-linux-arm64",
"fxdependent-win-desktop",
@ -898,9 +898,9 @@ function New-PSOptions {
# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
[ValidateSet("",
"alpine-x64",
"linux-musl-x64",
"fxdependent",
"fxdependent-alpine-x64",
"fxdependent-linux-musl-x64",
"fxdependent-linux-x64",
"fxdependent-linux-arm64",
"fxdependent-win-desktop",
@ -1346,7 +1346,7 @@ function Start-PSPester {
# if we are building for Alpine, we must include the runtime as linux-x64
# will not build runnable test tools
if ( $environment.IsLinux -and $environment.IsAlpine ) {
$publishArgs['runtime'] = 'alpine-x64'
$publishArgs['runtime'] = 'linux-musl-x64'
}
Publish-PSTestTools @publishArgs | ForEach-Object {Write-Host $_}

2
global.json
View File

@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.100-rc.1.23455.8"
"version": "8.0.100-rc.1.23463.5"
}
}

2
src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0-rc.1.23419.4" />
</ItemGroup>
<PropertyGroup>

2
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View File

@ -47,7 +47,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23419.4" />
</ItemGroup>
</Project>

4
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View File

@ -33,8 +33,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-1.final" />
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0-rc.1.23416.3" />
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0-rc.1.23419.5" />
<PackageReference Include="JsonSchema.Net" Version="5.2.5" />
</ItemGroup>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.0-rc.1.23419.4" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View File

@ -19,9 +19,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.IO.Packaging" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-rc.1.23419.4" />
<!--
the following package(s) are from https://github.com/dotnet/wcf
they are pinned to the version 4.10.2 due to a breaking change in newer versions.
@ -34,7 +34,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.2" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.2" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-rc.1.23416.3" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-rc.1.23420.5" />
</ItemGroup>
</Project>

2
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View File

@ -10,7 +10,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23419.4" />
</ItemGroup>
<PropertyGroup>

16
src/System.Management.Automation/System.Management.Automation.csproj
View File

@ -34,16 +34,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0-rc.1.23419.4" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Management" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Security.Permissions" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Security.Permissions" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.4" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0-preview.2" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0-preview.2" />

2
src/powershell-win-core/powershell-win-core.csproj
View File

@ -8,7 +8,7 @@
<TieredCompilation>true</TieredCompilation>
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
<TieredCompilationQuickJitForLoops>true</TieredCompilationQuickJitForLoops>
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<RootNamespace>Microsoft.PowerShell</RootNamespace>
<ApplicationManifest>..\..\assets\pwsh.manifest</ApplicationManifest>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>

2
test/tools/TestService/TestService.csproj
View File

@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-rc.1.23416.3" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-rc.1.23420.5" />
</ItemGroup>
</Project>

4
test/tools/WebListener/WebListener.csproj
View File

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-rc.1.23421.28" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-rc.1.23421.29" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.4" />
</ItemGroup>
<ItemGroup>

4
tools/findMissingNotices.ps1
View File

@ -159,7 +159,7 @@ function Get-CGRegistrations {
param(
[Parameter(Mandatory)]
[ValidateSet(
"alpine-x64",
"linux-musl-x64",
"linux-arm",
"linux-arm64",
"linux-x64",
@ -265,7 +265,7 @@ function Get-CGRegistrations {
$registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
$lastCount = 0
$registrationChanged = $false
foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "linux-musl-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

10
tools/packaging/packaging.psm1
View File

@ -100,7 +100,7 @@ function Start-PSPackage {
} elseif ($MacOSRuntime) {
$MacOSRuntime, "Release"
} elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-alpine") {
New-PSOptions -Configuration "Release" -Runtime "alpine-x64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
New-PSOptions -Configuration "Release" -Runtime "linux-musl-x64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
} elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-arm") {
New-PSOptions -Configuration "Release" -Runtime "Linux-ARM" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
} elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-arm64") {
@ -115,7 +115,7 @@ function Start-PSPackage {
New-PSOptions -Configuration "Release" -Runtime 'fxdependent-linux-arm64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
}
elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-alpine-fxdependent") {
New-PSOptions -Configuration "Release" -Runtime 'fxdependent-alpine-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
New-PSOptions -Configuration "Release" -Runtime 'fxdependent-linux-musl-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
}
else {
New-PSOptions -Configuration "Release" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
@ -594,7 +594,7 @@ function Start-PSPackage {
Name = $Name
Version = $Version
Force = $Force
Architecture = "alpine-x64"
Architecture = "linux-musl-x64"
ExcludeSymbolicLinks = $true
R2RVerification = [R2RVerification]@{
R2RState = 'R2R'
@ -4513,7 +4513,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
$buildParams.Add("Runtime", "fxdependent")
}
'alpine' {
$buildParams.Add("Runtime", 'alpine-x64')
$buildParams.Add("Runtime", 'linux-musl-x64')
}
}
@ -4606,7 +4606,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
Remove-Item -Path $binDir -Recurse -Force
}
$buildParams['Runtime'] = 'fxdependent-alpine-x64'
$buildParams['Runtime'] = 'fxdependent-linux-musl-x64'
$buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${amd64AlpineFxdBuildFolder}"
Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
# Remove symbol files, xml document files.

2
tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
View File

@ -59,7 +59,7 @@ function BuildPackages {
$buildParams.Add("Runtime", "fxdependent")
} elseif ($Alpine.IsPresent) {
$projectAssetsZipName = 'linuxAlpineProjectAssetssymbols.zip'
$buildParams.Add("Runtime", 'alpine-x64')
$buildParams.Add("Runtime", 'linux-musl-x64')
} else {
# make the artifact name unique
$projectAssetsZipName = "linuxProjectAssets-$((Get-Date).Ticks)-symbols.zip"