Skip to content

Commit

Permalink
Merge branch 'main' into ribbon-menu
Browse files Browse the repository at this point in the history
  • Loading branch information
kruplm authored Feb 23, 2023
2 parents a6c8acd + 08c19f8 commit 4584fbf
Show file tree
Hide file tree
Showing 142 changed files with 16,140 additions and 2,621 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,4 @@ See the License for the specific language governing permissions and limitations
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="ITimeService.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.21.4" />
<PackageReference Include="Grpc.Tools" Version="2.47.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Core\Abstractions\MorganStanley.ComposeUI.Core.Abstractions.csproj" />
</ItemGroup>

</Project>

This file was deleted.

10 changes: 0 additions & 10 deletions Tryouts/Core/BasicModels/README.md

This file was deleted.

3 changes: 1 addition & 2 deletions Tryouts/Core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ Core folder contain non-visual multiplatform code that can be re-used between va
There are following projects under Core:

1. Abstractions - containing interfaces and simple classes/structures that they depend on. These interfaces are being implemented primarily by the dynamically loaded plugins and are used for interactions between the varoius plugins, and the shell.
2. BasicModels - contain the non-visual View Model functionality that can be used throughout the application.
3. Utilities - basic non-visual utilities, e.g. classes containing extension methods, generic base classes and other functionality that can be used everywhere else.
2. Utilities - basic non-visual utilities, e.g. classes containing extension methods, generic base classes and other functionality that can be used everywhere else.

Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,4 @@ See the License for the specific language governing permissions and limitations
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Core\Utilities\MorganStanley.ComposeUI.Core.Utilities.csproj" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions Tryouts/Messaging/Client/Client/Abstractions/IConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ internal interface IConnection : IAsyncDisposable
/// <param name="message"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
/// <exception cref="MessageRouterException">With name <see cref="MessageRouterErrors.ConnectionClosed"/> if the connection was closed by either party while sending the request</exception>
/// <exception cref="MessageRouterException">With name <see cref="MessageRouterErrors.ConnectionAborted"/> if the connection was closed due to an unexpected error</exception>
ValueTask SendAsync(Message message, CancellationToken cancellationToken = default);

/// <summary>
/// Receives the next message from the server.
/// </summary>
/// <param name="cancellationToken"></param>
/// <returns></returns>
/// <exception cref="MessageRouterException">With name <see cref="MessageRouterErrors.ConnectionClosed"/> if the connection was closed by either party while sending the request</exception>
/// <exception cref="MessageRouterException">With name <see cref="MessageRouterErrors.ConnectionAborted"/> if the connection was closed due to an unexpected error</exception>
ValueTask<Message> ReceiveAsync(CancellationToken cancellationToken = default);
}
Loading

0 comments on commit 4584fbf

Please sign in to comment.