Skip to content

Commit b60d473

Browse files
committed
Define constant NETFRAMEWORK explicitly since SDK 10 may not define it
1 parent 0ac26e5 commit b60d473

File tree

6 files changed

+18
-0
lines changed

6 files changed

+18
-0
lines changed

SIL.Core.Desktop/SIL.Core.Desktop.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<WarningLevel>4</WarningLevel>
99
<TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
1010
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
12+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
13+
</PropertyGroup>
1114
<ItemGroup>
1215
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
1316
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">

SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<TargetFrameworks>$(TargetFrameworks);net8.0-windows</TargetFrameworks>
88
<IsTestProject>true</IsTestProject>
99
</PropertyGroup>
10+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
11+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
12+
</PropertyGroup>
1013

1114
<ItemGroup>
1215
<PackageReference Include="L10NSharp" Version="9.0.0-*" />

SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<Description>The SIL.Windows.Forms.Keyboarding library provides cross-platform functionality for keyboard selection and switching in Windows Forms applications. Currently, this library supports system and Keyman keyboards on Windows, and X keyboard extension (XKB) and Intelligent Input Bus (IBus) keyboards on Linux.</Description>
77
<TargetFrameworks>$(TargetFrameworks);net8.0-windows</TargetFrameworks>
88
</PropertyGroup>
9+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
10+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
11+
</PropertyGroup>
912

1013
<ItemGroup Condition=" !$(DefineConstants.Contains('NETFRAMEWORK')) ">
1114
<Content Remove="Linux\**" />

SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
1212
<IsTestProject>true</IsTestProject>
1313
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
15+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
16+
</PropertyGroup>
1417

1518
<ItemGroup>
1619
<ProjectReference Include="..\SIL.Core\SIL.Core.csproj" />

SIL.Windows.Forms/SIL.Windows.Forms.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1111
<TargetFrameworks>$(TargetFrameworks);net8.0-windows</TargetFrameworks>
1212
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
14+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
15+
</PropertyGroup>
1316

1417
<ItemGroup>
1518
<PackageReference Include="Enchant.Net" Version="1.4.2" />

SIL.WritingSystems/SIL.WritingSystems.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
55
<Description>SIL.WritingSystems contains classes for managing and persisting writing systems using the Locale Data Markup Language (LDML) format. This library also contains classes for processing IETF (BCP-47) language tags and accessing the SIL Locale Data Repository (SLDR).</Description>
66
</PropertyGroup>
7+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
8+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
9+
</PropertyGroup>
710

811
<ItemGroup>
912
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />

0 commit comments

Comments
 (0)