-
Notifications
You must be signed in to change notification settings - Fork 317
[5.1] Dependency Cleanup #3838
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.
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
base: release/5.1
Are you sure you want to change the base?
[5.1] Dependency Cleanup #3838
Changes from all commits
4e6e2f7
a55bdcf
7e82d4e
222f16c
945a69a
e64eed9
cac840c
ea21587
e4bf075
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| # For most projects, this workflow file will not need changing; you simply need | ||
| # to commit it to your repository. | ||
| # | ||
| # You may wish to alter this file to override the set of languages analyzed, | ||
| # or to provide custom queries or build logic. | ||
| # | ||
| # ******** NOTE ******** | ||
| # We have attempted to detect the languages in your repository. Please check | ||
| # the `language` matrix defined below to confirm you have the correct set of | ||
| # supported CodeQL languages. | ||
| # | ||
| name: "CodeQL Advanced" | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "release/5.1" ] | ||
| pull_request: | ||
| branches: [ "release/5.1" ] | ||
| schedule: | ||
| - cron: '33 23 * * 6' | ||
|
|
||
| jobs: | ||
| analyze: | ||
| name: Analyze (${{ matrix.language }}) | ||
| # Runner size impacts CodeQL analysis time. To learn more, please see: | ||
| # - https://gh.io/recommended-hardware-resources-for-running-codeql | ||
| # - https://gh.io/supported-runners-and-hardware-resources | ||
| # - https://gh.io/using-larger-runners (GitHub.com only) | ||
| # Consider using larger runners or machines with greater resources for possible analysis time improvements. | ||
| runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} | ||
| permissions: | ||
| # required for all workflows | ||
| security-events: write | ||
|
|
||
| # required to fetch internal or private CodeQL packs | ||
| packages: read | ||
|
|
||
| # only required for workflows in private repositories | ||
| actions: read | ||
| contents: read | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - language: csharp | ||
| build-mode: manual | ||
| # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' | ||
| # Use `c-cpp` to analyze code written in C, C++ or both | ||
| # Use 'java-kotlin' to analyze code written in Java, Kotlin or both | ||
| # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both | ||
| # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, | ||
| # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. | ||
| # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how | ||
| # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup .NET Core SDK | ||
| uses: actions/setup-dotnet@v5.0.1 | ||
| with: | ||
| global-json-file: global.json | ||
|
|
||
| # Initializes the CodeQL tools for scanning. | ||
| - name: Initialize CodeQL | ||
| uses: github/codeql-action/init@v4 | ||
| with: | ||
| languages: ${{ matrix.language }} | ||
| build-mode: ${{ matrix.build-mode }} | ||
| # 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. | ||
|
|
||
| # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs | ||
| # queries: security-extended,security-and-quality | ||
|
|
||
| # If the analyze step fails for one of the languages you are analyzing with | ||
| # "We were unable to automatically build your code", modify the matrix above | ||
| # to set the build mode to "manual" for that language. Then modify this step | ||
| # to build your code. | ||
| # ℹ️ Command-line programs to run using the OS shell. | ||
| # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun | ||
| - name: Run manual build steps | ||
| if: matrix.build-mode == 'manual' | ||
| shell: bash | ||
| run: | | ||
| mkdir packages | ||
| dotnet build src/Microsoft.Data.SqlClient.sln | ||
|
|
||
| - name: Perform CodeQL Analysis | ||
| uses: github/codeql-action/analyze@v4 | ||
| with: | ||
| category: "/language:${{matrix.language}}" |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "8.0.416" | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The .NET 6 SDK is EOL and difficult to install locally for devs, so I chose the nearest supported one. Note that some parts of the CI pipeline are already using .NET 10 SDK to build, so this is actually closer to .NET 6 than some of our existing jobs. |
||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -408,8 +408,8 @@ | |
| <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInternalTransaction.cs"> | ||
| <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlMetadataFactory.cs"> | ||
| <Link>Microsoft\Data\SqlClient\SqlMetadataFactory.cs</Link> | ||
| <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlMetaDataFactory.cs"> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A few case-sensitivity changes so the CodeQL workflow can build and scan on Ubuntu. |
||
| <Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link> | ||
paulmedynski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </Compile> | ||
| <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs"> | ||
| <Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link> | ||
|
|
@@ -963,12 +963,8 @@ | |
| <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" /> | ||
| <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> | ||
| <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" /> | ||
| <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" /> | ||
| <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSniRuntimeVersion)" /> | ||
| <!-- Enable the project reference for debugging purposes. --> | ||
| <!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> --> | ||
| <PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" /> | ||
| <PackageReference Condition="$(TargetGroup) == 'netcoreapp' " Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" /> | ||
| <!-- | ||
| Azure.Core is explicitly referenced to avoid a transitive dependency on | ||
| a vulnerable version via Azure.Identity. | ||
|
|
@@ -982,6 +978,7 @@ | |
| <PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" /> | ||
| <PackageReference Condition="$(TargetGroup) == 'netstandard'" Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" /> | ||
| <PackageReference Condition="$(TargetGroup) == 'netstandard'" Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" /> | ||
| <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtVersion)" /> | ||
| </ItemGroup> | ||
| <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" /> | ||
| <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" /> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Target Name="GenerateResourceStringsSource" BeforeTargets="CoreCompile"> | ||
| <Exec Command="powershell.exe -NonInteractive -executionpolicy Unrestricted -command "&$(NetFxSource)tools\scripts\GenerateResourceStringsSource.ps1 -ResxFileDir '$(NetFxResources)' -ResxFileName '$(ResxFileName)' -OutputPath '$(IntermediateOutputPath)' -GeneratedSourceFileName '$(GeneratedSourceFileName)'"" /> | ||
| <MakeDir Directories="$(IntermediateOutputPath)" /> | ||
| <ItemGroup> | ||
| <Compile Include="$(IntermediateOutputPath)$(GeneratedSourceFileName)" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <PowerShellExe>pwsh</PowerShellExe> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. More changes for CodeQL on Ubuntu. The GitHub Actions runners have |
||
| <PowerShellExe Condition=" '$(OS)' == 'Windows_NT' ">powershell.exe</PowerShellExe> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="GenerateResourceStringsSource" BeforeTargets="CoreCompile"> | ||
| <Exec Command="$(PowerShellExe) -NonInteractive -executionpolicy Unrestricted -command "&$(NetFxSource)tools\scripts\GenerateResourceStringsSource.ps1 -ResxFileDir '$(NetFxResources)' -ResxFileName '$(ResxFileName)' -OutputPath '$(IntermediateOutputPath)' -GeneratedSourceFileName '$(GeneratedSourceFileName)'"" /> | ||
| <MakeDir Directories="$(IntermediateOutputPath)" /> | ||
| <ItemGroup> | ||
| <Compile Include="$(IntermediateOutputPath)$(GeneratedSourceFileName)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I brought this over from the newer branches to satisfy our GitHub ruleset config.