diff --git a/.github/workflows/branch.dotnet.AgentFrameworkSampler.yml b/.github/workflows/branch.dotnet.AgentFrameworkSampler.yml index 16f5d3e..5c07f0c 100644 --- a/.github/workflows/branch.dotnet.AgentFrameworkSampler.yml +++ b/.github/workflows/branch.dotnet.AgentFrameworkSampler.yml @@ -1,6 +1,4 @@ name: AgentFrameworkSampler.DotNet -permissions: - contents: read on: workflow_dispatch: # Allows you to run this workflow manually from the Actions tab @@ -14,8 +12,12 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }} cancel-in-progress: true +permissions: + contents: read + jobs: - uv_ci: + dotnet_ci: + name: dotnet build uses: ./.github/workflows/dotnet_ci.yml with: dotnet-project-name: AgentFrameworkSampler.DotNet diff --git a/.github/workflows/branch.dotnet.SemanticKernelSampler.yml b/.github/workflows/branch.dotnet.SemanticKernelSampler.yml index a94a63a..730b530 100644 --- a/.github/workflows/branch.dotnet.SemanticKernelSampler.yml +++ b/.github/workflows/branch.dotnet.SemanticKernelSampler.yml @@ -1,6 +1,4 @@ name: SemanticKernelSampler.DotNet -permissions: - contents: read on: workflow_dispatch: # Allows you to run this workflow manually from the Actions tab @@ -14,8 +12,12 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }} cancel-in-progress: true +permissions: + contents: read + jobs: - uv_ci: + dotnet_ci: + name: dotnet build uses: ./.github/workflows/dotnet_ci.yml with: dotnet-project-name: SemanticKernelSampler.DotNet diff --git a/.github/workflows/dotnet_ci.yml b/.github/workflows/dotnet_ci.yml index d257951..4a937f8 100644 --- a/.github/workflows/dotnet_ci.yml +++ b/.github/workflows/dotnet_ci.yml @@ -44,26 +44,20 @@ jobs: steps: - uses: percebus/github-actions-common/.github/actions/checkout@main - - name: .NET @ ${{ inputs.dotnet-version }} - uses: actions/setup-dotnet@v3 + - uses: percebus/github-actions-dotnet/.github/actions/setup@main with: dotnet-version: ${{ inputs.dotnet-version }} - - name: ls - run: ls -la - working-directory: ${{ env.WORKSPACE }} - - - name: dotnet restore - run: dotnet restore ${{ inputs.dotnet-project }} - working-directory: ${{ env.WORKSPACE }} + - uses: percebus/github-actions-dotnet/.github/actions/restore@main + with: + working-directory: ${{ env.WORKSPACE }} + dotnet_project: ${{ inputs.dotnet-project }} - - name: dotnet build - run: | - dotnet build ${{ inputs.dotnet-project }} \ - --no-restore \ - --configuration ${{ inputs.dotnet-configuration }} \ - /p:TreatWarningsAsErrors=true - working-directory: ${{ env.WORKSPACE }} + - uses: percebus/github-actions-dotnet/.github/actions/build@main + with: + working-directory: ${{ env.WORKSPACE }} + dotnet_project: ${{ inputs.dotnet-project }} + dotnet_configuration: ${{ inputs.dotnet-configuration }} - name: bin.zip uses: actions/upload-artifact@v4 diff --git a/dotnet/AgentFrameworkSampler.DotNet/Shared/Shared.csproj b/dotnet/AgentFrameworkSampler.DotNet/Shared/Shared.csproj index 13c0742..bb9835e 100644 --- a/dotnet/AgentFrameworkSampler.DotNet/Shared/Shared.csproj +++ b/dotnet/AgentFrameworkSampler.DotNet/Shared/Shared.csproj @@ -4,8 +4,10 @@ net9.0 enable enable - JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName) - JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_")) + JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName) + JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_")) True @@ -22,13 +24,23 @@ - - - + + + all - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/dotnet/AgentFrameworkSampler.DotNet/WebApp/WebApp.csproj b/dotnet/AgentFrameworkSampler.DotNet/WebApp/WebApp.csproj index 1e68e07..6556bed 100644 --- a/dotnet/AgentFrameworkSampler.DotNet/WebApp/WebApp.csproj +++ b/dotnet/AgentFrameworkSampler.DotNet/WebApp/WebApp.csproj @@ -4,8 +4,10 @@ net9.0 enable enable - JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_")) - JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName) + JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_")) + JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName) True @@ -29,7 +31,10 @@ - + @@ -39,7 +44,8 @@ all - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/dotnet/SemanticKernelSampler.DotNet/WebApp/SemanticKernelSampler.Dotnet.WebApp.csproj b/dotnet/SemanticKernelSampler.DotNet/WebApp/SemanticKernelSampler.Dotnet.WebApp.csproj index 4fba3f5..9928565 100644 --- a/dotnet/SemanticKernelSampler.DotNet/WebApp/SemanticKernelSampler.Dotnet.WebApp.csproj +++ b/dotnet/SemanticKernelSampler.DotNet/WebApp/SemanticKernelSampler.Dotnet.WebApp.csproj @@ -5,7 +5,8 @@ enable enable JCystems.$(MSBuildProjectName) - JCystems.$(MSBuildProjectName.Replace(" ", "_")) + JCystems.$(MSBuildProjectName.Replace(" ", "_")) True @@ -23,25 +24,47 @@ - - + + - - - - + + + + - + all - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/java/pom.xml b/java/pom.xml index e511b29..d39e748 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,6 +1,9 @@ - - + + 4.0.0 groupId artifactid diff --git a/package-lock.json b/package-lock.json index 61ed27b..d95994b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ ], "devDependencies": { "@modelcontextprotocol/inspector": "^0.16.5", + "@prettier/plugin-xml": "^3.4.2", "dockerlint": "^0.3.9", "frisby": "^2.1.3", "jest": "^29.7.0", @@ -1585,6 +1586,19 @@ "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==", "license": "MIT" }, + "node_modules/@prettier/plugin-xml": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.4.2.tgz", + "integrity": "sha512-/UyNlHfkuLXG6Ed85KB0WBF283xn2yavR+UtRibBRUcvEJId2DSLdGXwJ/cDa1X++SWDPzq3+GSFniHjkNy7yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@xml-tools/parser": "^1.0.11" + }, + "peerDependencies": { + "prettier": "^3.0.0" + } + }, "node_modules/@radix-ui/number": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz", @@ -2996,6 +3010,16 @@ "license": "ISC", "peer": true }, + "node_modules/@xml-tools/parser": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz", + "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "chevrotain": "7.1.1" + } + }, "node_modules/accepts": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", @@ -3561,6 +3585,16 @@ "node": ">=10" } }, + "node_modules/chevrotain": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz", + "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "regexp-to-ast": "0.5.0" + } + }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -7953,6 +7987,13 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/regexp-to-ast": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz", + "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==", + "dev": true, + "license": "MIT" + }, "node_modules/regexparam": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/regexparam/-/regexparam-2.0.2.tgz", diff --git a/package.json b/package.json index 31a2f4c..a90eac5 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,13 @@ "bower:install": "npm run _bower -- install", "bower:install:production": "npm run bower:install -- --production", "_prettier": "prettier .", - "prettier:write": "npm run _prettier -- --write", + "_prettier:xml": "prettier . --plugin=@prettier/plugin-xml", + "prettier:check:xml": "npm run _prettier:xml -- --check", + "prettier:write:xml": "npm run _prettier:xml -- --write", "prettier:check": "npm run _prettier -- --check", + "postprettier:check": "npm run prettier:check:xml", + "prettier:write": "npm run _prettier -- --write", + "postprettier:write": "npm run prettier:write:xml", "dockerlint": "dockerlint Dockerfile", "lint": "npm run prettier:check", "format": "npm run prettier:write", @@ -39,6 +44,7 @@ "license": "SEE LICENSE IN LICENSE.md", "devDependencies": { "@modelcontextprotocol/inspector": "^0.16.5", + "@prettier/plugin-xml": "^3.4.2", "dockerlint": "^0.3.9", "frisby": "^2.1.3", "jest": "^29.7.0",