Skip to content

Commit c10eb4b

Browse files
committed
User Story 33636: Add Linux build support
- Fixed equality operator in MSBuild Conditions. - Removed incorrect 'AfterTargets' for modern AKV targets.
1 parent aeb09b4 commit c10eb4b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
<Message Text=">>> Building AKV project for netfx [$(BuildAkvProperties)]" />
421421
<MSBuild Projects="@(AKVProvider)" Properties="$(BuildAkvProperties);" />
422422
</Target>
423-
<Target Name="BuildAkvModernNetCore" AfterTargets="BuildAkvNetFx">
423+
<Target Name="BuildAkvModernNetCore">
424424
<PropertyGroup>
425425
<BuildAkvProperties>$(CI);Platform=AnyCPU;$(ProjectProperties)</BuildAkvProperties>
426426
</PropertyGroup>

src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
44
<AssemblyName>FunctionalTests</AssemblyName>
55

6-
<TargetsNetFx Condition="'$(TargetsNetFx)' = '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETFramework'">true</TargetsNetFx>
6+
<TargetsNetFx Condition="'$(TargetsNetFx)' == '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETFramework'">true</TargetsNetFx>
77

88
<RuntimeIdentifier Condition="'$(TargetsNetFx)'=='true'">win</RuntimeIdentifier>
99
<RuntimeIdentifier Condition="'$(TargetsNetFx)'=='true' AND '$(ReferenceType)' == 'Package' AND !$(Platform.Contains('AnyCPU'))">win-$(Platform)</RuntimeIdentifier>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectGuid>{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}</ProjectGuid>
44
<AssemblyName>ManualTests</AssemblyName>
55

6-
<TargetsNetFx Condition="'$(TargetsNetFx)' = '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETFramework'">true</TargetsNetFx>
6+
<TargetsNetFx Condition="'$(TargetsNetFx)' == '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETFramework'">true</TargetsNetFx>
77

88
<RuntimeIdentifier Condition="'$(TargetsNetFx)' == 'true'">win</RuntimeIdentifier>
99
<RuntimeIdentifier Condition="'$(TargetsNetFx)' == 'true' AND '$(ReferenceType)' == 'Package' AND !$(Platform.Contains('AnyCPU'))">win-$(Platform)</RuntimeIdentifier>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33

4-
<TargetsNetFx Condition="'$(TargetsNetFx)' = '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETFramework'">true</TargetsNetFx>
4+
<TargetsNetFx Condition="'$(TargetsNetFx)' == '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETFramework'">true</TargetsNetFx>
55

66
<RuntimeIdentifier Condition="'$(TargetsNetFx)' == 'true'">win</RuntimeIdentifier>
77
<RuntimeIdentifier Condition="'$(TargetsNetFx)' == 'true' AND '$(ReferenceType)' == 'Package' AND !$(Platform.Contains('AnyCPU'))">win-$(Platform)</RuntimeIdentifier>

0 commit comments

Comments
 (0)