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] Remove merging primitive from .editorconfig and gitignore #3676

Merged
merged 6 commits into from
Oct 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02da7dc
remove merging primitive from .editorconfig and gitignore
LittleLittleCloud Oct 7, 2024
ed9b1b9
use file scope namespace
LittleLittleCloud Oct 7, 2024
4d9e9a5
remove file-scope name
LittleLittleCloud Oct 7, 2024
dd0fa09
Merge branch 'staging' into u/update
LittleLittleCloud Oct 7, 2024
0bc6a75
fix format
LittleLittleCloud Oct 7, 2024
5442cfe
Merge branch 'u/update' of https://github.com/microsoft/autogen into …
LittleLittleCloud Oct 7, 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
8 changes: 1 addition & 7 deletions dotnet/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<<<<<<< HEAD
# EditorConfig is awesome:http://EditorConfig.org
# EditorConfig is awesome:http://EditorConfig.org

# top-most EditorConfig file
root = true
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -708,4 +703,3 @@ generated_code = true

# IDE1591 Missing XML comment for publicly visible type or member
dotnet_diagnostic.CS1591.severity = none
>>>>>>> agnext_main
6 changes: 0 additions & 6 deletions dotnet/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
##
Expand All @@ -20,7 +18,6 @@
mono_crash.*

output
>>>>>>> agnext_main

# Build results
[Dd]ebug/
Expand All @@ -29,7 +26,6 @@ output
[Rr]eleases/
x64/
x86/
<<<<<<< HEAD
build/
bld/
[Bb]in/
Expand All @@ -51,7 +47,6 @@ output/

# JetBrains Rider
.idea/
=======
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
Expand Down Expand Up @@ -525,4 +520,3 @@ sk-azfunc-server/local.settings.json
temp
.mono/**
**/values.xml
>>>>>>> agnext_main
Loading