Skip to content

[release/v7.4]!!!MERGE_CONFLICT!!! Update outdated package references #26346

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

Closed
PowerShell Team Bot (pwshBot) wants to merge 1 commit into from
Closed

[release/v7.4]!!!MERGE_CONFLICT!!! Update outdated package references #26346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions .github/workflows/linux-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ jobs:
- name: Verify xUnit test results
uses: "./.github/actions/test/verify_xunit"

<<<<<<< HEAD
analyze:
permissions:
actions: read # for github/codeql-action/init to get workflow details
Expand Down Expand Up @@ -217,6 +218,20 @@ jobs:

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
=======
## Temporarily disable the CodeQL analysis on Linux as it doesn't work for .NET SDK 10-rc.2.
# analyze:
# name: CodeQL Analysis
# needs: changes
# if: ${{ needs.changes.outputs.source == 'true' }}
# uses: ./.github/workflows/analyze-reusable.yml
# permissions:
# actions: read
# contents: read
# security-events: write
# with:
# runner_os: ubuntu-latest
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))

ready_to_merge:
name: Linux ready to merge
Expand All @@ -226,7 +241,12 @@ jobs:
- linux_test_elevated_others
- linux_test_unelevated_ci
- linux_test_unelevated_others
<<<<<<< HEAD
- analyze
=======
- linux_packaging
# - analyze
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
if: always()
uses: PowerShell/compliance/.github/workflows/[email protected]
with:
Expand Down
4 changes: 4 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"sdk": {
<<<<<<< HEAD
"version": "8.0.415"
=======
"version": "10.0.100-rc.2.25502.107"
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
}
}
4 changes: 4 additions & 0 deletions ...icrosoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<<<<<<< HEAD
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
=======
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<<<<<<< HEAD
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
=======
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

</Project>
10 changes: 10 additions & 0 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<PackageReference Include="Json.More.Net" Version="2.0.2" />
<PackageReference Include="JsonPointer.Net" Version="5.0.2" />
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<<<<<<< HEAD
<PackageReference Include="Markdig.Signed" Version="0.33.0" />
=======
<PackageReference Include="Markdig.Signed" Version="0.43.0" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>

Expand All @@ -34,10 +38,16 @@
</ItemGroup>

<ItemGroup>
<<<<<<< HEAD
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.21" />
<PackageReference Include="JsonSchema.Net" Version="7.0.4" />
=======
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="JsonSchema.Net" Version="7.4.0" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<<<<<<< HEAD
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.2" />
=======
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

</Project>
16 changes: 16 additions & 0 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,30 @@

<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<<<<<<< HEAD
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.21" />
=======
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.2" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.2" />
<PackageReference Include="System.Drawing.Common" Version="8.0.21" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<<<<<<< HEAD
<PackageReference Include="System.IO.Packaging" Version="8.0.1" />
<PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.3" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
=======
<PackageReference Include="System.IO.Packaging" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-rc.2.25502.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Text.Encodings.Web" Version="9.0.2" /-->
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
<!--
the following package(s) are from https://github.com/dotnet/wcf
they are pinned to the version 4.10.x due to a breaking change in newer versions.
Expand All @@ -41,7 +53,11 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<PackageReference Include="System.Web.Services.Description" Version="4.10.3" />
<!-- the source could not be found for the following package(s) -->
<<<<<<< HEAD
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.21" />
=======
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
<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 -->
<<<<<<< HEAD
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
=======
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

<PropertyGroup>
Expand Down
16 changes: 16 additions & 0 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<<<<<<< HEAD
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
Expand All @@ -45,6 +46,21 @@
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
=======
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25502.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" /-->
<PackageReference Include="System.DirectoryServices" Version="10.0.0-rc.2.25502.107" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="10.0.0-rc.2.25502.107" />
<!-- Removing System.Security.AccessControl as per NU1510 -->
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.1" /-->
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="System.Security.Permissions" Version="10.0.0-rc.2.25502.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" /-->
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0" />
Expand Down
4 changes: 4 additions & 0 deletions test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@

<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
<<<<<<< HEAD
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
=======
<PackageReference Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@
</PropertyGroup>

<ItemGroup>
<<<<<<< HEAD
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.21" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
<PackageReference Include="System.Data.Odbc" Version="8.0.1" />
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
=======
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.2" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
Expand Down
4 changes: 4 additions & 0 deletions test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@
</PropertyGroup>

<ItemGroup>
<<<<<<< HEAD
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.21" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.21" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
=======
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0-rc.2.25502.107" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>
</Project>
11 changes: 11 additions & 0 deletions test/xUnit/xUnit.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,24 @@
</ItemGroup>

<ItemGroup>
<<<<<<< HEAD
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
<PackageReference Include="XunitXml.TestLogger" Version="3.1.20" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Validation" Version="2.4.22" />
=======
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="XunitXml.TestLogger" Version="7.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading