Skip to content

Commit 48fce9d

Browse files
biozalbiozal
authored
Merge branch 'main' into da-138-update-v5-flutter
2 parents 7d246a9 + e8ae5c4 commit 48fce9d

22 files changed

Lines changed: 3756 additions & 2306 deletions

File tree

‎.github/workflows/java-server-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
124124
- name: Install BrowserStack Local binary
125125
run: |
126-
curl -O "https://www.browserstack.com/browserstack-local/BrowserStackLocal-darwin-x64.zip"
126+
curl -fL -O "https://www.browserstack.com/browserstack-local/BrowserStackLocal-darwin-x64.zip"
127127
unzip BrowserStackLocal-darwin-x64.zip
128128
chmod +x BrowserStackLocal
129129

‎.github/workflows/security-update-claude.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ on:
2727
required: false
2828
type: string
2929
default: "security-team"
30+
target_branch:
31+
description: 'Target branch for checkout and PR base (default: dispatch ref)'
32+
required: false
33+
type: string
3034

3135
permissions:
3236
contents: write
@@ -41,6 +45,7 @@ jobs:
4145
linear_tickets: ${{ inputs.linear_tickets }}
4246
batch_id: ${{ inputs.batch_id }}
4347
reviewers: ${{ inputs.reviewers }}
48+
target_branch: ${{ inputs.target_branch }}
4449
secrets:
4550
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
4651
GH_TOKEN_SECURITY_PATCHES: ${{ secrets.GH_TOKEN_SECURITY_PATCHES }}

‎dotnet-winforms-net48/App.config‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
15+
</dependentAssembly>
16+
</assemblyBinding>
17+
</runtime>
618
</configuration>

