Merge FDC3 2.0 Conformance Feature Branch

.github/dependabot.yml

@@ -20,6 +20,9 @@ updates:
     directory: '/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent'
     schedule:
       interval: 'monthly'
+      ignore:
+        - dependency-name: 'Finos.Fdc3*'
+          versions: [ '>=2.1' ]
     ignore:
       - dependency-name: 'FluentAssertions*'
         versions: [ '>=8.0' ]
@@ -153,6 +156,9 @@ updates:
     directory: '/'
     schedule:
       interval: 'monthly'
+      ignore:
+        - dependency-name: '@finos/fdc3'
+          versions: [ '>=2.1' ]
     groups:
       react:
         patterns:

.github/workflows/README.md

@@ -7,8 +7,8 @@ Accessing them can be done via the vars object.
 
 | Variable       | Description                                             | Example value |
 | -------------- | ------------------------------------------------------- | ------------- |
-| DOTNET_VERSION | The version of dotnet to load with actions/setup-dotnet | 6.0.x         |
-| NODE_VERSION   | The version of node.js to load with actions/setup-node  | 18.x          |
+| DOTNET_VERSION | The version of dotnet to load with actions/setup-dotnet | 8.0.x         |
+| NODE_VERSION   | The version of node.js to load with actions/setup-node  | 22.x          |
 
 # Workflows
 ## continous-integration.yml

.github/workflows/continuous-integration.yml

@@ -22,14 +22,14 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        dotnet-version: [ '6.0.x' ]
-        node-version: [ '20.x' ]
+        dotnet-version: [ '8.0.x' ]
+        node-version: [ '22.x' ]
     steps:
     - name: Checkout
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Setup Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
       with:
         node-version: ${{ matrix.node-version }}
         COMPOSEUI_SKIP_DOWNLOAD: ${{env.COMPOSEUI_SKIP_DOWNLOAD}}
@@ -44,7 +44,7 @@ jobs:
       run: npx lerna run test
 
     - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
-      uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
+      uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
 
@@ -64,7 +64,7 @@ jobs:
 
 
     - name: Codecov
-      uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+      uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -73,13 +73,13 @@ jobs:
            powershell ./build/dotnet-pack.ps1
 
     - name: Upload Nuget Packages
-      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
       with:
         name: packages
         path: ${{ github.workspace }}/packages
 
     - name: Upload Shell Binaries
-      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
       with:
         name: shell-binaries
-        path: ${{ github.workspace }}/src/shell/dotnet/Shell/bin/Release/net6.0-windows/
+        path: ${{ github.workspace }}/src/shell/dotnet/Shell/bin/Release/net8.0-windows/

.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
-          node-version: 20.x
+          node-version: 22.x
           registry-url: https://registry.npmjs.org/
       - run: |
              lerna publish from-package --no-private --yes
@@ -78,7 +78,7 @@ jobs:
           path: ./packages
       - uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Publish Messaging packages
         working-directory: ./packages
         run: |

Directory.Build.props

@@ -27,4 +27,11 @@
         <RepositoryUrl>https://github.com/morganstanley/ComposeUI</RepositoryUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     </PropertyGroup>
+
+	<PropertyGroup>
+		<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+	</PropertyGroup>
 </Project>

Directory.Packages.props

@@ -1,40 +1,39 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
-    <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
     <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
