Skip to content

Commit

Permalink
Merge branch 'main' into messaging/response-types
Browse files Browse the repository at this point in the history
  • Loading branch information
kruplm authored Mar 7, 2024
2 parents 16ee03a + 8928f0e commit fcfeb25
Show file tree
Hide file tree
Showing 68 changed files with 37,214 additions and 13,180 deletions.
94 changes: 63 additions & 31 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,83 @@

version: 2
updates:

- package-ecosystem: "nuget"
directory: "/" # Location of package manifests
- package-ecosystem: 'nuget'
directory: '/' # Location of package manifests
schedule:
interval: "monthly"
interval: 'monthly'

# Dependabot doesn't support glob syntax. Every solution needs an entry
# Dependabot doesn't support glob syntax. Every solution needs an entry

- package-ecosystem: "nuget"
directory: "/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent"
- package-ecosystem: 'nuget'
directory: '/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Client"
- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Client'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Core"
- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Core'
schedule:
interval: "monthly"
- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Host"
interval: 'monthly'

- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Host'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Server"
- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Server'
schedule:
interval: "monthly"
- package-ecosystem: "nuget"
directory: "/src/shell/dotnet/Shell"
interval: 'monthly'

- package-ecosystem: 'nuget'
directory: '/src/shell/dotnet/Shell'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype"
- package-ecosystem: 'nuget'
directory: '/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'monthly'
groups:
react:
patterns:
- 'react*'
gatsby:
patterns:
- 'gatsby*'
angular: # group all angular updates together
patterns:
- '@angular*'
update-types: # group angular where highest version is minor or patch
- 'minor'
- 'patch'
rollup: # group all rollup updates together
patterns:
- '@rollup*'
- 'rollup*'
testing: # group all dev testing updates together
patterns:
- '@types/jasmine'
- 'jasmine*'
- 'karma*'
ignore:
- dependency-name: '@angular*'
update-types: ['version-update:semver-major']

- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: github-actions
directory: /
schedule:
interval: "monthly"
interval: 'monthly'
groups:
artifact-actions:
patterns:
- 'actions/*-artifact*' # Upload/Download usually need to be updated together
8 changes: 5 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: npx lerna run test

- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet-version }}

Expand Down Expand Up @@ -93,11 +93,13 @@ jobs:
- name: Codecov
uses: codecov/codecov-action@v3.0.0
uses: codecov/codecov-action@v4.1.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

# By uploading it's shared with the other workflows that are reusing this
- name: Upload Shell Binaries
uses: actions/upload-artifact@v3
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/net6.0-windows/
35 changes: 35 additions & 0 deletions .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: GH Page Deploy

on:
push:
branches:
- main

defaults:
run:
working-directory: ./site

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'npm'
cache-dependency-path: './site/package-lock.json'
- run: npm ci
- run: npm run build
- name: Deploy
uses: crazy-max/ghaction-github-pages@v4
with:
target_branch: gh-pages
build_dir: docs
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25 changes: 25 additions & 0 deletions .github/workflows/pr-build-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: GH Page PR Build

on:
pull_request:
branches:
- main

defaults:
run:
working-directory: ./site

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: './site/package-lock.json'
- run: npm ci
- run: npm run build
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -1386,3 +1386,10 @@ $RECYCLE.BIN/
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

