Thanks to visit codestin.com
Credit goes to github.com

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
119 changes: 60 additions & 59 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,64 +161,65 @@ jobs:
- name: Verify xUnit test results
uses: "./.github/actions/test/verify_xunit"

analyze:
permissions:
actions: read # for github/codeql-action/init to get workflow details
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/analyze to upload SARIF results
name: Analyze
runs-on: ubuntu-latest
needs: changes
if: ${{ needs.changes.outputs.source == 'true' }}

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['csharp']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
fetch-depth: '0'

- uses: actions/setup-dotnet@v5
with:
global-json-file: ./global.json

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- run: |
Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
name: Capture Environment
shell: pwsh

- run: |
Import-Module .\tools\ci.psm1
Invoke-CIInstall -SkipUser
name: Bootstrap
shell: pwsh

- run: |
Import-Module .\tools\ci.psm1
Invoke-CIBuild
name: Build
shell: pwsh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
## Temporarily disable the CodeQL analysis on Linux as it doesn't work for .NET SDK 10-rc.2.
# analyze:
# permissions:
# actions: read # for github/codeql-action/init to get workflow details
# contents: read # for actions/checkout to fetch code
# security-events: write # for github/codeql-action/analyze to upload SARIF results
# name: Analyze
# runs-on: ubuntu-latest
# needs: changes
# if: ${{ needs.changes.outputs.source == 'true' }}
#
# strategy:
# fail-fast: false
# matrix:
# # Override automatic language detection by changing the below list
# # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
# language: ['csharp']
# # Learn more...
# # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
#
# steps:
# - name: Checkout repository
# uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
# with:
# fetch-depth: '0'
#
# - uses: actions/setup-dotnet@v5
# with:
# global-json-file: ./global.json
#
# # Initializes the CodeQL tools for scanning.
# - name: Initialize CodeQL
# uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
# with:
# languages: ${{ matrix.language }}
# # If you wish to specify custom queries, you can do so here or in a config file.
# # By default, queries listed here will override any specified in a config file.
# # Prefix the list here with "+" to use these queries and those in the config file.
# # queries: ./path/to/local/query, your-org/your-repo/queries@main
#
# - run: |
# Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
# name: Capture Environment
# shell: pwsh
#
# - run: |
# Import-Module .\tools\ci.psm1
# Invoke-CIInstall -SkipUser
# name: Bootstrap
# shell: pwsh
#
# - run: |
# Import-Module .\tools\ci.psm1
# Invoke-CIBuild
# name: Build
# shell: pwsh
#
# - name: Perform CodeQL Analysis
# uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5

ready_to_merge:
name: Linux ready to merge
Expand All @@ -228,7 +229,7 @@ jobs:
- linux_test_elevated_others
- linux_test_unelevated_ci
- linux_test_unelevated_others
- analyze
# - analyze
if: always()
uses: PowerShell/compliance/.github/workflows/[email protected]
with:
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.100-rc.1.25451.107"
"version": "10.0.100-rc.2.25502.107"
}
}
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.0-rc.1.25451.107" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.0-rc.2.25502.107" />
</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.0-rc.1.25451.107" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.2.25502.107" />
</ItemGroup>

</Project>
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="Markdig.Signed" Version="0.42.0" />
<PackageReference Include="Markdig.Signed" Version="0.43.0" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>

Expand All @@ -33,8 +33,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageReference Include="System.Threading.AccessControl" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0-rc.2.25502.107" />
<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.0-rc.1.25451.107" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25502.107" />
</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,13 +16,13 @@

<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-rc.1.25451.107" />
<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" />
<!-- 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.0-rc.1.25451.107" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-rc.1.25451.107" />
<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" /-->
<!--
Expand All @@ -37,7 +37,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" NoWarn="NU1605" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.2.25502.107" />
</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.0-rc.1.25451.107" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.2.25502.107" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
<!-- 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.0-rc.1.25451.107" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25451.107" />
<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.1.25451.107" />
<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.1.25451.107" />
<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.1.25451.107" />
<PackageReference Include="System.Security.Permissions" Version="10.0.0-rc.1.25451.107" />
<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" /-->
<!-- the following package(s) are from the powershell org -->
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
<PackageReference Include="System.CommandLine" Version="2.0.0-rc.1.25451.107" />
<PackageReference Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
</ItemGroup>

</Project>
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.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.2.25502.107" />
<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.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0-rc.2.25502.107" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions test/xUnit/xUnit.tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="XunitXml.TestLogger" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="XunitXml.TestLogger" Version="7.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading