Skip to content

Upgrade / align packages in test projects #2980

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
MichelZ wants to merge 16 commits into from
Closed

Upgrade / align packages in test projects #2980

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8b79d3d
Upgrade / align packages in test projects /
MichelZ Nov 6, 2024
a1c4245
Update DotNetRemoteExecutor version
MichelZ Nov 13, 2024
6fb8ec2
Reference System.ServiceProcess on netfx
MichelZ Nov 15, 2024
3c33170
Reference System.ServiceProcess on netfx
MichelZ Nov 15, 2024
81223bd
Merge branch 'testproject-package-upgrades' of https://github.com/Mic…
MichelZ Nov 15, 2024
7d646f2
Always include System.Transactions as well
MichelZ Nov 15, 2024
8dd0c11
Remove references to xunit.runner.console and xunit.runner.utility to…
MichelZ Nov 15, 2024
18383c5
Revert nuget.org addition
MichelZ Nov 19, 2024
bd3debc
Upgrade Versions
MichelZ Nov 19, 2024
22f052f
Merge branch 'main' into testproject-package-upgrades
MichelZ Nov 19, 2024
30749a3
Force build
MichelZ Nov 21, 2024
8ab96c0
Remove dummy
MichelZ Nov 21, 2024
1ae7a52
Merge branch 'main' into testproject-package-upgrades
MichelZ Nov 23, 2024
d74f664
Merge branch 'main' into testproject-package-upgrades
MichelZ Nov 25, 2024
9dcc94d
Add back console runners
MichelZ Nov 25, 2024
e28a981
Remove System.ServiceProcess, should not be needed
MichelZ Nov 25, 2024
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<packageSources>
<clear />
<add key="sqlclient" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
Comment thread
MichelZ marked this conversation as resolved.
Outdated
</packageSources>
</configuration>
5 changes: 0 additions & 5 deletions src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.console" Version="$(XunitVersion)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 4 additions & 6 deletions ...soft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,11 @@
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
<Compile Include="SQL\Batch\BatchTests.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx' AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Reference Include="System.Transactions" />
<Reference Include="System.ServiceProcess" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx' AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
<Compile Include="SQL\ConnectionPoolTest\TransactionPoolTest.cs" />
</ItemGroup>
<ItemGroup Condition="$(Configuration.Contains('Debug')) AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
Expand Down Expand Up @@ -337,11 +340,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.console" Version="$(XunitVersion)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
</ItemGroup>
<ItemGroup>
Expand Down
21 changes: 9 additions & 12 deletions tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<!-- NetCore project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSNIRuntimeVersion>6.0.0-preview1.24226.4</MicrosoftDataSqlClientSNIRuntimeVersion>
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
</PropertyGroup>
<!-- AKV Provider project dependencies -->
Expand All @@ -50,25 +50,22 @@
<!-- Test Project Dependencies -->
<PropertyGroup>
<BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
<MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24517.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24123.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsHosting>6.0.1</MicrosoftExtensionsHosting>
<MicrosoftNETCoreRuntimeCoreCLRVersion>2.0.8</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftExtensionsHosting>8.0.1</MicrosoftExtensionsHosting>
<MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
<MicrosoftNETTestSdkVersion>17.8.0</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
<MicrosoftSqlServerSqlManagementObjectsVersion>170.8.0</MicrosoftSqlServerSqlManagementObjectsVersion>
<MicrosoftSqlServerTypesVersion>10.50.1600.1</MicrosoftSqlServerTypesVersion>
<MicrosoftSqlServerTypesVersionNet>160.1000.6</MicrosoftSqlServerTypesVersionNet>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<SystemDataOdbcVersion>6.0.1</SystemDataOdbcVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<SystemDataOdbcVersion>8.0.1</SystemDataOdbcVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
<XunitVersion>2.4.2</XunitVersion>
<XunitrunnervisualstudioVersion>2.5.5</XunitrunnervisualstudioVersion>
<SystemServiceProcessServiceControllerVersion>8.0.1</SystemServiceProcessServiceControllerVersion>
<XunitVersion>2.9.2</XunitVersion>
<XunitrunnervisualstudioVersion>2.8.2</XunitrunnervisualstudioVersion>
</PropertyGroup>
<PropertyGroup>
<TestAKVProviderVersion>$(NugetPackageVersion)</TestAKVProviderVersion>
Expand Down
3 changes: 0 additions & 3 deletions tools/props/VersionsNet8OrLater.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Net8 project dependencies -->
<PropertyGroup>
<SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
Comment thread
MichelZ marked this conversation as resolved.
Outdated
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24157.1</MicrosoftDotNetRemoteExecutorVersion>
<XunitVersion>2.6.3</XunitVersion>
</PropertyGroup>
</Project>