Skip to content

Commit 4cbf9a3

Browse files
committed
Merge branch 'updt_sourcegrid' into feature
2 parents e29e2a1 + 7a2de63 commit 4cbf9a3

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

EDSEditorGUI/EDSEditorGUI.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,11 @@
9999
</ItemGroup>
100100
<ItemGroup>
101101
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
102-
<PackageReference Include="SourceGrid" Version="4.4.0" />
102+
<PackageReference Include="SourceGrid" Version="4.4.0" Condition="'$(TargetFramework)' == 'net481'" />
103+
<PackageReference Include="SourceGrid-huanlin" Version="6.1.1" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
103104
<PackageReference Include="System.Resources.Extensions" Version="10.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
104105
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
105106
</ItemGroup>
106-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
107-
<PackageReference Include="SourceGrid-mehmetulukaya">
108-
<Version>8.0.11</Version>
109-
</PackageReference>
110-
</ItemGroup>
111107
<PropertyGroup>
112108
<PreBuildEvent>git describe --tags --long --dirty &gt; "$(MSBuildProjectDirectory)$([System.IO.Path]::DirectorySeparatorChar)version.txt" || exit 0</PreBuildEvent>
113109
</PropertyGroup>

0 commit comments

Comments
 (0)