-    <PackageVersion Include="Finos.Fdc3" Version="2.1.0" />
-    <PackageVersion Include="Finos.Fdc3.NewtonsoftJson" Version="2.0.0" />
-    <PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.1.0" />
-	<PackageVersion Include="FluentAssertions" Version="[6.12.0, 8.0)"/>
-	<PackageVersion Include="FluentAssertions.Json" Version="[6.1.0, 8.0)" />
-    <PackageVersion Include="Google.Protobuf" Version="3.27.3" />
-    <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.65.0" />
-    <PackageVersion Include="Grpc.AspNetCore" Version="2.62.0" />
-    <PackageVersion Include="Grpc.AspNetCore.Web" Version="2.62.0" />
+    <PackageVersion Include="Finos.Fdc3" Version="[2.0.0, 2.1)" />
+    <PackageVersion Include="Finos.Fdc3.NewtonsoftJson" Version="[2.0.0, 2.1)" />
+    <PackageVersion Include="Finos.Fdc3.AppDirectory" Version="[2.0.0, 2.1)" />
+    <PackageVersion Include="FluentAssertions" Version="[7.0.0, 8.0.0)" />
+    <PackageVersion Include="FluentAssertions.Json" Version="[6.1.0, 8.0)" />
+    <PackageVersion Include="Google.Protobuf" Version="3.29.3" />
+    <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.67.0" />
+    <PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" />
+    <PackageVersion Include="Grpc.AspNetCore.Web" Version="2.67.0" />
     <PackageVersion Include="Grpc.Core.Testing" Version="2.46.6" />
-    <PackageVersion Include="Grpc.Net.Client" Version="2.65.0" />
-    <PackageVersion Include="Grpc.Tools" Version="2.65.0" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.67.0" />
+    <PackageVersion Include="Grpc.Tools" Version="2.69.0" />
     <PackageVersion Include="Grpc" Version="2.46.6" />
     <PackageVersion Include="Infragistics.WPF.DockManager.Trial" Version="24.2.53" />
     <PackageVersion Include="Infragistics.WPF.Ribbon.Trial" Version="24.2.53" />
     <PackageVersion Include="Infragistics.WPF.Trial" Version="24.2.53" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.2,9)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.2,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="[8.0.1,9)" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="[8.0.2,9)" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2957.106" />
     <PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -45,21 +44,21 @@
     <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageVersion Include="Serilog" Version="2.11.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.12" />
-    <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
+    <PackageVersion Include="System.Drawing.Common" Version="[8.0.12,9)" />
+    <PackageVersion Include="System.IO.Pipelines" Version="[8.0.0,9)" />
     <PackageVersion Include="System.Management" Version="8.0.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.ServiceModel.Primitives" Version="6.2.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.ServiceModel.Primitives" Version="8.1.1" />
+    <PackageVersion Include="System.Text.Json" Version="[8.0.5,9)" />
     <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.3" />
     <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="21.1.3" />
-    <PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
+    <PackageVersion Include="Testably.Abstractions.Testing" Version="3.2.4" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
   </ItemGroup>
-</Project>
+</Project>

README.md

