Skip to content

Commit 8476c6e

Browse files
jasonleenaylorjasonleenaylor
committed
Update palaso dependencies and remove GeckoFx 32bit
* The conditional 32/64 bit dependency was causing issues and wasn't necessary since we aren't shipping 32 bit anymore
1 parent 3d8ddad commit 8476c6e

86 files changed

Lines changed: 307 additions & 267 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Src/CacheLight/CacheLightTests/CacheLightTests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version='1.0' encoding='utf-8'?>
12
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<AssemblyName>CacheLightTests</AssemblyName>
@@ -41,7 +42,7 @@
4142
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
4243
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4344
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
44-
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
45+
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
4546
</ItemGroup>
4647

4748
<ItemGroup>

‎Src/Common/Controls/DetailControls/DetailControls.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040

4141
<ItemGroup>
4242
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
43-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
43+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
4444
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4545
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4646
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
47-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
47+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
4848
</ItemGroup>
4949

5050
<ItemGroup>

‎Src/Common/Controls/DetailControls/DetailControlsTests/DetailControlsTests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version='1.0' encoding='utf-8'?>
12
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<AssemblyName>DetailControlsTests</AssemblyName>
@@ -43,7 +44,7 @@
4344
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
4445
<PackageReference Include="SIL.LCModel.Tests" Version="11.0.0-*" PrivateAssets="All" />
4546
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
46-
<PackageReference Include="SIL.TestUtilities" Version="15.0.0" />
47+
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
4748
</ItemGroup>
4849

4950
<ItemGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040

4141
<ItemGroup>
4242
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
43-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
44-
<PackageReference Include="SIL.Core.Desktop" Version="15.0.0-beta0117" />
43+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
44+
<PackageReference Include="SIL.Core.Desktop" Version="17.0.0-*" />
4545
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
4646
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4747
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4848
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4949
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
50-
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-beta0117" />
51-
<PackageReference Include="SIL.Windows.Forms.WritingSystems" Version="15.0.0-beta0117" />
52-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
50+
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />
51+
<PackageReference Include="SIL.Windows.Forms.WritingSystems" Version="17.0.0-*" />
52+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
5353
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
5454
</ItemGroup>
5555

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version='1.0' encoding='utf-8'?>
12
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<AssemblyName>FwControlsTests</AssemblyName>
@@ -37,12 +38,12 @@
3738
</PropertyGroup>
3839

3940
<ItemGroup>
40-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
41+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
4142
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4243
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
4344
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4445
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
45-
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
46+
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
4647
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
4748
</ItemGroup>
4849

‎Src/Common/Controls/Widgets/Widgets.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040

4141
<ItemGroup>
4242
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
43-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
44-
<PackageReference Include="SIL.Core.Desktop" Version="15.0.0-beta0117" />
43+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
44+
<PackageReference Include="SIL.Core.Desktop" Version="17.0.0-*" />
4545
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4646
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4747
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
48-
<PackageReference Include="SIL.Media" Version="15.0.0-beta0117" />
49-
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-beta0117" />
50-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
48+
<PackageReference Include="SIL.Media" Version="17.0.0-*" />
49+
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />
50+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
5151

5252
</ItemGroup>
5353

‎Src/Common/Controls/Widgets/WidgetsTests/WidgetsTests.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version='1.0' encoding='utf-8'?>
12
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<AssemblyName>WidgetsTests</AssemblyName>
@@ -38,15 +39,15 @@
3839

3940
<ItemGroup>
4041
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
41-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
42+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
4243
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4344
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4445
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
4546
<PackageReference Include="SIL.LCModel.Tests" Version="11.0.0-*" PrivateAssets="All" />
4647
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4748
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
48-
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
49-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
49+
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
50+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
5051
</ItemGroup>
5152

5253
<ItemGroup>

‎Src/Common/Controls/XMLViews/XMLViews.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version='1.0' encoding='utf-8'?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>XMLViews</AssemblyName>
@@ -36,16 +36,14 @@
3636
<ItemGroup>
3737
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
3838
<PackageReference Include="encoding-converters-core" Version="0.9.7" />
39-
<PackageReference Include="Geckofx60.32" Version="60.0.52" Condition="'$(Platform)' != 'x64'" />
40-
<PackageReference Include="Geckofx60.64" Version="60.0.52" Condition="'$(Platform)' == 'x64'" />
41-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
42-
<PackageReference Include="SIL.Core.Desktop" Version="15.0.0-beta0117" />
39+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
40+
<PackageReference Include="SIL.Core.Desktop" Version="17.0.0-*" />
4341
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4442
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4543
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
46-
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-beta0117" />
47-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
48-
</ItemGroup>
44+
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />
45+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
46+
<PackageReference Include="Geckofx60.64" Version="60.0.54" /></ItemGroup>
4947
<ItemGroup>
5048
<Reference Include="Accessibility" />
5149
<Reference Include="System.Drawing" />

‎Src/Common/Controls/XMLViews/XMLViewsTests/XMLViewsTests.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version='1.0' encoding='utf-8'?>
12
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<AssemblyName>XMLViewsTests</AssemblyName>
@@ -39,15 +40,15 @@
3940
<ItemGroup>
4041
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
4142
<PackageReference Include="Moq" Version="4.20.70" />
42-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
43+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
4344
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4445
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
4546
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
4647
<PackageReference Include="SIL.LCModel.Tests" Version="11.0.0-*" PrivateAssets="All" />
4748
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4849
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />
49-
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-beta0117" />
50-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
50+
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
51+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
5152

5253
</ItemGroup>
5354

‎Src/Common/FieldWorks/FieldWorks.csproj‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,20 @@
3838

3939
<ItemGroup>
4040
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
41-
<PackageReference Include="Geckofx60.32" Version="60.0.52" Condition="'$(Platform)' != 'x64'" />
42-
<PackageReference Include="Geckofx60.64" Version="60.0.52" Condition="'$(Platform)' == 'x64'" />
43-
<PackageReference Include="L10NSharp" Version="7.0.0" />
41+
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
4442
<PackageReference Include="SharpZipLib" Version="1.4.0" Exclude="Build,Analyzers" />
45-
<PackageReference Include="SIL.Core" Version="15.0.0-beta0117" />
46-
<PackageReference Include="SIL.Core.Desktop" Version="15.0.0-beta0117" />
43+
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
44+
<PackageReference Include="SIL.Core.Desktop" Version="17.0.0-*" />
4745
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
4846
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
4947
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
5048
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
51-
<PackageReference Include="SIL.Lexicon" Version="15.0.0-beta0117" />
49+
<PackageReference Include="SIL.Lexicon" Version="17.0.0-*" />
5250
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
53-
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-beta0117" />
54-
<PackageReference Include="SIL.Windows.Forms.Keyboarding" Version="15.0.0-beta0117" />
55-
<PackageReference Include="SIL.WritingSystems" Version="15.0.0-beta0117" />
56-
</ItemGroup>
51+
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />
52+
<PackageReference Include="SIL.Windows.Forms.Keyboarding" Version="17.0.0-*" />
53+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
54+
<PackageReference Include="Geckofx60.64" Version="60.0.54" /></ItemGroup>
5755

5856
<ItemGroup>
5957
<Reference Include="Microsoft.Build.Framework" />

0 commit comments

Comments
 (0)