Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .pipelines/templates/nupkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ jobs:
Start-PSBuild -Clean -Runtime linux-x64 -Configuration Release -ReleaseTag $(ReleaseTagVar)

$sharedModules | Foreach-Object {
$refFile = Get-ChildItem -Path "$(PowerShellRoot)\src\$_\obj\Release\net10.0\refint\$_.dll"
$refFile = Get-ChildItem -Path "$(PowerShellRoot)\src\$_\obj\Release\net11.0\refint\$_.dll"
Write-Verbose -Verbose "RefAssembly: $refFile"
Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
$refDoc = "$(PowerShellRoot)\src\$_\bin\Release\net10.0\$_.xml"
$refDoc = "$(PowerShellRoot)\src\$_\bin\Release\net11.0\$_.xml"
if (-not (Test-Path $refDoc)) {
Write-Warning "$refDoc not found"
Get-ChildItem -Path "$(PowerShellRoot)\src\$_\bin\Release\net10.0\" | Out-String | Write-Verbose -Verbose
Get-ChildItem -Path "$(PowerShellRoot)\src\$_\bin\Release\net11.0\" | Out-String | Write-Verbose -Verbose
}
else {
Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
Expand All @@ -133,13 +133,13 @@ jobs:
Start-PSBuild -Clean -Runtime win7-x64 -Configuration Release -ReleaseTag $(ReleaseTagVar)

$winOnlyModules | Foreach-Object {
$refFile = Get-ChildItem -Path "$(PowerShellRoot)\src\$_\obj\Release\net10.0\refint\*.dll"
$refFile = Get-ChildItem -Path "$(PowerShellRoot)\src\$_\obj\Release\net11.0\refint\*.dll"
Write-Verbose -Verbose 'RefAssembly: $refFile'
Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
$refDoc = "$(PowerShellRoot)\src\$_\bin\Release\net10.0\$_.xml"
$refDoc = "$(PowerShellRoot)\src\$_\bin\Release\net11.0\$_.xml"
if (-not (Test-Path $refDoc)) {
Write-Warning "$refDoc not found"
Get-ChildItem -Path "$(PowerShellRoot)\src\$_\bin\Release\net10.0" | Out-String | Write-Verbose -Verbose
Get-ChildItem -Path "$(PowerShellRoot)\src\$_\bin\Release\net11.0" | Out-String | Write-Verbose -Verbose
}
else {
Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
Expand Down
8 changes: 4 additions & 4 deletions .pipelines/templates/windows-hosted-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,30 +274,30 @@ jobs:
)

$sourceModulePath = Join-Path '$(GlobalToolArtifactPath)' 'publish' 'PowerShell.Windows.x64' 'release' 'Modules'
$destModulesPath = Join-Path "$outputPath" 'temp' 'tools' 'net10.0' 'any' 'modules'
$destModulesPath = Join-Path "$outputPath" 'temp' 'tools' 'net11.0' 'any' 'modules'

$modulesToCopy | ForEach-Object {
$modulePath = Join-Path $sourceModulePath $_
Copy-Item -Path $modulePath -Destination $destModulesPath -Recurse -Force
}

# Copy ref assemblies
Copy-Item '$(Pipeline.Workspace)/Symbols_$(Architecture)/ref' "$outputPath\temp\tools\net10.0\any\ref" -Recurse -Force
Copy-Item '$(Pipeline.Workspace)/Symbols_$(Architecture)/ref' "$outputPath\temp\tools\net11.0\any\ref" -Recurse -Force

$contentPath = Join-Path "$outputPath\temp" 'content'
$contentFilesPath = Join-Path "$outputPath\temp" 'contentFiles'

Remove-Item -Path $contentPath,$contentFilesPath -Recurse -Force

# remove PDBs to reduce the size of the nupkg
Remove-Item -Path "$outputPath\temp\tools\net10.0\any\*.pdb" -Recurse -Force
Remove-Item -Path "$outputPath\temp\tools\net11.0\any\*.pdb" -Recurse -Force

# create powershell.config.json
$config = [ordered]@{}
$config.Add("Microsoft.PowerShell:ExecutionPolicy", "RemoteSigned")
$config.Add("WindowsPowerShellCompatibilityModuleDenyList", @("PSScheduledJob", "BestPractices", "UpdateServices"))

$configPublishPath = Join-Path "$outputPath" 'temp' 'tools' 'net10.0' 'any' "powershell.config.json"
$configPublishPath = Join-Path "$outputPath" 'temp' 'tools' 'net11.0' 'any' "powershell.config.json"
Set-Content -Path $configPublishPath -Value ($config | ConvertTo-Json) -Force -ErrorAction Stop

Compress-Archive -Path "$outputPath\temp\*" -DestinationPath "$outputPath\$nupkgName" -Force
Expand Down
2 changes: 1 addition & 1 deletion PowerShell.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<Copyright>(c) Microsoft Corporation.</Copyright>
<AssemblyTitle>PowerShell 7</AssemblyTitle>

<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<LangVersion>13.0</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,8 @@ function New-PSOptions {
[ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')]
[string]$Configuration,

[ValidateSet("net10.0")]
[string]$Framework = "net10.0",
[ValidateSet("net11.0")]
[string]$Framework = "net11.0",

# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
Expand Down Expand Up @@ -3958,7 +3958,7 @@ function Clear-NativeDependencies
$filesToDeleteWinDesktop = @()

$deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20
$targetRuntime = ".NETCoreApp,Version=v10.0/$($script:Options.Runtime)"
$targetRuntime = ".NETCoreApp,Version=v11.0/$($script:Options.Runtime)"

$runtimePackNetCore = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.NETCore.App.Runtime*'
$runtimePackWinDesktop = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.WindowsDesktop.App.Runtime*'
Expand Down
2 changes: 1 addition & 1 deletion docs/building/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Start-PSBuild -UseNuGetOrg
Congratulations! If everything went right, PowerShell is now built.
The `Start-PSBuild` script will output the location of the executable:

`./src/powershell-unix/bin/Debug/net10.0/linux-x64/publish/pwsh`.
`./src/powershell-unix/bin/Debug/net11.0/linux-x64/publish/pwsh`.

You should now be running the PowerShell Core that you just built, if you run the above executable.
You can run our cross-platform Pester tests with `Start-PSPester -UseNuGetOrg`, and our xUnit tests with `Start-PSxUnit`.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "10.0.102"
"version": "11.0.100-preview.1.26104.118"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackAsTool>true</PackAsTool>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.2" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="11.0.0-preview.1.26104.118" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="11.0.0-preview.1.26104.118" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.2" />
<PackageReference Include="System.Drawing.Common" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="JsonSchema.Net" Version="7.4.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.2" />
<PackageReference Include="System.Diagnostics.EventLog" Version="11.0.0-preview.1.26104.118" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.2" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="11.0.0-preview.1.26104.118" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="10.0.2" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.2" />
<PackageReference Include="System.IO.Packaging" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="11.0.0-preview.1.26104.118" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Http" Version="10.0.652802" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="10.0.652802" />
<PackageReference Include="System.ServiceModel.Primitives" Version="10.0.652802" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.2" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="11.0.0-preview.1.26104.118" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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="10.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="11.0.0-preview.1.26104.118" />
</ItemGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/PSGalleryModules.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>

<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>

<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
Expand All @@ -16,7 +16,7 @@
<PackageReference Include="Microsoft.PowerShell.PSResourceGet" Version="1.2.0-rc3" />
<PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
<PackageReference Include="PSReadLine" Version="2.4.5" />
<PackageReference Include="Microsoft.PowerShell.ThreadJob" Version="2.2.0" />
<PackageReference Include="Microsoft.PowerShell.ThreadJob" Version="2.2.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ResGen/ResGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Generates C# typed bindings for .resx files</Description>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.23.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.2" />
<PackageReference Include="System.DirectoryServices" Version="10.0.2" />
<PackageReference Include="System.Management" Version="10.0.2" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.2" />
<PackageReference Include="System.Security.Permissions" Version="10.0.2" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.DirectoryServices" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Management" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Security.Permissions" Version="11.0.0-preview.1.26104.118" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="700.0.0-rc.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,6 @@ protected override NamedPipeClientStream DoConnect(int timeout)
return new NamedPipeClientStream(
PipeDirection.InOut,
isAsync: true,
isConnected: true,
Comment thread
daxian-dbw marked this conversation as resolved.
pipeHandle);
}
catch (Exception)
Expand Down
2 changes: 1 addition & 1 deletion src/TypeCatalogGen/TypeCatalogGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/powershell/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ private static void AttemptExecPwshLogin(string[] args)
IntPtr executablePathPtr = IntPtr.Zero;
try
{
mib = [MACOS_CTL_KERN, MACOS_KERN_PROCARGS2, pid];
mib = new int[] { MACOS_CTL_KERN, MACOS_KERN_PROCARGS2, pid };
Comment thread
daxian-dbw marked this conversation as resolved.

unsafe
{
Expand Down
2 changes: 1 addition & 1 deletion test/Test.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>

<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<LangVersion>13.0</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
4 changes: 2 additions & 2 deletions test/tools/NamedPipeConnection/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ param (
[ValidateSet("Debug", "Release")]
[string] $BuildConfiguration = "Debug",

[ValidateSet("net10.0")]
[string] $BuildFramework = "net10.0"
[ValidateSet("net11.0")]
[string] $BuildFramework = "net11.0"
)

$script:ModuleName = 'Microsoft.PowerShell.NamedPipeConnection'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<InformationalVersion>1.0.0</InformationalVersion>
<TargetFrameworks>net10.0</TargetFrameworks>
<TargetFrameworks>net11.0</TargetFrameworks>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<LangVersion>13.0</LangVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/tools/OpenCover/OpenCover.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ function Invoke-OpenCover
[parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
[parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
[parameter()]$OpenCoverPath = "$HOME/OpenCover",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net10.0/win7-x64/publish",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net11.0/win7-x64/publish",
[parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
[parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
[parameter()]$PesterLogFormat = "NUnitXml",
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.2" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/tools/WebListener/WebListener.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="11.0.0-preview.1.26104.118" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tools/findMissingNotices.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ function Get-CGRegistrations {

$registrationChanged = $false

$dotnetTargetName = 'net10.0'
$dotnetTargetNameWin7 = 'net10.0-windows8.0'
$dotnetTargetName = 'net11.0'
$dotnetTargetNameWin7 = 'net11.0-windows8.0'
$unixProjectName = 'powershell-unix'
$windowsProjectName = 'powershell-win-core'
$actualRuntime = $Runtime
Expand Down
25 changes: 15 additions & 10 deletions tools/packaging/boms/windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -1276,11 +1276,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "mscorrc.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "msquic.dll",
"FileType": "NonProduct",
Expand Down Expand Up @@ -2496,6 +2491,11 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ref\\System.IO.Compression.Zstandard.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ref\\System.IO.Pipelines.dll",
"FileType": "NonProduct",
Expand Down Expand Up @@ -3206,6 +3206,11 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "System.IO.Compression.Zstandard.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "System.IO.dll",
"FileType": "NonProduct",
Expand Down Expand Up @@ -4592,27 +4597,27 @@
"Architecture": null
},
{
"Pattern": "RegisterManifest.ps1",
"Pattern": "pwsh.profile.dsc.resource.json",
"FileType": "Product",
"Architecture": null
},
{
"Pattern": "RegisterMicrosoftUpdate.ps1",
"Pattern": "pwsh.profile.resource.ps1",
"FileType": "Product",
"Architecture": null
},
{
"Pattern": "System.Management.Automation.dll",
"Pattern": "RegisterManifest.ps1",
"FileType": "Product",
"Architecture": null
},
{
"Pattern": "pwsh.profile.dsc.resource.json",
"Pattern": "RegisterMicrosoftUpdate.ps1",
"FileType": "Product",
"Architecture": null
},
{
"Pattern": "pwsh.profile.resource.ps1",
"Pattern": "System.Management.Automation.dll",
"FileType": "Product",
"Architecture": null
}
Expand Down
Loading
Loading