##
## gatsby files
##
.cache/
public
docs/
24 changes: 12 additions & 12 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
Expand All @@ -9,26 +9,26 @@
<PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.0.0-beta.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
<PackageVersion Include="Google.Protobuf" Version="3.23.4" />
<PackageVersion Include="Google.Protobuf" Version="3.24.0" />
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.61.0" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.61.0" />
<PackageVersion Include="Grpc.Core.Testing" Version="2.46.6" />
<PackageVersion Include="Grpc.Net.Client" Version="2.61.0" />
<PackageVersion Include="Grpc.Tools" Version="2.62.0" />
<PackageVersion Include="Grpc" Version="2.46.6" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
<PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
Expand All @@ -41,16 +41,16 @@
<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="6.0.1" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.2" />
<PackageVersion Include="System.IO.Pipelines" Version="6.0.3" />
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
<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.0" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="6.0.0" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="6.2.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="20.0.15" />
<PackageVersion Include="TestableIO.System.IO.Abstractions" Version="20.0.15" />
<PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
Expand Down
28 changes: 14 additions & 14 deletions examples/fdc3-chart-and-grid/js-datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@
"test": "ng test --watch=false"
},
"dependencies": {
"@angular/animations": "17.0.9",
"@angular/cdk": "17.0.5",
"@angular/common": "17.0.9",
"@angular/compiler": "17.0.9",
"@angular/core": "17.0.9",
"@angular/animations": "17.2.3",
"@angular/cdk": "17.2.1",
"@angular/common": "17.2.3",
"@angular/compiler": "17.2.3",
"@angular/core": "17.2.3",
"@angular/flex-layout": "^15.0.0-beta.42",
"@angular/forms": "17.0.9",
"@angular/material": "17.0.5",
"@angular/platform-browser": "17.0.9",
"@angular/platform-browser-dynamic": "17.0.9",
"@angular/router": "17.0.9",
"@angular/forms": "17.2.3",
"@angular/material": "17.2.1",
"@angular/platform-browser": "17.2.3",
"@angular/platform-browser-dynamic": "17.2.3",
"@angular/router": "17.2.3",
"@finos/fdc3": "2.0.3",
"material-icons": "1.13.12",
"rxjs": "7.8.1",
"tslib": "2.6.2",
"zone.js": "0.14.3"
"zone.js": "0.14.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.0.10",
"@angular/cli": "17.0.10",
"@angular/compiler-cli": "17.0.9",
"@angular/compiler-cli": "17.2.3",
"@types/jasmine": "5.1.4",
"jasmine-core": "5.1.1",
"jasmine-core": "5.1.2",
"karma": "6.4.3",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "2.1.0",
"typescript": "5.2.2"
"typescript": "5.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bootstrap": "5.2.3",
"highcharts": "11.3.0",
"jquery": "3.7.1",
"tslib": "2.5.0"
"tslib": "2.6.2"
},
"devDependencies": {
"http-server": "14.1.1",
Expand Down
32 changes: 16 additions & 16 deletions examples/js-chart-and-grid-messagerouter/js-datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@
"test": "ng test --watch=false"
},
"dependencies": {
"@angular/animations": "17.0.9",
"@angular/cdk": "17.0.5",
"@angular/common": "17.0.9",
"@angular/compiler": "17.0.9",
"@angular/core": "17.0.9",
"@angular/animations": "17.2.3",
"@angular/cdk": "17.2.1",
"@angular/common": "17.2.3",
"@angular/compiler": "17.2.3",
"@angular/core": "17.2.3",
"@angular/flex-layout": "^15.0.0-beta.42",
"@angular/forms": "17.0.9",
"@angular/material": "17.0.5",
"@angular/platform-browser": "17.0.9",
"@angular/platform-browser-dynamic": "17.0.9",
"@angular/router": "17.0.9",
"@angular/forms": "17.2.3",
"@angular/material": "17.2.1",
"@angular/platform-browser": "17.2.3",
"@angular/platform-browser-dynamic": "17.2.3",
"@angular/router": "17.2.3",
"material-icons": "1.13.12",
"@morgan-stanley/composeui-messaging-client": "*",
"rxjs": "7.8.1",
"tslib": "2.6.2",
"zone.js": "0.14.3"
"zone.js": "0.14.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.0.10",
"@angular/cli": "17.0.10",
"@angular/compiler-cli": "17.0.9",
"@angular-devkit/build-angular": "17.2.3",
"@angular/cli": "17.2.3",
"@angular/compiler-cli": "17.2.3",
"@types/jasmine": "5.1.4",
"jasmine-core": "5.1.1",
"jasmine-core": "5.1.2",
"karma": "6.4.3",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "2.1.0",
"typescript": "5.2.2"
"typescript": "5.3.3"
}
}
Loading

0 comments on commit fcfeb25

Please sign in to comment.