[.Net] fix code ql for dotnet build && update trigger for dotnet work…

…flow (microsoft#2529) * fix formatting * update dotnet build pipieline
jayralencar · Apr 29, 2024 · 1207c49 · 1207c49
1 parent 331a867
commit 1207c49
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 22 deletions.
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -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 }}

diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - dotnet/release/**
-      - dotnet/release
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
@@ -18,6 +18,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <RepoRoot>$(MSBuildThisFileDirectory)../</RepoRoot>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/global.json b/dotnet/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.101",
+    "version": "8.0.104",
     "rollForward": "latestMinor"
   }
 }
diff --git a/dotnet/nuget/nuget-package.props b/dotnet/nuget/nuget-package.props
@@ -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' ">

diff --git a/dotnet/sample/AutoGen.BasicSamples/Example12_TwoAgent_Fill_Application.cs b/dotnet/sample/AutoGen.BasicSamples/Example12_TwoAgent_Fill_Application.cs
@@ -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;
 

diff --git a/dotnet/src/AutoGen.Core/AutoGen.Core.csproj b/dotnet/src/AutoGen.Core/AutoGen.Core.csproj
@@ -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 -->

diff --git a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs b/dotnet/src/AutoGen.Core/GroupChat/Graph.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Workflow.cs
+// Graph.cs
 
 using System;
 using System.Collections.Generic;

diff --git a/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj b/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj
@@ -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 -->

diff --git a/dotnet/src/AutoGen.LMStudio/AutoGen.LMStudio.csproj b/dotnet/src/AutoGen.LMStudio/AutoGen.LMStudio.csproj
@@ -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 -->

diff --git a/dotnet/src/AutoGen.Mistral/AutoGen.Mistral.csproj b/dotnet/src/AutoGen.Mistral/AutoGen.Mistral.csproj
@@ -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 -->

diff --git a/dotnet/src/AutoGen.Mistral/DTOs/ChatCompletionResponse.cs b/dotnet/src/AutoGen.Mistral/DTOs/ChatCompletionResponse.cs
@@ -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;

diff --git a/dotnet/src/AutoGen.Mistral/DTOs/Error.cs b/dotnet/src/AutoGen.Mistral/DTOs/Error.cs
@@ -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
 {

diff --git a/dotnet/src/AutoGen.Mistral/DTOs/Model.cs b/dotnet/src/AutoGen.Mistral/DTOs/Model.cs
@@ -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;

diff --git a/dotnet/src/AutoGen.OpenAI/AutoGen.OpenAI.csproj b/dotnet/src/AutoGen.OpenAI/AutoGen.OpenAI.csproj
@@ -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 -->

diff --git a/dotnet/src/AutoGen.SemanticKernel/AutoGen.SemanticKernel.csproj b/dotnet/src/AutoGen.SemanticKernel/AutoGen.SemanticKernel.csproj
@@ -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 -->

diff --git a/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj b/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj
@@ -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>

diff --git a/dotnet/src/AutoGen/AutoGen.csproj b/dotnet/src/AutoGen/AutoGen.csproj
@@ -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 -->