Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[.Net] fix code ql for dotnet build && update trigger for dotnet workflow #2529

Merged
merged 3 commits into from
Apr 29, 2024
Merged

[.Net] fix code ql for dotnet build && update trigger for dotnet workflow #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f100462
fix formatting
LittleLittleCloud Apr 26, 2024
3237834
update dotnet build pipieline
LittleLittleCloud Apr 26, 2024
9cb0ab1
Merge branch 'main' into u/xiaoyun/fixCodeQL
LittleLittleCloud Apr 29, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ name: dotnet-ci
on:
workflow_dispatch:
pull_request:
branches: [ "dotnet" ]
branches: [ "main" ]
paths:
- 'dotnet/**'
push:
branches: [ "dotnet" ]
branches: [ "main" ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/dotnet-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
push:
branches:
- dotnet/release/**
- dotnet/release

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
</PropertyGroup>

<PropertyGroup>
<RepoRoot>$(MSBuildThisFileDirectory)../</RepoRoot>
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion dotnet/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.101",
"version": "8.0.104",
"rollForward": "latestMinor"
}
}
4 changes: 2 additions & 2 deletions dotnet/nuget/nuget-package.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

<ItemGroup>
<!-- Include icon.png and NUGET.md in the project. -->
<None Include="$(RepoRoot)/dotnet/nuget/icon.png" Link="icon.png" Pack="true" PackagePath="." />
<None Include="$(RepoRoot)/dotnet/nuget/NUGET.md" Link="NUGET.md" Pack="true" PackagePath="." />
<None Include="$(RepoRoot)/nuget/icon.png" Link="icon.png" Pack="true" PackagePath="." />
<None Include="$(RepoRoot)/nuget/NUGET.md" Link="NUGET.md" Pack="true" PackagePath="." />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
6 changes: 3 additions & 3 deletions dotnet/sample/AutoGen.BasicSamples/Example12_TwoAgent_Fill_Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Example11_TwoAgent_Fill_Application.cs
// Example12_TwoAgent_Fill_Application.cs

using System.Text;
using AutoGen.OpenAI;
using AutoGen.Core;
using Azure.AI.OpenAI;
using AutoGen.OpenAI;
using AutoGen.OpenAI.Extension;
using Azure.AI.OpenAI;

namespace AutoGen.BasicSample;

Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.Core/AutoGen.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>AutoGen.Core</RootNamespace>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.Core/GroupChat/Graph.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Workflow.cs
// Graph.cs

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.LMStudio/AutoGen.LMStudio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>AutoGen.LMStudio</RootNamespace>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.Mistral/AutoGen.Mistral.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>AutoGen.Mistral</RootNamespace>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
5 changes: 4 additions & 1 deletion dotnet/src/AutoGen.Mistral/DTOs/ChatCompletionResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System.Collections.Generic;
// Copyright (c) Microsoft Corporation. All rights reserved.
// ChatCompletionResponse.cs

using System.Collections.Generic;
using System.Text.Json.Serialization;

namespace AutoGen.Mistral;
Expand Down
5 changes: 4 additions & 1 deletion dotnet/src/AutoGen.Mistral/DTOs/Error.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System.Text.Json.Serialization;
// Copyright (c) Microsoft Corporation. All rights reserved.
// Error.cs

using System.Text.Json.Serialization;

namespace AutoGen.Mistral
{
Expand Down
5 changes: 4 additions & 1 deletion dotnet/src/AutoGen.Mistral/DTOs/Model.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
// Copyright (c) Microsoft Corporation. All rights reserved.
// Model.cs

using System;
using System.Text.Json.Serialization;

namespace AutoGen.Mistral;
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.OpenAI/AutoGen.OpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>AutoGen.OpenAI</RootNamespace>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.SemanticKernel/AutoGen.SemanticKernel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>AutoGen.SemanticKernel</RootNamespace>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<DefineConstants Condition="'$(LaunchDebugger)' == 'true'">$(DefineConstants);LAUNCH_DEBUGGER</DefineConstants>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />


<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/AutoGen/AutoGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>AutoGen</RootNamespace>
</PropertyGroup>

<Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
<Import Project="$(RepoRoot)/nuget/nuget-package.props" />

<PropertyGroup>
<!-- NuGet Package Settings -->
Expand Down
Loading