Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/base-installer-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ jobs:

- name: Tag, Create Release, and Upload artifacts
if: ${{ inputs.make_release == 'true' }}
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228
uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64
with:
target_commitish: ${{ github.event.inputs.fw_ref || github.ref }}
tag_name: build-${{ env.FW_BUILD_NUMBER }}
Expand Down
6 changes: 3 additions & 3 deletions Build/SilVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
=============================================================
-->
<PropertyGroup Label="SIL Ecosystem Versions">
<SilLcmVersion>11.0.0-beta0180</SilLcmVersion>
<SilLibPalasoVersion>18.0.0-beta0030</SilLibPalasoVersion>
<SilLcmVersion>11.0.0-beta0182</SilLcmVersion>
<SilLibPalasoVersion>18.0.0-beta0042</SilLibPalasoVersion>
<SilLibPalasoL10nsVersion>18.0.0-beta0012</SilLibPalasoL10nsVersion>
<SilChorusVersion>6.0.0-beta0065</SilChorusVersion>
<SilChorusL10nsVersion>3.0.1</SilChorusL10nsVersion>
<SilMachineVersion>3.9.2</SilMachineVersion>
<SilIPCFrameworkVersion>1.1.1-beta0001</SilIPCFrameworkVersion>
<L10NSharpVersion>10.0.0-beta0014</L10NSharpVersion>
<EncodingConvertersCoreVersion>0.9.8</EncodingConvertersCoreVersion>
<EncodingConvertersCoreVersion>0.9.9</EncodingConvertersCoreVersion>
<IcuNugetVersion>70.1.152</IcuNugetVersion>
<GeckoNugetVersion>60.0.56</GeckoNugetVersion>
</PropertyGroup>
Expand Down
22 changes: 11 additions & 11 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<ItemGroup Label="Transitive Pins">
<!-- System.Drawing.Common: ParatextData requires >= 9.0.9; SIL.LCModel.Core
pulls 6.0.0 transitively. -->
<PackageVersion Include="System.Drawing.Common" Version="9.0.18" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.10" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.20" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.12" />
<!-- System.Resources.Extensions: required for non-string resources (images, icons)
in .NET Framework SDK-style projects. -->
<PackageVersion Include="System.Resources.Extensions" Version="9.0.18" />
<PackageVersion Include="System.Resources.Extensions" Version="9.0.20" />
<!-- Held at 9.0.16: 9.0.17 throws TypeInitializationException on
Icu.NativeMethods in the net48 test host (PR #1000). Retest: bump, full
test.ps1, grep .trx for "Icu.NativeMethods" - zero hits is safe. -->
Expand All @@ -43,7 +43,7 @@
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<!-- System.Security.Permissions (LT-22394): ProDotNetZip requires >= 8.0.0,
System.Security.AccessControl >= 6.0.0. -->
<PackageVersion Include="System.Security.Permissions" Version="9.0.18" />
<PackageVersion Include="System.Security.Permissions" Version="9.0.20" />
<!-- System.Text.Encoding.CodePages: SIL.Machine requires >= 10.0.3,
ProDotNetZip >= 8.0.0; must match the plugin project. -->
<PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.3" />
Expand Down Expand Up @@ -169,7 +169,7 @@
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Win32" Version="8.3.1.1" />
<!-- Pinned: multiple test projects copy this into the shared Output folder, and without
one version the last-built project's copy breaks the others' binding redirects. -->
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.20" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="NUnit" Version="3.14.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
Expand All @@ -183,18 +183,18 @@
<!-- Avalonia is pinned to 11.3.x: it still ships netstandard2.0 assemblies, so it can load
in-process on net48. Avalonia 12.x drops netstandard2.0 (net8+ only) and cannot. -->
<ItemGroup Label="Avalonia">
<PackageVersion Include="Avalonia" Version="11.3.17" />
<PackageVersion Include="Avalonia" Version="11.3.22" />
<!-- Transitive analyzer carrier (Avalonia -> Avalonia.BuildServices). Pinned so xWorks
can reference it with IncludeAssets="none": its analyzers must not run where
warnings are errors. -->
<PackageVersion Include="Avalonia.BuildServices" Version="11.3.2" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.17" />
<PackageVersion Include="Avalonia.Win32.Interoperability" Version="11.3.17" />
<PackageVersion Include="Avalonia.Headless" Version="11.3.17" />
<PackageVersion Include="Avalonia.Headless.NUnit" Version="11.3.17" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.22" />
<PackageVersion Include="Avalonia.Win32.Interoperability" Version="11.3.22" />
<PackageVersion Include="Avalonia.Headless" Version="11.3.22" />
<PackageVersion Include="Avalonia.Headless.NUnit" Version="11.3.22" />
<!-- Skia-enabled headless rendering for visual parity frame capture.
The HarfBuzzSharp 8.3.1.1 pin above was aligned for exactly this package. -->
<PackageVersion Include="Avalonia.Skia" Version="11.3.17" />
<PackageVersion Include="Avalonia.Skia" Version="11.3.22" />
<!-- MVVM for hand-authored Avalonia dialogs. 8.x ships netstandard2.0 source
generators, so it works on net48. -->
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
Expand Down
6 changes: 3 additions & 3 deletions Src/Common/FieldWorks/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ Only entries that auto-gen cannot produce are kept below.
Directory.Packages.props) via a project reference. FieldWorks.exe does not reference
that package directly, so auto-generated redirects do not emit this entry and net48
fails to bind Avalonia's 8.0.0.0 reference to the copied assembly at runtime.
newVersion must match the assembly version of the deployed DLL (9.0.2 package =
assembly 9.0.0.2). Keep this until the host resolves DiagnosticSource directly
newVersion must match the assembly version of the deployed DLL (9.0.20 package =
assembly 9.0.0.20). Keep this until the host resolves DiagnosticSource directly
through the main package graph. -->
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.20" newVersion="9.0.0.20" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Loading