‎dotnet-winforms-net48/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
1. Install the .NET 4.8 SDK from <https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48>
1010
2. Create an application at <https://portal.ditto.live>. Make note of the app ID and online playground token
11-
3. Copy the `.env.sample` file at the top level of the quickstart repo to `.env` and add your app ID and online playground token, and place file in the same folder as the solution and csproj file.
11+
3. Copy `.env.sample` from the repo root into the `dotnet-winforms-net48/` folder, rename the copy to `.env`, and fill in your `DITTO_APP_ID`, `DITTO_PLAYGROUND_TOKEN`, and `DITTO_AUTH_URL` (from <https://portal.ditto.live>). The `.env` file must live next to `Taskapp.WinForms.Net48.csproj` — this app reads its config from the project folder, not the repo root. (`DITTO_WEBSOCKET_URL` is in the sample but unused by this app; leave it blank.)
1212

1313

1414
## Documentation
1515

1616
- [Ditto C# .NET SDK Install Guide](https://docs.ditto.live/install-guides/c-sharp)
17-
- [Ditto C# .NET SDK API Reference](https://software.ditto.live/dotnet/Ditto/4.14.4/api-reference/)
17+
- [Ditto C# .NET SDK API Reference](https://software.ditto.live/dotnet/Ditto/5.0.1/api-reference/)
1818

1919

2020
## .NET Windows Forms Application

‎dotnet-winforms-net48/Taskapp.WinForms.Net48.csproj‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,20 @@
3838
<Reference Include="CBOR, Version=4.5.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
3939
<HintPath>packages\PeterO.Cbor.4.5.2\lib\net40\CBOR.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Ditto, Version=4.14.4.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>packages\Ditto.4.14.4\lib\netstandard2.0\Ditto.dll</HintPath>
41+
<Reference Include="Ditto, Version=5.0.1.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>packages\Ditto.5.0.1\lib\netstandard2.0\Ditto.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Ditto.Native.Linux, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>packages\Ditto.Native.Linux.4.14.4\lib\netstandard2.0\Ditto.Native.Linux.dll</HintPath>
45+
<HintPath>packages\Ditto.Native.Linux.5.0.1\lib\netstandard2.0\Ditto.Native.Linux.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Ditto.Native.MacOS, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>packages\Ditto.Native.MacOS.4.14.4\lib\netstandard2.0\Ditto.Native.MacOS.dll</HintPath>
48+
<HintPath>packages\Ditto.Native.MacOS.5.0.1\lib\netstandard2.0\Ditto.Native.MacOS.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Ditto.Native.Win, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>packages\Ditto.Native.Win.4.14.4\lib\netstandard2.0\Ditto.Native.Win.dll</HintPath>
51+
<HintPath>packages\Ditto.Native.Win.5.0.1\lib\netstandard2.0\Ditto.Native.Win.dll</HintPath>
52+
</Reference>
53+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
54+
<HintPath>packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
5255
</Reference>
5356
<Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5457
<HintPath>packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
@@ -71,8 +74,20 @@
7174
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7275
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
7376
</Reference>
74-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
77+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78+
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
79+
</Reference>
80+
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
81+
<HintPath>packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
84+
<HintPath>packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
87+
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
90+
<HintPath>packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
7691
</Reference>
7792
<Reference Include="System.Xml.Linq" />
7893
<Reference Include="System.Data.DataSetExtensions" />
@@ -137,7 +152,7 @@
137152
</None>
138153
</ItemGroup>
139154
<ItemGroup>
140-
<Content Include="packages\Ditto.Native.Win.4.14.4\runtimes\win-x64\native\dittoffi.dll">
155+
<Content Include="packages\Ditto.Native.Win.5.0.1\runtimes\win-x64\native\dittoffi.dll">
141156
<Link>dittoffi.dll</Link>
142157
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
143158
</Content>

‎dotnet-winforms-net48/TasksPeer.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
using System.Threading.Tasks;
66

77
using DittoSDK;
8+
using DittoSDK.Auth;
9+
using DittoSDK.Store;
810
using Newtonsoft.Json;
911

1012
/// <summary>
@@ -35,7 +37,6 @@ public static async Task<TasksPeer> Create(
3537
{
3638
var peer = new TasksPeer(appId, playgroundToken, authUrl);
3739
peer.Authenticate();
38-
await peer.DisableStrictMode();
3940
peer.RegisterSubscription();
4041
await peer.InsertInitialTasks();
4142
peer.StartSync();
@@ -105,19 +106,6 @@ private TasksPeer(string appId, string playgroundToken, string authUrl)
105106
);
106107

107108
_ditto = Ditto.Open(config);
108-
// Required on the 4.x SDK to allow DQL usage; not needed in v5.
109-
_ditto.DisableSyncWithV3();
110-
}
111-
112-
/// <summary>
113-
/// Disables DQL strict mode to simplify queries — lets <c>SELECT *</c> and
114-
/// other ad-hoc queries run without pre-declaring a collection schema.
115-
/// Strict mode is on by default in the 4.x SDK; the default flips in v5.
116-
/// </summary>
117-
/// <seealso href="https://docs.ditto.live/dql/strict-mode"/>
118-
private async Task DisableStrictMode()
119-
{
120-
await _ditto.Store.ExecuteAsync("ALTER SYSTEM SET DQL_STRICT_MODE = false");
121109
}
122110

123111
public void Dispose()

‎dotnet-winforms-net48/TasksPeerService.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Threading.Tasks;
44
using DittoSDK;
5+
using DittoSDK.Store;
56

67
namespace Taskapp.WinForms.Net48
78
{

‎dotnet-winforms-net48/packages.config‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Ditto" version="4.14.4" targetFramework="net48" />
4-
<package id="Ditto.Native.Linux" version="4.14.4" targetFramework="net48" />
5-
<package id="Ditto.Native.MacOS" version="4.14.4" targetFramework="net48" />
6-
<package id="Ditto.Native.Win" version="4.14.4" targetFramework="net48" />
3+
<package id="Ditto" version="5.0.1" targetFramework="net48" />
4+
<package id="Ditto.Native.Linux" version="5.0.1" targetFramework="net48" />
5+
<package id="Ditto.Native.MacOS" version="5.0.1" targetFramework="net48" />
6+
<package id="Ditto.Native.Win" version="5.0.1" targetFramework="net48" />
7+
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
78
<package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net48" />
89
<package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
910
<package id="PeterO.Cbor" version="4.5.2" targetFramework="net48" />
@@ -12,5 +13,9 @@
1213
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
1314
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
1415
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
15-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
16+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
17+
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
18+
<package id="System.Text.Json" version="8.0.5" targetFramework="net48" />
19+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
20+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
1621
</packages>

‎electron/.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Minimum age (in days) a package version must be before npm will install it
2+
min-release-age=3

0 commit comments

Comments
 (0)