Skip to content

reference SIL packages in packages.config #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hahn-kev wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

reference SIL packages in packages.config #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ee3f5e
reference SIL packages in packages.config instead of requiring dlls i…
hahn-kev May 20, 2024
988d835
remove references to getDependencies scripts
hahn-kev May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Build/getDependencies Updates.txt
View file
Open in desktop

This file was deleted.

97 changes: 0 additions & 97 deletions Build/getDependencies-linux.sh
View file
Open in desktop

This file was deleted.

97 changes: 0 additions & 97 deletions Build/getDependencies-win.sh
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Build/make-source-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ git -C "./$(git rev-parse --show-cdup)" archive ${BRANCH} | tar -x -C $PKGDIR

cd $PKGDIR

# Download dependencies
Build/getDependencies.sh

# Delete unwanted non-source files
find . -type f -iname "*.exe" -delete

Expand Down
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ Development
-----------
Pathway is currently running under .net 4.8.1

*Before building Pathway*

Before building Pathway, the developer should install the latest dependencies. All dependencies have been moved to nuGet packages except for the libpalaso packages: `icu.net.dll`, `Spart.dll`, `SIL.Core.dll`, `SIL.Core.Desktop.dll` and `SIL.WritingSystems.dll`. These were installed in the `lib` folder from `libpalaso_palaso-win32-master_Continuous_8.0.0_artifacts` in the net461 folder. The latest icu files: `icudt56.dll`, `icuin56.dll`, and `icuuc56.dll` were also added to that folder.

*Building on Windows*

Wix 3.11.x should be installed to build installer packages. A Developer will also need the Visual Studio Wix extension for the version of Visual Studio being used.
Expand Down
3 changes: 2 additions & 1 deletion src/CssDialog/ConfigurationTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,8 @@ private static void SetUpErrorHandling()
{
if (ErrorReport.EmailAddress == null)
{
ExceptionHandler.Init();
//todo determine the best way to handle this
ExceptionHandler.Init(new ConsoleExceptionHandler());
ErrorReport.EmailAddress = IssuesEmailAddress;
ErrorReport.AddStandardProperties();
ExceptionHandler.AddDelegate(ReportError);
Expand Down
10 changes: 4 additions & 6 deletions src/CssDialog/CssDialog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,11 @@
<Reference Include="PrinceXML.Wrapper, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\PrinceXMLWrapper.1.2.0\lib\netstandard2.0\PrinceXML.Wrapper.dll</HintPath>
</Reference>
<Reference Include="SIL.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\SIL.Core.dll</HintPath>
<Reference Include="SIL.Core">
<HintPath>..\..\packages\SIL.Core.14.1.0\lib\net461\SIL.Core.dll</HintPath>
</Reference>
<Reference Include="SIL.Core.Desktop, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\SIL.Core.Desktop.dll</HintPath>
<Reference Include="SIL.Core.Desktop">
<HintPath>..\..\packages\SIL.Core.Desktop.14.1.0\lib\net461\SIL.Core.Desktop.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand Down
13 changes: 7 additions & 6 deletions src/CssDialog/frmSplash.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// --------------------------------------------------------------------------------------------
// <copyright file="frmSplash.cs" from='2009' to='2014' company='SIL International'>
// Copyright (C) 2014, SIL International. All Rights Reserved.
//
// Copyright (C) 2014, SIL International. All Rights Reserved.
//
// Distributable under the terms of either the Common Public License or the
// GNU Lesser General Public License, as specified in the LICENSING.txt file.
// </copyright>
// </copyright>
// <author>Greg Trihus</author>
// <email>greg_trihus@sil.org</email>
// Last reviewed:
//
// Last reviewed:
//
// <remarks>
// Splash screen with Project Info
// </remarks>
Expand Down Expand Up @@ -95,7 +95,8 @@ private static void SetUpErrorHandling()
{
if (ErrorReport.EmailAddress == null)
{
ExceptionHandler.Init();
//todo determine how to handle this
ExceptionHandler.Init(new ConsoleExceptionHandler());
ErrorReport.EmailAddress = IssuesEmailAddress;
ErrorReport.AddStandardProperties();
ExceptionHandler.AddDelegate(ReportError);
Expand Down
2 changes: 2 additions & 0 deletions src/CssDialog/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
<package id="SIL.Core" version="14.1.0" targetFramework="net48"/>
<package id="SIL.Core.Desktop" version="14.1.0" targetFramework="net48"/>
</packages>
1 change: 0 additions & 1 deletion src/Documentation/Linux build instructions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ If you are on xenial, you want to update the build control with:
cp Build/xenial-pkg/* debian/.
(Please don't check in debian/control and debian/rules for xenial as the originals are used for release.sh)
Make sure the dependencies are installed with:
bash Build/getDependencies.sh
Let the system know your info for commits
git config --global user.name yourname
git config --global user.email youremailaddress@yourdomain.xyz
Expand Down
19 changes: 7 additions & 12 deletions src/PsTool/PsTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
</Reference>
<Reference Include="icu.net, Version=2.7.0.0, Culture=neutral, PublicKeyToken=416fdd914afa6b66, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\icu.net.2.7.1\lib\net451\icu.net.dll</HintPath>
<HintPath>..\..\packages\icu.net.2.9.0\lib\net451\icu.net.dll</HintPath>
</Reference>
<Reference Include="INIFileParser">
<HintPath>..\..\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
Expand All @@ -254,7 +254,7 @@
</Reference>
<Reference Include="SIL.WritingSystems, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cab3c8c5232dfcf2, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\SIL.WritingSystems.dll</HintPath>
<HintPath>..\..\packages\SIL.WritingSystems.14.1.0\lib\net461\SIL.WritingSystems.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand Down Expand Up @@ -318,13 +318,7 @@
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="SIL.Core">
<HintPath>..\..\lib\SIL.Core.dll</HintPath>
</Reference>
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
<HintPath>..\..\packages\SIL.Core.14.1.0\lib\net461\SIL.Core.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
Expand Down Expand Up @@ -487,9 +481,10 @@
<Target Name="BeforeBuild">
</Target>
-->
<Target Name="AfterBuild">
<Copy SourceFiles="..\..\lib\icudt56.dll;..\..\lib\icuin56.dll;..\..\lib\icuuc56.dll;..\..\lib\icu.net.dll" DestinationFolder="$(OutputPath)" Condition=" '$(OS)' == 'Windows_NT' or '$(OS)' == '' " />
</Target>
<!-- todo may need to still be used, in which case reference packages path-->
<!-- <Target Name="AfterBuild">-->
<!-- <Copy SourceFiles="..\..\lib\icudt56.dll;..\..\lib\icuin56.dll;..\..\lib\icuuc56.dll;..\..\lib\icu.net.dll" DestinationFolder="$(OutputPath)" Condition=" '$(OS)' == 'Windows_NT' or '$(OS)' == '' " />-->
<!-- </Target>-->
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
Expand Down
4 changes: 4 additions & 0 deletions src/PsTool/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<packages>
<package id="Analytics" version="3.8.1" targetFramework="net48" />
<package id="ini-parser" version="2.5.2" targetFramework="net40" />
<package id="icu.net" version="2.9.0" targetFramework="netStandard16" />
<package id="Icu4c.Win.Full.Lib" version="59.1.15" targetFramework="net461"/>
<package id="L10NSharp" version="6.0.0" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net48" />
Expand All @@ -20,4 +22,6 @@
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
<package id="SIL.Core" version="14.1.0" targetFramework="net48" />
<package id="SIL.WritingSystems" version="14.1.0" targetFramework="net48" />
</packages>