Skip to content

Commit

Permalink
Merge branch 'java' into experimental-java
Browse files Browse the repository at this point in the history
  • Loading branch information
markwallace-microsoft authored Oct 23, 2023
2 parents 82aeeab + 18ffc4b commit 8ddb22a
Show file tree
Hide file tree
Showing 1,536 changed files with 169,099 additions and 96,268 deletions.
13 changes: 6 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
dotnet_style_readonly_field = true:suggestion
dotnet_style_readonly_field = true:warning
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
Expand All @@ -96,10 +96,6 @@ dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_code_quality_unused_parameters = all:suggestion

[*.cs]

# TODO: enable this but stop "dotnet format" from applying incorrect fixes and introducing a lot of unwanted changes.
dotnet_analyzer_diagnostic.severity = none

# Note: these settings cause "dotnet format" to fix the code. You should review each change if you uses "dotnet format".
dotnet_diagnostic.RCS1036.severity = warning # Remove unnecessary blank line.
dotnet_diagnostic.RCS1037.severity = warning # Remove trailing white-space.
Expand Down Expand Up @@ -163,7 +159,7 @@ dotnet_diagnostic.CA1032.severity = none # We're using RCS1194 which seems to co
dotnet_diagnostic.CA1034.severity = none # Do not nest type. Alternatively, change its accessibility so that it is not externally visible
dotnet_diagnostic.CA1062.severity = none # Disable null check, C# already does it for us
dotnet_diagnostic.CA1303.severity = none # Do not pass literals as localized parameters
dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
dotnet_diagnostic.CA1510.severity = none
dotnet_diagnostic.CA1805.severity = none # Member is explicitly initialized to its default value
dotnet_diagnostic.CA1822.severity = none # Member does not access instance data and can be marked as static
dotnet_diagnostic.CA1848.severity = none # For improved performance, use the LoggerMessage delegates
Expand All @@ -173,6 +169,7 @@ dotnet_diagnostic.CA2227.severity = none # Change to be read-only by removing th
dotnet_diagnostic.CA2253.severity = none # Named placeholders in the logging message template should not be comprised of only numeric characters

dotnet_diagnostic.VSTHRD111.severity = none # Use .ConfigureAwait(bool) is hidden by default, set to none to prevent IDE from changing on autosave
dotnet_diagnostic.VSTHRD200.severity = none # Use Async suffix for async methods
dotnet_diagnostic.xUnit1004.severity = none # Test methods should not be skipped. Remove the Skip property to start running the test again.

dotnet_diagnostic.RCS1021.severity = none # Use expression-bodied lambda.
Expand Down Expand Up @@ -219,11 +216,13 @@ dotnet_diagnostic.IDE0052.severity = none # Remove unread private member
dotnet_diagnostic.IDE0058.severity = none # Remove unused expression value
dotnet_diagnostic.IDE0059.severity = none # Unnecessary assignment of a value
dotnet_diagnostic.IDE0060.severity = none # Remove unused parameter
dotnet_diagnostic.IDE0080.severity = none # Remove unnecessary suppression operator
dotnet_diagnostic.IDE0079.severity = none # Remove unnecessary suppression.
dotnet_diagnostic.IDE0080.severity = none # Remove unnecessary suppression operator.
dotnet_diagnostic.IDE0100.severity = none # Remove unnecessary equality operator
dotnet_diagnostic.IDE0110.severity = none # Remove unnecessary discards
dotnet_diagnostic.IDE0032.severity = none # Use auto property
dotnet_diagnostic.IDE0160.severity = none # Use block-scoped namespace
dotnet_diagnostic.IDE1006.severity = warning # Naming rule violations

###############################
# Naming Conventions #
Expand Down
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
* text=auto eol=lf working-tree-encoding=UTF-8

# Bash scripts
*.sh text eol=lf
*.sh text eol=lf
*.cmd text eol=crlf
5 changes: 0 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,3 @@
# directory at the root of the repository and any of its
# subdirectories.
/java/ @microsoft/octo-semantickernel-pr-java

# @microsoft/octo-semantickernel-pr-apps owns any files in the samples
# directory at the root of the repository and any of its
# subdirectories.
/samples/ @microsoft/octo-semantickernel-pr-apps
1 change: 0 additions & 1 deletion .github/_typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extend-exclude = [
"*.bicep",
"encoder.json",
"vocab.bpe",
"GPT3TokenizerTests.cs",
"CodeTokenizerTests.cs",
"test_code_tokenizer.py",
]
Expand Down
19 changes: 5 additions & 14 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@

version: 2
updates:
# Maintain dependencies for nuget
- package-ecosystem: "nuget"
directory: "samples/apps/copilot-chat-app/webapi"
schedule:
interval: "weekly"
day: "monday"
labels:
- "copilot chat"
- "dependencies"

# Maintain dependencies for nuget
- package-ecosystem: "nuget"
directory: "dotnet/"
Expand All @@ -28,11 +18,12 @@ updates:
- dependency-name: "Microsoft.Extensions.*"
update-types: ["version-update:semver-major"]
- dependency-name: "Microsoft.Bcl.*"
update-types: ["version-update:semver-major"]
update-types: ["version-update:semver-major"]
- dependency-name: "Moq"
labels:
- ".NET"
- "dependencies"

# Maintain dependencies for nuget
- package-ecosystem: "nuget"
directory: "samples/dotnet"
Expand All @@ -46,7 +37,7 @@ updates:
schedule:
interval: "weekly"
day: "monday"

# Maintain dependencies for pip
- package-ecosystem: "pip"
directory: "python/"
Expand All @@ -56,7 +47,7 @@ updates:
labels:
- "python"
- "dependencies"

# Maintain dependencies for github-actions
- package-ecosystem: "github-actions"
# Workflow files stored in the
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
59 changes: 0 additions & 59 deletions .github/workflows/copilot-chat-package.yml

This file was deleted.

97 changes: 0 additions & 97 deletions .github/workflows/copilot-chat-tests.yml

This file was deleted.

Loading

0 comments on commit 8ddb22a

Please sign in to comment.