Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/branch.dotnet.AgentFrameworkSampler.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
name: AgentFrameworkSampler.DotNet
permissions:
contents: read

on:
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
Expand All @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/branch.dotnet.SemanticKernelSampler.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
name: SemanticKernelSampler.DotNet
permissions:
contents: read

on:
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
Expand All @@ -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
Expand Down
26 changes: 10 additions & 16 deletions .github/workflows/dotnet_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 18 additions & 6 deletions dotnet/AgentFrameworkSampler.DotNet/Shared/Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_"))</RootNamespace>
<AssemblyName
>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName)</AssemblyName>
<RootNamespace
>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_"))</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

Expand All @@ -22,13 +24,23 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Agents.AI" Version="1.0.0-preview.251028.1" />
<PackageReference Include="Microsoft.Agents.AI.A2A" Version="1.0.0-preview.251028.1" />
<PackageReference Include="Microsoft.Agents.AI.Workflows" Version="1.0.0-preview.251028.1" />
<PackageReference
Include="Microsoft.Agents.AI"
Version="1.0.0-preview.251028.1"
/>
<PackageReference
Include="Microsoft.Agents.AI.A2A"
Version="1.0.0-preview.251028.1"
/>
<PackageReference
Include="Microsoft.Agents.AI.Workflows"
Version="1.0.0-preview.251028.1"
/>
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.10" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets
>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ClientModel" Version="1.7.0" />
</ItemGroup>
Expand Down
14 changes: 10 additions & 4 deletions dotnet/AgentFrameworkSampler.DotNet/WebApp/WebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_"))</RootNamespace>
<AssemblyName>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName)</AssemblyName>
<RootNamespace
>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName.Replace(" ", "_").Replace("-", "_"))</RootNamespace>
<AssemblyName
>JCystems.AgentFrameworkSampler.DotNet.$(MSBuildProjectName)</AssemblyName>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

Expand All @@ -29,7 +31,10 @@
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.17.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.0-preview.1.25513.3" />
<PackageReference
Include="Microsoft.Extensions.AI.OpenAI"
Version="9.10.0-preview.1.25513.3"
/>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
<PackageReference Include="NSwag.AspNetCore" Version="14.6.1" />
<PackageReference Include="Scrutor" Version="6.1.0" />
Expand All @@ -39,7 +44,8 @@
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets
>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>JCystems.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>JCystems.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<RootNamespace
>JCystems.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

Expand All @@ -23,25 +24,47 @@

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.16.0" />
<PackageReference Include="Azure.ResourceManager.ApiCenter" Version="1.0.0" />
<PackageReference Include="Azure.ResourceManager.ApiManagement" Version="1.3.0" />
<PackageReference
Include="Azure.ResourceManager.ApiCenter"
Version="1.0.0"
/>
<PackageReference
Include="Azure.ResourceManager.ApiManagement"
Version="1.3.0"
/>
<PackageReference Include="Microsoft.SemanticKernel" Version="1.64.0" />
<PackageReference Include="Microsoft.SemanticKernel.Agents.A2A" Version="1.65.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Agents.CopilotStudio" Version="1.64.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Agents.Core" Version="1.64.0" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.64.0" />
<PackageReference
Include="Microsoft.SemanticKernel.Agents.A2A"
Version="1.65.0-alpha"
/>
<PackageReference
Include="Microsoft.SemanticKernel.Agents.CopilotStudio"
Version="1.64.0-alpha"
/>
<PackageReference
Include="Microsoft.SemanticKernel.Agents.Core"
Version="1.64.0"
/>
<PackageReference
Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI"
Version="1.64.0"
/>
<PackageReference Include="OpenTelemetry" Version="1.12.0" />
<PackageReference Include="Scrutor" Version="6.1.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageReference
Include="Serilog.Settings.Configuration"
Version="9.0.0"
/>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets
>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="Validation" Version="2.6.68" />
Expand Down
9 changes: 6 additions & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8" ?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactid</artifactId>
Expand Down
41 changes: 41 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading