Skip to content

Commit

Permalink
LT-21074: NuGet ParatextShared DLLs
Browse files Browse the repository at this point in the history 
http://downloads.sil.org is being sunset

Change-Id: Idc4bc55b2d7588830b7c82129d6e82f0a4778a54
  • Loading branch information
@papeh
papeh committed May 31, 2023
1 parent 16b7c1d commit 624ed52
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
27 changes: 8 additions & 19 deletions Build/mkall.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,6 @@
<GeckoFxHtmlToPdfBuildType Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'=='x64'">GeckofxHtmlToPdf_Win64_continuous</GeckoFxHtmlToPdfBuildType>
<GeckoFxHtmlToPdfBuildType Condition="'$(OS)'=='Unix'">GeckofxHtmlToPdf_GeckofxHtmlToPdfXenial64Geckofx60continuous</GeckoFxHtmlToPdfBuildType>
<GeckoFxHtmlToPdfBuildTag>.lastSuccessful</GeckoFxHtmlToPdfBuildTag>
<!-- REVIEW (Hasso) 2022.07: we should move artifacts at this URL to a server that supports https (LT-21074) -->
<DownloadsSilOrgDownloadUrl>http://downloads.sil.org/BuildDlls/FW8.1</DownloadsSilOrgDownloadUrl>
<DownloadsSilOrgOSDownloadUrl Condition="'$(OS)'=='Windows_NT'">$(DownloadsSilOrgDownloadUrl)/Windows</DownloadsSilOrgOSDownloadUrl>
<DownloadsSilOrgOSDownloadUrl Condition="'$(OS)'=='Unix'">$(DownloadsSilOrgDownloadUrl)/Linux</DownloadsSilOrgOSDownloadUrl>
<!-- Windows/.Net and Linux/Mono use different extensions for debug information files. -->
<DebugInfo Condition="'$(OS)'=='Unix'">dll.mdb</DebugInfo>
<DebugInfo Condition="'$(OS)'=='Windows_NT'">pdb</DebugInfo>
Expand Down Expand Up @@ -459,15 +455,6 @@

<Message Text="Downloading artifacts for geckofxHtmlToPdf." />
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(GeckoFxHtmlToPdfBuildType)" Tag="$(GeckoFxHtmlToPdfBuildTag)" Artifacts="GeckofxHtmlToPdf.exe;GeckofxHtmlToPdf.exe.config;Args.dll" DownloadsDir="$(DownloadsDir)"/>

<!-- REVIEW (Hasso) 2022.07: Are these available in NuGet packages? (LT-21074) -->
<Message Text="Downloading Paratext DLLs." />
<DownloadFile Address="$(DownloadsSilOrgOSDownloadUrl)/FormattedEditor.dll" DownloadsDir="$(DownloadsDir)"/>
<DownloadFile Address="$(DownloadsSilOrgOSDownloadUrl)/HelpSystem.dll" DownloadsDir="$(DownloadsDir)"/>
<DownloadFile Address="$(DownloadsSilOrgOSDownloadUrl)/HtmlEditor.dll" DownloadsDir="$(DownloadsDir)"/>
<DownloadFile Address="$(DownloadsSilOrgOSDownloadUrl)/NetLoc.dll" DownloadsDir="$(DownloadsDir)"/>
<DownloadFile Address="$(DownloadsSilOrgOSDownloadUrl)/ParatextShared.dll" DownloadsDir="$(DownloadsDir)"/>
<DownloadFile Address="$(DownloadsSilOrgOSDownloadUrl)/Utilities.dll" DownloadsDir="$(DownloadsDir)"/>
</Target>

<Target Name="CollectAssemblyAndPdbPaths" DependsOnTargets="DefineNugetPackages" Outputs="%(SILNugetPackages.Identity)">
Expand Down Expand Up @@ -564,12 +551,6 @@
<!-- xBuild and MsBuild generate different case artifacts off the same solution file. (sigh) -->
<DownloadedFiles Include="$(DownloadsDir)/$(ExCss).dll"/>
<DownloadedFiles Include="$(DownloadsDir)/$(ExCss).$(DebugInfo)"/>
<DownloadedFiles Include="$(DownloadsDir)/FormattedEditor.dll"/>
<DownloadedFiles Include="$(DownloadsDir)/HelpSystem.dll"/>
<DownloadedFiles Include="$(DownloadsDir)/HtmlEditor.dll"/>
<DownloadedFiles Include="$(DownloadsDir)/NetLoc.dll"/>
<DownloadedFiles Include="$(DownloadsDir)/ParatextShared.dll"/>
<DownloadedFiles Include="$(DownloadsDir)/Utilities.dll"/>
</ItemGroup>

<Target Name="CopyDlls" DependsOnTargets="downloadDlls;copyLibL10ns">
Expand Down Expand Up @@ -649,6 +630,8 @@
<Architecture Condition="'$(Platform)'!='x64'">32</Architecture>
<GeckoDir Condition="'$(OS)'=='Windows_NT'">$(PackagesDir)/Geckofx60.$(Architecture).60.0.50</GeckoDir>
<GeckoDir Condition="'$(OS)'!='Windows_NT'">$(PackagesDir)/Geckofx60.$(Architecture).Linux.60.0.51</GeckoDir>
<OsDir Condition="'$(OS)'=='Windows_NT'">win</OsDir>
<OsDir Condition="'$(OS)'!='Windows_NT'">linux</OsDir>
</PropertyGroup>
<ItemGroup>
<NuGottenForBuildTasks Include="$(PackagesDir)/SIL.BuildTasks.2.6.0-beta0008/tools/SIL.BuildTasks.dll"/>
Expand All @@ -674,6 +657,12 @@
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/ParatextData.dll"/>
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/PtxUtils.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.DesktopAnalytics.4.0.0/lib/net461/DesktopAnalytics.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/FormattedEditor.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/HelpSystem.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/HtmlEditor.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/NetLoc.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/ParatextShared.dll"/>
<NuGottenFiles Include="$(PackagesDir)/SIL.ParatextShared.7.4.0.1/runtimes/$(OsDir)/lib/net40/Utilities.dll"/>
<NuGottenFiles Include="$(PackagesDir)/mixpanel-csharp.6.0.0/lib/net461/Mixpanel.dll"/>
<NuGottenFiles Include="$(PackagesDir)/System.Runtime.CompilerServices.Unsafe.6.0.0/lib/net461/System.Runtime.CompilerServices.Unsafe.dll"/>
<NuGottenFiles Include="$(PackagesDir)/System.Threading.Tasks.Extensions.4.5.4/lib/net461/System.Threading.Tasks.Extensions.dll"/>
Expand Down
1 change: 1 addition & 0 deletions Build/nuget-common/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<package id="SIL.Media" version="11.0.0-beta0041" targetFramework="net461" />
<package id="SIL.Machine" version="2.5.13" targetFramework="net461" />
<package id="SIL.Machine.Morphology.HermitCrab" version="2.5.13" targetFramework="net461" />
<package id="SIL.ParatextShared" version="7.4.0.1" targetFramework="net40" /> <!-- REVIEW (Hasso) 2023.05: do we still integrate with PT 7? -->
<package id="SIL.Scripture" version="8.1.0-beta0035" targetFramework="net461" />
<package id="SIL.TestUtilities" version="11.0.0-beta0041" targetFramework="net461" />
<package id="SIL.Windows.Forms.GeckoBrowserAdapter" version="11.0.0-beta0041" targetFramework="net461" />
Expand Down

0 comments on commit 624ed52

Please sign in to comment.