Skip to content

Commit f3a2a3f

Browse files
cheenamalhotracheenamalhotra
committed
Fixes
1 parent 633669c commit f3a2a3f

File tree

8 files changed

+28
-16
lines changed

8 files changed

+28
-16
lines changed

‎build.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<Target Name="BuildTestsNetFx" DependsOnTargets="RestoreTestsNetFx;BuildAKVNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx;" />
6363

6464
<Target Name="RestoreNetCore">
65-
<MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
65+
<MSBuild Projects="@(NetCoreDriver)" Targets="restore" />
6666
</Target>
6767

6868
<Target Name="RestoreTestsNetCore">
@@ -71,7 +71,7 @@
7171
</Target>
7272

7373
<Target Name="RestoreNetFx" Condition="'$(IsEnabledWindows)' == 'true'">
74-
<MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="TestTargetOS=$(TestOS)netfx" />
74+
<MSBuild Projects="@(NetFxDriver)" Targets="restore" />
7575
</Target>
7676

7777
<Target Name="RestoreTestsNetFx">

‎src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
<AssemblyName>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</AssemblyName>
55
<AddOnName>AzureKeyVaultProvider</AddOnName>
66
<ProjectGuid>{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}</ProjectGuid>
7-
<TargetFrameworks Condition="'$(ReferenceType)' == 'Project'">net461;netcoreapp2.1;netstandard2.0</TargetFrameworks>
87
<TargetGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard'))">netcoreapp</TargetGroup>
98
<TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
10-
<Configurations>Debug;Release;net461-Release;net461-Debug;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp3.1-Debug;netcoreapp3.1-Release</Configurations>
9+
<Configurations>Debug;Release;</Configurations>
1110
<Platforms>AnyCPU;x86;x64</Platforms>
1211
<IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AddOnName)</IntermediateOutputPath>
1312
<OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AddOnName)</OutputPath>

‎src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,41 @@
55
<Import Project="..\..\Directory.Build.props" />
66

77
<PropertyGroup>
8+
<OSGroup Condition="$(OSGroup) == ''">$(OS)</OSGroup>
9+
<TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
10+
<TargetsUnix Condition="'$(OSGroup)'=='Unix'">true</TargetsUnix>
811
<ReferenceType Condition="'$(ReferenceType)'==''">Project</ReferenceType>
912
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
1013
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1114
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
1215
</PropertyGroup>
16+
17+
<!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
18+
<PropertyGroup>
19+
<TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net461</TargetNetFxVersion>
20+
<TargetNetStandardVersion Condition="'$(TargetNetStandardVersion)' == ''">netstandard2.0</TargetNetStandardVersion>
21+
<TargetNetCoreVersion Condition="'$(ReferenceType)' == 'NetStandard' AND $(TargetNetStandardVersion)=='netstandard2.1'">netcoreapp3.1</TargetNetCoreVersion>
22+
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">netcoreapp2.1</TargetNetCoreVersion>
23+
</PropertyGroup>
24+
1325
<ItemGroup>
1426
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
1527
</ItemGroup>
1628
<Choose>
1729
<!-- Set Default Target Framework when building for Debug and Release configurations. (Visual Studio) -->
1830
<When Condition="'$(TestTargetOS)' == ''">
1931
<PropertyGroup>
20-
<TargetFrameworks>net461;netcoreapp2.1;netstandard2.0</TargetFrameworks>
32+
<TargetFrameworks Condition="'$(TargetsWindows)' == 'true'">$(TargetNetFxVersion);$(TargetNetCoreVersion);$(TargetNetStandardVersion)</TargetFrameworks>
33+
<TargetFrameworks Condition="'$(TargetsUnix)' == 'true'">$(TargetNetCoreVersion);$(TargetNetStandardVersion)</TargetFrameworks>
2134
</PropertyGroup>
2235
</When>
2336
<!-- Set Target Framework when TestTargetOS is not empty. (Command Line) -->
2437
<Otherwise>
2538
<PropertyGroup>
26-
<TargetFramework Condition="'$(TestTargetOS)' == 'Windowsnetstandard' OR '$(TestTargetOS)' == 'Unixnetstandard'">netstandard2.0</TargetFramework>
27-
<TargetFramework Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">netcoreapp2.1</TargetFramework>
28-
<TargetFramework Condition="('$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp') AND ($(ReferenceType)=='NetStandard' AND $(TargetNetStandardVersion)=='netstandard2.1')">netcoreapp3.1</TargetFramework>
29-
<TargetFramework Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net461</TargetFramework>
39+
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetstandard' OR '$(TestTargetOS)' == 'Unixnetstandard'">netstandard2.0;netstandard2.1</TargetFrameworks>
40+
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">netcoreapp2.1</TargetFrameworks>
41+
<TargetFrameworks Condition="('$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp') AND ($(ReferenceType)=='NetStandard' AND $(TargetNetStandardVersion)=='netstandard2.1')">netcoreapp3.1</TargetFrameworks>
42+
<TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net461</TargetFrameworks>
3043
</PropertyGroup>
3144
</Otherwise>
3245
</Choose>

