Skip to content

Commit a7332c9

Browse files
committed
use MSBuild version-comparison functions
1 parent 3f4feb6 commit a7332c9

File tree

3 files changed

+4
-25
lines changed

3 files changed

+4
-25
lines changed

src/NETSdkPreview.props

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Smdn.Fundamental.UInt24n/Smdn.Fundamental.UInt24n.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ SPDX-FileCopyrightText: 2021 smdn <smdn@smdn.jp>
33
SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
6-
<Import Project="$(MSBuildThisFileDirectory)..\NETSdkPreview.props" />
7-
86
<PropertyGroup>
97
<TargetFrameworks>net6.0;netcoreapp3.1;net45;netstandard2.1;netstandard1.6</TargetFrameworks>
108
<VersionPrefix>3.0.3</VersionPrefix>
119
<VersionSuffix></VersionSuffix>
1210
<PackageValidationBaselineVersion>3.0.0</PackageValidationBaselineVersion>
1311
</PropertyGroup>
1412

15-
<PropertyGroup Condition=" '$(_NET7SdkAvailable)' == 'true' ">
13+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
1614
<TargetFrameworks>net7.0;$(TargetFrameworks)</TargetFrameworks>
1715
<DefineConstants Condition="$(TargetFramework.StartsWith('net7'))">FEATURE_GENERIC_MATH;$(DefineConstants)</DefineConstants>
1816
<EnablePreviewFeatures Condition="$(TargetFramework.StartsWith('net7'))">true</EnablePreviewFeatures>
@@ -33,7 +31,7 @@ SPDX-License-Identifier: MIT
3331
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$(TargetFramework.StartsWith('net45')) or $(TargetFramework.StartsWith('net46')) or $(TargetFramework.StartsWith('netstandard1'))" />
3432
</ItemGroup>
3533

36-
<ItemGroup Condition=" '$(_NET7SdkAvailable)' == 'true' ">
34+
<ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
3735
<PackageReference Include="System.Runtime.Experimental" Version="7.0.0-preview.2.22152.2" Condition="$(TargetFramework.StartsWith('net7'))" />
3836
</ItemGroup>
3937

tests/Smdn.Fundamental.UInt24n/Smdn.Fundamental.UInt24n.Tests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@ SPDX-FileCopyrightText: 2022 smdn <smdn@smdn.jp>
33
SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
6-
<Import Project="$(MSBuildThisFileDirectory)..\..\src\NETSdkPreview.props" />
7-
86
<PropertyGroup>
97
<TargetFrameworks>net6.0;net5.0;net48;net45;netcoreapp3.1</TargetFrameworks>
108
<RootNamespace>Smdn</RootNamespace>
119
</PropertyGroup>
1210

13-
<PropertyGroup Condition=" '$(_NET7SdkAvailable)' == 'true' ">
11+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
1412
<TargetFrameworks>net7.0;$(TargetFrameworks)</TargetFrameworks>
1513
<DefineConstants Condition="$(TargetFramework.StartsWith('net7'))">FEATURE_GENERIC_MATH;$(DefineConstants)</DefineConstants>
1614
<EnablePreviewFeatures Condition="$(TargetFramework.StartsWith('net7'))">true</EnablePreviewFeatures>
1715
</PropertyGroup>
1816

19-
<ItemGroup Condition=" '$(_NET7SdkAvailable)' == 'true' ">
17+
<ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
2018
<PackageReference Include="System.Runtime.Experimental" Version="7.0.0-preview.2.22152.2" Condition="$(TargetFramework.StartsWith('net7'))" />
2119
</ItemGroup>
2220
</Project>

0 commit comments

Comments
 (0)