@@ -24,7 +24,7 @@ It supports desktop and web applications in order to provide an evergreen altern
 As [announced](https://www.finos.org/press/fdc3-2.0-blackrock-morgan-stanley-lead-charge) at OSSF NY '24 ComposeUI has successfully achieved the **FDC3 2.0** Conformance on **9/30/2024** certified by FINOS.
 FDC3 is an open standard for applications on financial desktop to interoperate and exchange data with each other. Learn More https://fdc3.finos.org/
 
-We're planning to release the FDC3 2.0 compliant container in **v0.1.0-alpha.5** with an enhanced FDC3 Channel Selector and IPC related bug fixes. The pre-release artifacts can be found on the [fdc3-2_0-conformance feature branch](https://github.com/morganstanley/ComposeUI/tree/feat/fdc3-2_0-conformance) until the release.
+We're planning to release the FDC3 2.0 compliant container in **v0.1.0-alpha.5** with an enhanced FDC3 Channel Selector and IPC related bug fixes. The pre-release artifacts can be build by checking out the main branch until the release.
 
 # Releases
 
@@ -35,12 +35,102 @@ We're planning to release the FDC3 2.0 compliant container in **v0.1.0-alpha.5**
 # Development Setup
 
 ## Prerequisites
+* Node.js 22
+* .NET 8 (SDK 8.0.x, Desktop Runtime 8.0.x)
+* Visual Studio 2022 Community Edition
 
-- Node.js 18
-- .NET 6
-- Visual Studio: 2022
+## Building the ComposeUI Container
 
-## Building the dependencies with Lerna
+
+Clone the main repository:
+```
+git clone https://github.com/morganstanley/ComposeUI.git
+```
+
+### From Visual Studio IDE
+
+Build the "Shell.sln" solution.
+
+By doing this the build is kicked off to all the other solutions it depends on.
+
+### From Terminal
+
+To build the Nuget and NPM packages without an IDE open Powershell in the ComposeUI folder.
+
+1. Build javascript (with Lerna)
+
+```
+C:\projects\ComposeUI> .\build\lerna-build.ps1
+```
+
+If you only want to build a specific package see [how to build packages with Lerna](#building-the-javascript-dependencies-with-lerna)
+
+
+2. Restore nuget packages:
+
+```
+C:\projects\ComposeUI> .\build\dotnet-restore.ps1
+```
+
+3. Build .NET solutions:
+
+```
+C:\projects\ComposeUI> .\build\dotnet-build.ps1
+```
+
+Now the necessary artifacts have been built.
+
+## Building the Examples
+
+### FDC3 Chart and Grid Example
+
+From the ComposeUI folder:
+
+```
+.\examples\fdc3-chart-and-grid\serve-chart-and-grid.ps1
+```
+Now the development servers are running:
+* Chart: localhost:8080
+* Grid: localhost:4200
+
+### Launching the Shell with the Examples
+
+#### From Visual Studio
+
+Start the "Shell" project.
+
+You can add a new launch setting in the IDE or by adding a new entry to the `$(ProjectRoot))\src\shell\dotnet\Shell\Properties\launchSettings.json` file
+
+### From Terminal
+
+1. It's recommended to add the shell binary to your PATH environment variable so you can use a shorthand:
+
+```
+cd .src\shell\dotnet\
+```
+```
+.\add-to-path.ps1
+```
+2. Launch the FDC3 Example in the ComposeUI Shell:
+
+```
+MorganStanley.ComposeUI.Shell --ModuleCatalog:CatalogUrl file:///C:/ComposeUI/src/Shell/dotnet/examples/module-catalog.json --FDC3:AppDirectory:Source C:/ComposeUI/examples/fdc3-appdirectory/apps-with-intents.json
+```
+
+### Serving web application
+
+[See](#fdc3-chart-and-grid-example)
+
+
+### Running the Shell
+1. Open the Shell Solution
+2. Choose "Shell" as the startup project
+3. Run
+
+
+
+
+## Building the JavaScript Dependencies with Lerna
 
 The javascript dependencies are managed by a lerna monorepo. To build them separately follow the steps below.
 
@@ -82,6 +172,17 @@ npx lerna list
 
 For more information check the [documentation](https://lerna.js.org/docs/api-reference/commands).
 
+## How to Run the FDC3 Conformance test Locally
+
+1. Clone the [FDC3 Conformance Framework](https://github.com/finos/FDC3-conformance-framework) and build it: 
+2. Add the following to the `$((ProjectRoot))\src\shell\dotnet\Shell\Properties\launchSettings.json` file:
+
+```
+    "FDC3-Local": {
+      "commandName": "Project",
+      "commandLineArgs": "--ModuleCatalog:CatalogUrl \"file:///$(ProjectDir)..\\examples\\module-catalog.json\" --FDC3:AppDirectory:Source Path-To-Local-Conformance-Framework-Root\\FDC3-conformance-framework\\directories\\local-conformance-2_0.v2.json"
+    }
+```
 # Building the Experimental Artifacts
 
 The following steps are for building the experimental artifacts and shell for ComposeUI
@@ -160,13 +261,7 @@ Similar steps can be taken in Visual Studio to have the same affect.
 
 #### For the FDC3 Samples
 
-The necessary solutions have to be built in the following order:
-
-1. Message Router
-2. ModuleLoader
-3. DesktopAgent
-4. AppDirectory
-5. Shell
+Build the "Shell" solution. This will kick off the build of the other solutions that the shell depends on.
 
 ### Serving web application
 

examples/dotnet-diagnostics/DiagnosticsExample/DiagnosticsExample.csproj

@@ -13,8 +13,7 @@ See the License for the specific language governing permissions and limitations
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
+    <TargetFramework>$(TargetFrameworkVersion)-windows</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>