‎src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<AssemblyName>ExternalConfigurableRetryLogic</AssemblyName>
44
<TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
55
<TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
6-
<OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
7-
<TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
8-
<TargetsUnix Condition="'$(OSGroup)'=='Unix'">true</TargetsUnix>
96
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
107
<IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform).$(AssemblyName)</IntermediateOutputPath>
118
<OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath>

‎src/Microsoft.Data.SqlClient/tests/Directory.Build.props‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<Import Project="..\..\Directory.Build.props" />
77

88
<PropertyGroup>
9+
<OSGroup Condition="$(OSGroup) == ''">$(OS)</OSGroup>
10+
<TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
11+
<TargetsUnix Condition="'$(OSGroup)'=='Unix'">true</TargetsUnix>
912
<Configurations>Debug;Release;</Configurations>
1013
<Platforms>AnyCPU;x86;x64</Platforms>
1114
<ReferenceType Condition="'$(ReferenceType)'==''">Project</ReferenceType>
@@ -22,7 +25,8 @@
2225
<!-- Set Default Target Framework when building for Debug and Release configurations. (Visual Studio) -->
2326
<When Condition="'$(TestTargetOS)' == ''">
2427
<PropertyGroup>
25-
<TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion);</TargetFrameworks>
28+
<TargetFrameworks Condition="'$(TargetsWindows)' == 'true'">$(TargetNetFxVersion);$(TargetNetCoreVersion);</TargetFrameworks>
29+
<TargetFrameworks Condition="'$(TargetsUnix)' == 'true'">$(TargetNetCoreVersion);</TargetFrameworks>
2630
</PropertyGroup>
2731
</When>
2832
<!-- Set Target Framework when TestTargetOS is not empty. (Command Line) -->

‎src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<AssemblyName>ManualTests</AssemblyName>
55
<TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
66
<TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
7-
<OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
8-
<TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
9-
<TargetsUnix Condition="'$(OSGroup)'=='Unix'">true</TargetsUnix>
107
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
118
<CodeAnalysisRuleSet>Microsoft.Data.SqlClient.ManualTesting.Tests.ruleset</CodeAnalysisRuleSet>
129
<RuntimeIdentifier Condition="'$(TargetGroup)'=='netfx'">win</RuntimeIdentifier>

‎src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<StartupObject>Microsoft.Data.SqlClient.ExtUtilities.Runner</StartupObject>
66
</PropertyGroup>
77
<ItemGroup>
8+
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
89
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="$(MicrosoftSqlServerSqlManagementObjectsVersion)" />
910
<ProjectReference Include="../Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
1011
</ItemGroup>

‎src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
34
<IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
45
<OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
56
</PropertyGroup>

0 commit comments

Comments
 (0)