Skip to content

Commit b3064e9

Browse files
committed
Resolve conflicts in Designer.cs, Modify Typo
Also Add header to the file
1 parent cd4cc99 commit b3064e9

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Rules/Strings.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Rules/Strings.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,10 @@
658658
<value>Use ShouldProcess For State Changing Functions</value>
659659
</data>
660660
<data name="UseShouldProcessForStateChangingFunctionsDescrption" xml:space="preserve">
661-
<value>Functions that have verbs like New, Start, Stop, Set, Reset that change systme state should support 'ShouldProcess'</value>
661+
<value>Functions that have verbs like New, Start, Stop, Set, Reset that change system state should support 'ShouldProcess'.</value>
662662
</data>
663663
<data name="UseShouldProcessForStateChangingFunctionsError" xml:space="preserve">
664-
<value>Function ’{0}’ has verb that could change system state. Therefore, the function has to support 'ShouldProcess'</value>
664+
<value>Function ’{0}’ has verb that could change system state. Therefore, the function has to support 'ShouldProcess'.</value>
665665
</data>
666666
<data name="UseShouldProcessForStateChangingFunctionsName" xml:space="preserve">
667667
<value>UseShouldProcessForStateChangingFunctions</value>

Rules/UseShouldProcessForStateChangingFunctions.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
using System;
1+
//
2+
// Copyright (c) Microsoft Corporation.
3+
//
4+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
7+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
8+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
9+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
10+
// THE SOFTWARE.
11+
//
12+
13+
using System;
214
using System.Collections.Generic;
315
using System.Linq;
416
using System.Management.Automation;

0 commit comments

Comments
 (0)