Skip to content

Commit 21bd33e

Browse files
Copilotjasonleenaylor
Copilot
and
jasonleenaylor
committed
Fix remaining bare References and package mappings
Fixed bare Reference elements that should be PackageReferences: - FwControls.csproj: ParatextShared → SIL.ParatextShared - ITextDll.csproj: Geckofx, SharpZipLib, ParatextShared → packages - FwParatextLexiconPlugin.csproj: Paratext.LexicalContracts → ParatextData - ScriptureUtilsTests.csproj: ParatextShared → SIL.ParatextShared - Paratext8Plugin.csproj: Paratext.LexicalContracts → removed (provided by ParatextData) - FwParatextLexiconPluginTests.csproj: Paratext.LexicalContracts* → ParatextData - ParatextImportTests.csproj: ParatextShared → SIL.ParatextShared The convertToSDK.py script already has proper mapping for: - ParatextData → Paratext.LexicalContracts, Paratext.LexicalContractsV2, PtxUtils - SIL.ParatextShared → ParatextShared - Geckofx60.32/64 → Geckofx-Core, Geckofx-Winforms - SharpZipLib → ICSharpCode.SharpZipLib DotNetZip NU1903 security warning already suppressed in Directory.Build.props. All NuGet packages now properly identified. Co-authored-by: jasonleenaylor <2295227+jasonleenaylor@users.noreply.github.com>
1 parent 13597ca commit 21bd33e

File tree

10 files changed

+26
-18
lines changed

10 files changed

+26
-18
lines changed

‎Build/convertToSDK.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ def _load_nuget_assemblies_from_mkall_targets(self):
177177
'Geckofx60.32': 'Geckofx-Core', # Both x32 and x64 provide the same assemblies
178178
'Geckofx60.64': 'Geckofx-Core',
179179
'SIL.ParatextShared': 'ParatextShared',
180+
'ParatextData': 'Paratext.LexicalContracts', # ParatextData provides multiple assemblies
180181
}
181182

182183
# Add the package name itself
@@ -189,6 +190,11 @@ def _load_nuget_assemblies_from_mkall_targets(self):
189190
# Geckofx packages provide both Core and Winforms
190191
if 'Geckofx' in package_name:
191192
nuget_assemblies.add('Geckofx-Winforms')
193+
# ParatextData provides multiple assemblies
194+
if package_name == 'ParatextData':
195+
nuget_assemblies.add('Paratext.LexicalContractsV2')
196+
nuget_assemblies.add('ParatextData')
197+
nuget_assemblies.add('PtxUtils')
192198
logger.debug(f"Mapped package {package_name} -> assembly {mapped_name}")
193199

194200
logger.info(f"Loaded {len(nuget_assemblies)} NuGet assemblies from mkall.targets and package mappings")

‎Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Suppress NU1903 security warning for DotNetZip -->
4+
<!-- This is a known issue with an old version; upgrade not currently feasible -->
5+
<NoWarn>$(NoWarn);NU1903</NoWarn>
6+
</PropertyGroup>
7+
</Project>

‎Src/Common/Controls/FwControls/FwControls.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,19 @@
4141
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
4242
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
4343
<PackageReference Include="SIL.Core.Desktop" Version="15.0.0-beta0117" />
44+
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
4445
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4546
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4647
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
48+
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
4749
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-beta0117" />
4850
<PackageReference Include="SIL.Windows.Forms.WritingSystems" Version="15.0.0-beta0117" />
4951
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
5052
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
51-
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
52-
5353
</ItemGroup>
5454

5555
<ItemGroup>
5656
<Reference Include="Accessibility" />
57-
<Reference Include="ParatextShared" />
5857
<Reference Include="System.Drawing" />
5958
<Reference Include="System.Windows.Forms" />
6059
<Reference Include="netstandard" />

‎Src/Common/ScriptureUtils/ScriptureUtils.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41+
<PackageReference Include="ParatextData" Version="9.4.0.1-beta" />
4142
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
4243
<PackageReference Include="SIL.Core.Desktop" Version="15.0.0-beta0117" />
4344
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4445
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4546
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
47+
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
4648
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
4749
</ItemGroup>
4850

