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
13 changes: 11 additions & 2 deletions .pipelines/templates/mac-package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ jobs:
Restore-PSOptions -PSOptionsPath "$psoptionsPath"
Get-PSOptions | Write-Verbose -Verbose

if (-not (Test-Path "$repoRoot/tools/metadata.json")) {
throw "metadata.json not found in $repoRoot/tools"
}

$metadata = Get-Content "$repoRoot/tools/metadata.json" -Raw | ConvertFrom-Json

Write-Verbose -Verbose "metadata:"
Expand All @@ -120,14 +124,19 @@ jobs:
Write-Verbose -Verbose "LTS: $LTS"

if ($LTS) {
Write-Verbose -Message "LTS Release: $LTS"
Write-Verbose -Message "LTS Release: $LTS" -Verbose
}

Start-PSBootstrap -Scenario Package

$macosRuntime = "osx-$buildArch"

Start-PSPackage -Type osxpkg -SkipReleaseChecks -MacOSRuntime $macosRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS:$LTS
Start-PSPackage -Type osxpkg -SkipReleaseChecks -MacOSRuntime $macosRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath

if ($LTS) {
Start-PSPackage -Type osxpkg -SkipReleaseChecks -MacOSRuntime $macosRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS
}

$pkgNameFilter = "powershell-*$macosRuntime.pkg"
Write-Verbose -Verbose "Looking for pkg packages with filter: $pkgNameFilter in '$(Pipeline.Workspace)' to upload..."
$pkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $pkgNameFilter -Recurse -File
Expand Down
10 changes: 6 additions & 4 deletions CHANGELOG/7.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@

<summary>

<p>We thank the following contributors!</p>
<p>@kasperk81</p>
<p>Update to .NET SDK 10.0.201</p>

</summary>

