Merge 'ThreeMammals:develop' into 'develop' #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* tests passing on debian 10 * how to generate test cert * updated build image to include git * updated build image to include openssh-client
* updated report generator * report working
* Add StyleCop.Analyzers package
* Fix SA0001: XML comment analysis is disabled due to project configuration
* Fix SA1609: Property documentation should have value
* Fix CS1591: Missing XML comment for publicly visible type or member {xyz}
* Fix SA1101: Prefix local calls with this
* Fix SA1413: The last statement in a multi-line C# initializer or list is missing a trailing comma.
* Fix SA1135: A using directive is not qualified.
* Fix compiler errors
* Fix SA1651: Do not use placeholder elements
* Fix compiling error
* Fix SA1113: Comma should be on the same line as previous parameter
* Fix SA1116: The parameters should begin on the line after the declaration, whenever the parameter span across multiple lines
* Fix SA1137: Elements should have the same indentation
* Fix SA1200: Using directive should appear within a namespace declaration
* Fix SA1316: Tuple element names should use correct casing
* Fix SA1503: Braces should not be omitted
* Fix SA1505: An opening brace should not be followed by a blank line
* Fix SA1507: Code should not contain multiple blank lines in a row
* Fix SA1508: A closing brace should not be preceded by a blank line
* Fix SA1512, SA1515
* Fix SA1513: Closing brace should be followed by blank line
* Fix SA1400: Element 'OpenTracingTracer' should declare an access modifier
* Fix SA1515: Single-line comment should be preceded by blank line
* Fix SA1518: File is required to end with a single newline character
* Add StyleCop
* Fix SA1633: A C# code file is missing a standard file header.
* Disable SA1602: An item within a C# enumeration is missing an Xml documentation header.
* Fix SA1600: Elements should be documented
* Fix SA1604: Element documentation should have summary
* Fix SA1618: The documentation for type parameter 'T' is missing
* Fix SA1629: Documentation text should end with a period.
* Fix SA1649: File name should match first type name
* Fix SA1600: Elements should be documented
* Upgrade K8s sample to ASP.NET 7.
Rename project to Ocelot.Samples.OcelotKube.DownstreamService
* Upgrade K8s sample to ASP.NET 7.
Rename project to Ocelot.Samples.OcelotKube.ApiGateway
* Fix CS0169: The field 'xxx' is never used
* Fix CS0219: The variable 'baseUrl' is assigned but its value is never used
* Fix CS0414: The field 'xxx' is assigned but its value is never used
* Fix CS1570: XML comment has badly formed XML
* Fix CS0649: Field 'xxx' is never assigned to, and will always have its default value null
* Fix CS0618: 'member' is obsolete: 'text'
* Fix NU1504: Duplicate 'PackageReference' items found: Microsoft.Data.SQLite 7.0.4, Microsoft.Data.SQLite 7.0.5
* Upgrade sample to ASP.NET 7
* Fix NU5048: The 'PackageIconUrl'/'iconUrl' element is deprecated.
Consider using the 'PackageIcon'/'icon' element instead.
Learn more at https://aka.ms/deprecateIconUrl
* Rewrite a RequestDelegate object definition
* Fix CS0618: 'member' is obsolete: 'text'
* Fix CA1816: Change Dispose() to call GC.SuppressFinalize(object).
This will prevent derived types that introduce a finalizer from needing to re-implement 'IDisposable' to call it.
* Fix CA1822: Member 'GivenThereIsAConfiguration' does not access instance data and can be marked as static
* Fix CA1837: Use 'Environment.ProcessId' instead of 'Process.GetCurrentProcess().Id'
* Fix CA2211: Non-constant fields should not be visible.
Convert to property.
* Fix IDE0060: Remove unused parameter 'path' if it is not part of a shipped public API
* Fix CA1816: Change ConsulWebSocketTests.Dispose() to call GC.SuppressFinalize(object).
* Fix IDE1006: Naming rule violation: These words must begin with upper case characters
* Fix IDE1006: Naming rule violation: These words must begin with upper case characters: AcceptanceTests\WebSocketTests
* Fix last issues
* Upgrade basic sample to ASP.NET 7
Co-authored-by: Justin Middler <[email protected]>
|
Alternatively, |
|
Thanks for merging! But why did you use Merge Commit option? I've asked to use Rebase button option (see the warning sentence). Was it in gray state? What will we do with this diff? It contains 7 redundant commits! I have a plan, but do you have an intention to fix your develop branch? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Let's update your repo with latest top-commits from head repository.
That will allow to perform rebase-operation for feature branches without merge-commits.
Use fast-forwarding aka Rebase and merge option to merge please! 👇