[.Net] Remove merging primitive from .editorconfig and gitignore (#3676)

* remove merging primitive from .editorconfig and gitignore

* use file scope namespace

* remove file-scope name

* fix format

dotnet/.editorconfig

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
+# EditorConfig is awesome:http://EditorConfig.org
-# EditorConfig is awesome:http://EditorConfig.org
 
 # top-most EditorConfig file
 root = true
@@ -93,7 +92,6 @@ csharp_style_inlined_variable_declaration = true:error
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
 csharp_style_deconstructed_variable_declaration = true:suggestion
-=======
 ; EditorConfig to support per-solution formatting.
 ; Use the EditorConfig VS add-in to make this work.
 ; http://editorconfig.org/
@@ -137,7 +135,6 @@ csharp_style_var_elsewhere = true:suggestion
 
 # Disallow throw expressions.
 csharp_style_throw_expression = false:suggestion
->>>>>>> agnext_main
 
 # Newline settings
 csharp_new_line_before_open_brace = all
@@ -146,7 +143,6 @@ csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
-<<<<<<< HEAD
 csharp_new_line_between_query_expression_clauses = true
 
 # Identation options
@@ -236,7 +232,6 @@ dotnet_diagnostic.CA2016.severity = suggestion
 # disable check for generated code
 [*.generated.cs]
 generated_code = true
-=======
 
 # Namespace settings
 csharp_style_namespace_declarations = file_scoped:silent
@@ -708,4 +703,3 @@ generated_code = true
 
 # IDE1591 Missing XML comment for publicly visible type or member
 dotnet_diagnostic.CS1591.severity = none
->>>>>>> agnext_main

dotnet/.gitignore

@@ -1,6 +1,4 @@
-<<<<<<< HEAD
 # gitignore file for C#/VS
-=======
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -20,7 +18,6 @@
 mono_crash.*
 
 output
->>>>>>> agnext_main
 
 # Build results
 [Dd]ebug/
@@ -29,7 +26,6 @@ output
 [Rr]eleases/
 x64/
 x86/
-<<<<<<< HEAD
 build/
 bld/
 [Bb]in/
@@ -51,7 +47,6 @@ output/
 
 # JetBrains Rider
 .idea/
-=======
 [Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
@@ -525,4 +520,3 @@ sk-azfunc-server/local.settings.json
 temp
 .mono/**
 **/values.xml
->>>>>>> agnext_main

dotnet/src/AutoGen.Mistral/DTOs/Error.cs

@@ -3,8 +3,8 @@
 
 using System.Text.Json.Serialization;
 
-namespace AutoGen.Mistral
+namespace AutoGen.Mistral;
-{
+
 public class Error
 {
     public Error(string type, string message, string? param = default(string), string? code = default(string))
@@ -36,4 +36,3 @@ namespace AutoGen.Mistral
     [JsonPropertyName("code")]
     public string? Code { get; set; }
 }
-}

dotnet/src/AutoGen.SourceGenerator/DocumentCommentExtension.cs

@@ -10,8 +10,8 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 // copyright: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DocumentationCommentExtensions.cs#L17
-namespace AutoGen.SourceGenerator
+namespace AutoGen.SourceGenerator;
-{
+
 internal static class DocumentCommentExtension
 {
     public static bool IsMissingOrDefault(this SyntaxToken token)
@@ -292,4 +292,3 @@ namespace AutoGen.SourceGenerator
         return trivia;
     }
 }
-}

dotnet/src/AutoGen.SourceGenerator/FunctionCallGenerator.cs

@@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
 using Newtonsoft.Json;
 
-namespace AutoGen.SourceGenerator
+namespace AutoGen.SourceGenerator;
-{
+
 [Generator]
 public partial class FunctionCallGenerator : IIncrementalGenerator
 {
@@ -244,4 +244,3 @@ namespace AutoGen.SourceGenerator
         };
     }
 }
-}

dotnet/src/AutoGen.SourceGenerator/SourceGeneratorFunctionContract.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SourceGeneratorFunctionContract.cs
 
-namespace AutoGen.SourceGenerator
+namespace AutoGen.SourceGenerator;
-{
+
 internal class SourceGeneratorFunctionContract
 {
     public string? Namespace { get; set; }
@@ -37,4 +37,3 @@ namespace AutoGen.SourceGenerator
     public string? DefaultValue { get; set; }
 
 }
-}