4951
<ItemGroup>
50-
<Reference Include="Paratext.LexicalContracts" />
51-
<Reference Include="ParatextShared" />
5252
<Reference Include="SilEncConverters40" />
5353
<Reference Include="System.ComponentModel.Composition" />
5454
<Reference Include="Utilities" />

‎Src/Common/ScriptureUtils/ScriptureUtilsTests/ScriptureUtilsTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<PackageReference Include="SIL.LCModel.Tests" Version="11.0.0-*" PrivateAssets="All" />
4646
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4747
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
48+
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
4849
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
4950
</ItemGroup>
5051

5152
<ItemGroup>
52-
<Reference Include="ParatextShared" />
5353
<Reference Include="Utilities" />
5454
<Reference Include="netstandard" />
5555
</ItemGroup>

‎Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
<ItemGroup>
3939
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
40+
<PackageReference Include="ParatextData" Version="9.4.0.1-beta" />
4041
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
4142
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4243
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
@@ -47,8 +48,6 @@
4748
</ItemGroup>
4849

4950
<ItemGroup>
50-
<Reference Include="Paratext.LexicalContracts" />
51-
<Reference Include="Paratext.LexicalContractsV2" />
5251
<Reference Include="System.ComponentModel.Composition" />
5352
<Reference Include="System.Drawing" />
5453
<Reference Include="System.Web" />

‎Src/FwParatextLexiconPlugin/FwParatextLexiconPluginTests/FwParatextLexiconPluginTests.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@
3737

3838
<ItemGroup>
3939
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
40+
<PackageReference Include="ParatextData" Version="9.4.0.1-beta" />
4041
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
4142
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
4243
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
4344
</ItemGroup>
4445

4546
<ItemGroup>
46-
<Reference Include="Paratext.LexicalContracts" />
47-
<Reference Include="Paratext.LexicalContractsV2" />
4847
<Reference Include="netstandard" />
4948
</ItemGroup>
5049

‎Src/LexText/Interlinear/ITextDll.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,25 @@
4141
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
4242
<PackageReference Include="CsvHelper" Version="28.0.1" />
4343
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
44+
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
4445
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4546
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4647
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4748
<PackageReference Include="SIL.Machine" Version="3.7.4" />
49+
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
4850
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-beta0117" />
4951
<PackageReference Include="SIL.Windows.Forms.Keyboarding" Version="15.0.0-beta0117" />
5052
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
51-
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
52-
53+
<PackageReference Include="Geckofx60.64" Version="60.0.51" Condition="'$(Platform)'=='x64'" />
54+
<PackageReference Include="Geckofx60.32" Version="60.0.51" Condition="'$(Platform)'=='x86'" />
55+
<PackageReference Include="SharpZipLib" Version="1.3.3" />
5356
</ItemGroup>
5457

5558
<ItemGroup>
5659
<Reference Include="Accessibility" />
5760
<Reference Include="Aga.Controls" />
5861
<Reference Include="ECInterfaces" />
5962
<Reference Include="ExCSS" />
60-
<Reference Include="Geckofx-Core" />
61-
<Reference Include="Geckofx-Winforms" />
62-
<Reference Include="ICSharpCode.SharpZipLib" />
63-
<Reference Include="ParatextShared" />
6463
<Reference Include="SilEncConverters40" />
6564
<Reference Include="System.Configuration" />
6665
<Reference Include="System.Drawing" />

‎Src/Paratext8Plugin/Paratext8Plugin.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
<ItemGroup>
4444
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="Paratext.LexicalContracts" />
4645
<Reference Include="PtxUtils" />
4746
<Reference Include="System.ComponentModel.Composition" />
4847
<Reference Include="System.Data.DataSetExtensions" />

‎Src/ParatextImport/ParatextImportTests/ParatextImportTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<PackageReference Include="SIL.LCModel.Tests" Version="11.0.0-*" PrivateAssets="All" />
4444
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4545
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
46+
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
4647
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
4748
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
4849
</ItemGroup>
4950

5051
<ItemGroup>
5152
<Reference Include="ECInterfaces" />
52-
<Reference Include="ParatextShared" />
5353
<Reference Include="Rhino.Mocks" />
5454
<Reference Include="SilEncConverters40" />
5555
<Reference Include="System.Windows.Forms" />

0 commit comments

Comments
 (0)