Skip to content

[6.0] Fix xevent and codeql (#3775)(#3819), add global.json #3827

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

Merged
mdaigle merged 16 commits into from
Dec 9, 2025
Merged

[6.0] Fix xevent and codeql (#3775)(#3819), add global.json #3827

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
137905c
Fix xevent test failures, avoid orphaned sessions (#3775)
paulmedynski Dec 1, 2025
a613600
Disable scanning of Actions in CodeQL workflow (#3819)
paulmedynski Dec 3, 2025
3380a1a
Fix missed merge conflict. Adjust codeql trigger branch.
mdaigle Dec 4, 2025
5bf7a5a
Fix compilation issues.
mdaigle Dec 4, 2025
24ebf42
Add basic global.json file and update codeql to reference it.
mdaigle Dec 4, 2025
e9bb3fd
Remove COMReference following the lead of #3403. Fix project sdk capi…
mdaigle Dec 4, 2025
ec76c2f
Fix file capitalization. Fix ruleset inclusion following the lead of …
mdaigle Dec 4, 2025
fb867eb
Fix capitalization in netcore csproj file.
mdaigle Dec 4, 2025
f23c4af
Downgrade xunit.
mdaigle Dec 5, 2025
485f305
Tests | Update Package Versions (#3312)
benrr101 Apr 30, 2025
bd9d2a2
Add back asn1 version.
mdaigle Dec 5, 2025
1b9facd
Use global.json for x86 sdk install.
mdaigle Dec 5, 2025
428f91d
Use more specific version for compatibility with install script.
mdaigle Dec 5, 2025
6dc7593
Install appropriate runtime for target framework.
mdaigle Dec 5, 2025
197250a
Fix comments.
mdaigle Dec 5, 2025
b666719
Update code coverage job to use global.json sdk version.
mdaigle Dec 5, 2025
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
16 changes: 1 addition & 15 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Net.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{407890AC-9876-4FEF-A6F1-F36A876BAADE}</ProjectGuid>
<RootNamespace></RootNamespace>
Expand All @@ -12,9 +12,6 @@
<DocumentationFile>$(OutputPath)\Microsoft.Data.SqlClient.xml</DocumentationFile>
<IntermediateOutputPath>$(ObjPath)$(AssemblyName)\netfx\</IntermediateOutputPath>
<Product>Framework $(BaseProduct)</Product>
<!-- ResolveComReferenceSilent suppresses warnings thrown due to the inclusion of mscoree.
We should remove ResolveComReferenceSilent as soon as we can remove the dependency on mscoree. -->
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DefineConstants>$(DefineConstants);NETFRAMEWORK;</DefineConstants>
</PropertyGroup>
Expand Down Expand Up @@ -875,17 +872,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<COMReference Include="mscoree">
<Guid>{5477469E-83B1-11D2-8B49-00A0C9B7C9C4}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
Expand Down
Loading