<ul>
<li>Update v7.6 release branch to use .NET SDK 10.0.201 (#27041)</li>
<li>Create LTS package and non-LTS package for macOS for LTS releases (#27040)</li>
<li>Fix the container image for package pipelines (#27020)</li>
<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> version to 1.2.0 (#27007)</li>
<li>Update LTS and Stable release settings in metadata (#27006)</li>
<li>Update branch for release (#26989)</li>
<li>Fix <code>ConvertFrom-ClearlyDefinedCoordinates</code> to handle API object coordinates (#26986)</li>
<li>Update NuGet package versions in <code>cgmanifest.json</code> to actually match the branch (#26982)</li>
Expand All @@ -32,12 +36,10 @@
<li>Bump actions/dependency-review-action from 4.8.3 to 4.9.0 (#26974)</li>
<li>Hardcode Official templates (#26972)</li>
<li>Fix a preview detection test for the packaging script (#26971)</li>
<li>Fetch latest ICU release version dynamically (#26970) (Thanks @kasperk81!)</li>
<li>Add PMC packages for debian13 and rhel10 (#26917)</li>
<li>Add version in description and pass store task on failure (#26889)</li>
<li>Exclude .exe packages from publishing to GitHub (#26887)</li>
<li>Correct the package name for .deb and .rpm packages (#26884)</li>
<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> version to 1.2.0 (#27007)</li>
</ul>

</details>
Expand Down
2 changes: 1 addition & 1 deletion DotnetRuntimeMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"quality": "daily",
"qualityFallback": "preview",
"packageVersionPattern": "9.0.0-preview.6",
"sdkImageVersion": "10.0.200",
"sdkImageVersion": "10.0.201",
"nextChannel": "9.0.0-preview.7",
"azureFeed": "",
"sdkImageOverride": ""
Expand Down
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.200"
"version": "10.0.201"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.4" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.5" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.5" />
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.5" />
</ItemGroup>

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

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.4" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.5" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.4" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.5" />
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="Markdig.Signed" Version="0.44.0" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
Expand All @@ -34,7 +34,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.4" />
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
<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.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
</ItemGroup>

</Project>
80 changes: 48 additions & 32 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,63 @@

<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.4" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.4" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.4" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.4" />
<PackageReference Include="runtime.native.System.IO.Ports" Version="10.0.4" />
<PackageReference Include="System.CodeDom" Version="10.0.4" />
<PackageReference Include="System.ComponentModel.Composition" Version="10.0.4" />
<PackageReference Include="System.ComponentModel.Composition.Registration" Version="10.0.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.4" />
<PackageReference Include="System.Data.Odbc" Version="10.0.4" />
<PackageReference Include="System.Data.OleDb" Version="10.0.4" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.5" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.5" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.5" />
<PackageReference Include="runtime.android-arm.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.android-arm64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.android-x64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.android-x86.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-arm.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-arm64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-bionic-arm64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-bionic-x64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-musl-arm.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-musl-arm64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-musl-x64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.linux-x64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.maccatalyst-arm64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.maccatalyst-x64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.osx-arm64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="runtime.osx-x64.runtime.native.System.IO.Ports" Version="10.0.5" />
<PackageReference Include="System.CodeDom" Version="10.0.5" />
<PackageReference Include="System.ComponentModel.Composition" Version="10.0.5" />
<PackageReference Include="System.ComponentModel.Composition.Registration" Version="10.0.5" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.5" />
<PackageReference Include="System.Data.Odbc" Version="10.0.5" />
<PackageReference Include="System.Data.OleDb" Version="10.0.5" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.4" />
<PackageReference Include="System.DirectoryServices" Version="10.0.4" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="10.0.4" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="10.0.4" />
<PackageReference Include="System.Drawing.Common" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.5" />
<PackageReference Include="System.DirectoryServices" Version="10.0.5" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="10.0.5" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="10.0.5" />
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="10.0.4" />
<PackageReference Include="System.IO.Ports" Version="10.0.4" />
<PackageReference Include="System.Management" Version="10.0.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.4" />
<PackageReference Include="System.Reflection.Context" Version="10.0.4" />
<PackageReference Include="System.Runtime.Caching" Version="10.0.4" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.4" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.4" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.4" />
<PackageReference Include="System.Security.Permissions" Version="10.0.4" />
<PackageReference Include="System.IO.Packaging" Version="10.0.5" />
<PackageReference Include="System.IO.Ports" Version="10.0.5" />
<PackageReference Include="System.Management" Version="10.0.5" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.5" />
<PackageReference Include="System.Reflection.Context" Version="10.0.5" />
<PackageReference Include="System.Runtime.Caching" Version="10.0.5" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.5" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.5" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.5" />
<PackageReference Include="System.Security.Permissions" Version="10.0.5" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Http" Version="10.0.652802" />
<PackageReference Include="System.ServiceModel.NetFramingBase" 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.4" />
<PackageReference Include="System.ServiceModel.Syndication" Version="10.0.4" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.4" />
<PackageReference Include="System.Speech" Version="10.0.4" />
<PackageReference Include="System.Windows.Extensions" Version="10.0.4" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.5" />
<PackageReference Include="System.ServiceModel.Syndication" Version="10.0.5" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.5" />
<PackageReference Include="System.Speech" Version="10.0.5" />
<PackageReference Include="System.Windows.Extensions" Version="10.0.5" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<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.4" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.5" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@
<!-- 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.4" />
<PackageReference Include="System.CodeDom" Version="10.0.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.4" />
<PackageReference Include="System.DirectoryServices" Version="10.0.4" />
<PackageReference Include="System.Management" Version="10.0.4" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.4" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.4" />
<PackageReference Include="System.Security.Permissions" Version="10.0.4" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.5" />
<PackageReference Include="System.CodeDom" Version="10.0.5" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.5" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<PackageReference Include="System.DirectoryServices" Version="10.0.5" />
<PackageReference Include="System.Management" Version="10.0.5" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.5" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.5" />
<PackageReference Include="System.Security.Permissions" Version="10.0.5" />
<!-- 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" />
<!-- Signing APIs -->
<PackageReference Include="Microsoft.Security.Extensions" Version="1.4.0" />
<PackageReference Include="System.Windows.Extensions" Version="10.0.4" />
<PackageReference Include="System.Windows.Extensions" Version="10.0.5" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.14" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<PackageReference Include="System.DirectoryServices" Version="9.0.14" />
<PackageReference Include="System.Management" Version="9.0.14" />
<PackageReference Include="System.Management.Automation" Version="7.6.0-preview.2" />
Expand Down
Loading
Loading