Skip to content

Commit 61d3818

Browse files
pwshBotpwshBot
committed
Cherry-pick PR PowerShell#26305 with conflicts for manual resolution
1 parent fa7640b commit 61d3818

File tree

14 files changed

+376
-0
lines changed

14 files changed

+376
-0
lines changed

‎.github/workflows/linux-ci.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ jobs:
159159
- name: Verify xUnit test results
160160
uses: "./.github/actions/test/verify_xunit"
161161

162+
<<<<<<< HEAD
162163
analyze:
163164
permissions:
164165
actions: read # for github/codeql-action/init to get workflow details
@@ -217,6 +218,20 @@ jobs:
217218
218219
- name: Perform CodeQL Analysis
219220
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
221+
=======
222+
## Temporarily disable the CodeQL analysis on Linux as it doesn't work for .NET SDK 10-rc.2.
223+
# analyze:
224+
# name: CodeQL Analysis
225+
# needs: changes
226+
# if: ${{ needs.changes.outputs.source == 'true' }}
227+
# uses: ./.github/workflows/analyze-reusable.yml
228+
# permissions:
229+
# actions: read
230+
# contents: read
231+
# security-events: write
232+
# with:
233+
# runner_os: ubuntu-latest
234+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
220235

221236
ready_to_merge:
222237
name: Linux ready to merge
@@ -226,7 +241,12 @@ jobs:
226241
- linux_test_elevated_others
227242
- linux_test_unelevated_ci
228243
- linux_test_unelevated_others
244+
<<<<<<< HEAD
229245
- analyze
246+
=======
247+
- linux_packaging
248+
# - analyze
249+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
230250
if: always()
231251
uses: PowerShell/compliance/.github/workflows/[email protected]
232252
with:

‎global.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"sdk": {
3+
<<<<<<< HEAD
34
"version": "8.0.415"
5+
=======
6+
"version": "10.0.100-rc.2.25502.107"
7+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
48
}
59
}

‎src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88

99
<ItemGroup>
1010
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
11+
<<<<<<< HEAD
1112
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
13+
=======
14+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.0-rc.2.25502.107" />
15+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
1216
</ItemGroup>
1317

1418
<PropertyGroup>

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@
4747

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

5458
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
<PackageReference Include="Json.More.Net" Version="2.0.2" />
1111
<PackageReference Include="JsonPointer.Net" Version="5.0.2" />
1212
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
13+
<<<<<<< HEAD
1314
<PackageReference Include="Markdig.Signed" Version="0.33.0" />
15+
=======
16+
<PackageReference Include="Markdig.Signed" Version="0.43.0" />
17+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
1418
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
1519
</ItemGroup>
1620

@@ -34,10 +38,16 @@
3438
</ItemGroup>
3539

3640
<ItemGroup>
41+
<<<<<<< HEAD
3742
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
3843
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
3944
<PackageReference Include="System.Drawing.Common" Version="8.0.21" />
4045
<PackageReference Include="JsonSchema.Net" Version="7.0.4" />
46+
=======
47+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
48+
<PackageReference Include="System.Drawing.Common" Version="10.0.0-rc.2.25502.107" />
49+
<PackageReference Include="JsonSchema.Net" Version="7.4.0" />
50+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
4151
</ItemGroup>
4252

4353
</Project>

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88

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

1418
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,30 @@
1616

1717
<ItemGroup>
1818
<!-- This section is to force the version of non-direct dependencies -->
19+
<<<<<<< HEAD
1920
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
2021
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.21" />
22+
=======
23+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-rc.2.25502.107" />
24+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-rc.2.25502.107" />
25+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
2126
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
2227
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
2328
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.2" />
2429
<PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.2" />
2530
<PackageReference Include="System.Drawing.Common" Version="8.0.21" />
2631
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
32+
<<<<<<< HEAD
2733
<PackageReference Include="System.IO.Packaging" Version="8.0.1" />
2834
<PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
2935
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.3" />
3036
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
37+
=======
38+
<PackageReference Include="System.IO.Packaging" Version="10.0.0-rc.2.25502.107" />
39+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-rc.2.25502.107" />
40+
<!-- Removing due to NU1510 -->
41+
<!-- PackageReference Include="System.Text.Encodings.Web" Version="9.0.2" /-->
42+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
3143
<!--
3244
the following package(s) are from https://github.com/dotnet/wcf
3345
they are pinned to the version 4.10.x due to a breaking change in newer versions.
@@ -41,7 +53,11 @@
4153
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
4254
<PackageReference Include="System.Web.Services.Description" Version="4.10.3" />
4355
<!-- the source could not be found for the following package(s) -->
56+
<<<<<<< HEAD
4457
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.21" />
58+
=======
59+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.2.25502.107" />
60+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
4561
</ItemGroup>
4662

4763
</Project>

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1212
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1313
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
14+
<<<<<<< HEAD
1415
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
16+
=======
17+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.2.25502.107" />
18+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
1519
</ItemGroup>
1620

1721
<PropertyGroup>

‎src/System.Management.Automation/System.Management.Automation.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<!-- the Application Insights package -->
3333
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
3434
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
35+
<<<<<<< HEAD
3536
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" />
3637
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
3738
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
@@ -45,6 +46,21 @@
4546
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
4647
<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
4748
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
49+
=======
50+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-rc.2.25502.107" />
51+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25502.107" />
52+
<!-- Removing due to NU1510 -->
53+
<!-- PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" /-->
54+
<PackageReference Include="System.DirectoryServices" Version="10.0.0-rc.2.25502.107" />
55+
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
56+
<PackageReference Include="System.Management" Version="10.0.0-rc.2.25502.107" />
57+
<!-- Removing System.Security.AccessControl as per NU1510 -->
58+
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.1" /-->
59+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0-rc.2.25502.107" />
60+
<PackageReference Include="System.Security.Permissions" Version="10.0.0-rc.2.25502.107" />
61+
<!-- Removing due to NU1510 -->
62+
<!-- PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" /-->
63+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
4864
<!-- the following package(s) are from the powershell org -->
4965
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
5066
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0" />

‎test/tools/TestAlc/nested/Test.Isolated.Nested.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
20+
<<<<<<< HEAD
2021
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
22+
=======
23+
<PackageReference Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
24+
>>>>>>> df8fe254b (Update SDK to 10.0.100-rc.2.25502.107 (#26305))
2125
</ItemGroup>
2226

2327
</Project>

0 commit comments

Comments
 (0)