Skip to content

Commit 36f3272

Browse files
IVNSTNIVNSTN
committed
Add workspace settings, fix file formatting
1 parent dc23d97 commit 36f3272

4 files changed

Lines changed: 144 additions & 16 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
outputs:
2323
next-version: ${{ steps.next-ver.outputs.VERSION }}
24-
24+
2525
steps:
2626
- uses: actions/checkout@v4
2727

@@ -31,14 +31,14 @@ jobs:
3131
VERSION=$(date +%Y.%-m.${{ github.run_number }})
3232
echo Next version: $VERSION
3333
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
34-
34+
3535
build:
3636
name: Build and test
3737
needs: semver
3838
runs-on: ${{ matrix.os }}
3939
outputs:
4040
build-result: ${{ steps.bundle-status.outputs.BUNDLE_STATUS }}
41-
41+
4242
defaults:
4343
run:
4444
shell: bash
@@ -78,7 +78,7 @@ jobs:
7878
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json', '**/*.csproj', 'Directory.Build.props') }} # Unique key for the cache
7979
restore-keys: |
8080
${{ runner.os }}-nuget-
81-
81+
8282
- name: Install coverlet
8383
run: |
8484
dotnet add package coverlet.msbuild --version 6.0.4 &&
@@ -152,14 +152,14 @@ jobs:
152152
with:
153153
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net8.0
154154
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net8.0
155-
155+
156156
- name: Test
157157
if: ${{ !matrix.coverage }}
158158
run: >
159159
dotnet test --no-build --verbosity normal
160160
-p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
161161
--configuration ${{ matrix.configuration }}
162-
--logger "trx;LogFileName=${{ github.workspace }}/TestResults/test-results.trx"
162+
--logger "trx;LogFileName=${{ github.workspace }}/TestResults/test-results.trx"
163163
164164
- name: Test with coverage
165165
if: ${{ matrix.coverage }}
@@ -168,15 +168,15 @@ jobs:
168168
-p:CollectCoverage=true -p:CoverletOutput="${{ github.workspace }}/TestResults/" -p:CoverletOutputFormat=opencover /p:ExcludeByFile="**/TeamTools.TSQL.Common/**/*.cs"
169169
-p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
170170
--configuration ${{ matrix.configuration }}
171-
--logger "trx;LogFileName=${{ github.workspace }}/TestResults/test-results.trx"
171+
--logger "trx;LogFileName=${{ github.workspace }}/TestResults/test-results.trx"
172172
173173
- name: Upload test artifacts
174174
uses: actions/upload-artifact@v4
175175
if: ${{ matrix.coverage }}
176176
with:
177177
name: test-results
178178
path: TestResults
179-
179+
180180
- name: Test Report
181181
uses: dorny/test-reporter@v2
182182
if: ${{ !cancelled() }} # run this step even if previous step failed
@@ -210,10 +210,10 @@ jobs:
210210
gist-filename: code-coverage.json
211211
gist-id: ${{ vars.GIST_COVERAGE_ID }}
212212
gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }}
213-
213+
214214
- name: Create Coverage Badge
215215
uses: schneegans/dynamic-badges-action@v1.7.0
216-
if: ${{ !cancelled() && hashFiles('TestResults/coverage.opencover.xml') != '' && steps.create_coverage_badge.outputs.percentage != '' }}
216+
if: ${{ !cancelled() && hashFiles('TestResults/coverage.opencover.xml') != '' && steps.create_coverage_badge.outputs.percentage != '' }}
217217
with:
218218
auth: ${{ secrets.GIST_AUTH_TOKEN }}
219219
gistID: ${{ vars.GIST_COVERAGE_ID }}
@@ -227,7 +227,7 @@ jobs:
227227
- name: Print code coverage
228228
if: steps.create_coverage_badge.outcome == 'success'
229229
run: echo "Code coverage percentage ${{steps.create_coverage_badge.outputs.percentage}}%"
230-
230+
231231
repack-with-plugins:
232232
name: Repackage with plugins
233233
needs: [semver, build]

‎NuGet.Config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
55
</packageSources>
66
<config>
7-
<add key="globalPackagesFolder" value=".\packages"/>
8-
<add key="dependencyVersion" value="Highest"/>
7+
<add key="globalPackagesFolder" value=".\packages" />
8+
<add key="dependencyVersion" value="Highest" />
99
</config>
1010
<activePackageSource>
11-
<add key="All" value="(Aggregate source)"/>
11+
<add key="All" value="(Aggregate source)" />
1212
</activePackageSource>
1313
</configuration>

‎readme.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
| `--version` | | Вывести номер версии утилиты без выполнения других операций
3131
| `--help` | | Отобразить список параметров
3232

33-
3433
## Примеры вызова
3534

3635
### Линтинг диффа по каталогу
@@ -91,7 +90,6 @@ Use output window = поставьте галочку
9190

9291
`--file "$REPO\$FILE" --severity warning --verbose`
9392

94-
9593
Теперь можно линтить выбранный файл прямо из интерфейса **SourceTree**.
9694

9795
### GIT hook

‎teamtools.code-workspace‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
],
7+
"settings": {
8+
"files.encoding": "utf8bom",
9+
"files.eol": "\r\n",
10+
"files.trimTrailingWhitespace": true,
11+
"files.associations": {
12+
".*rc": "json",
13+
".code-workspace": "json",
14+
"app.config": "xml"
15+
},
16+
"editor.insertSpaces": true,
17+
"editor.formatOnSave": true,
18+
"editor.renderWhitespace": "trailing",
19+
"[markdown]": {
20+
"editor.wordWrap": "on",
21+
"editor.quickSuggestions": {
22+
"comments": "off",
23+
"strings": "off",
24+
"other": "off"
25+
},
26+
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
27+
},
28+
"[json]": {
29+
"editor.quickSuggestions": {
30+
"strings": true
31+
},
32+
"editor.suggest.insertMode": "replace",
33+
"editor.defaultFormatter": "vscode.json-language-features"
34+
},
35+
"markdownlint.config": {
36+
"MD033": {
37+
"allowed_elements": [
38+
"p"
39+
],
40+
"MD012": false, // extra line [2 empty lines]
41+
"MD013": false, // line length
42+
},
43+
"MD055": false, // tables
44+
"MD004": {
45+
"style": "dash" // List style
46+
}
47+
},
48+
"[shellscript]": {
49+
"files.encoding": "utf8",
50+
"editor.tabSize": 4
51+
},
52+
"[github-actions-workflow]": {
53+
"editor.defaultFormatter": "redhat.vscode-yaml"
54+
},
55+
"powershell.codeFormatting.useCorrectCasing": true,
56+
"powershell.codeFormatting.whitespaceBetweenParameters": true,
57+
"powershell.integratedConsole.suppressStartupBanner": true,
58+
"powershell.integratedConsole.showOnStartup": false,
59+
"powershell.scriptAnalysis.settingsPath": "./.vscode/PSScriptAnalyzerSettings.psd1",
60+
"powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationForFirstPipeline",
61+
"powershell.developer.editorServicesLogLevel": "Warning",
62+
"files.exclude": {
63+
"**/.vs/": true,
64+
"**/*.orig": true,
65+
"**/*.~*": true,
66+
"**/*_i.c": true,
67+
"**/*_p.c": true,
68+
"**/*_h.h": true,
69+
"**/*.ilk": true,
70+
"**/*.meta": true,
71+
"**/*.obj": true,
72+
"**/*.iobj": true,
73+
"**/*.pch": true,
74+
"**/*.pdb": true,
75+
"**/*.ipdb": true,
76+
"**/*.pgc": true,
77+
"**/*.pgd": true,
78+
"**/*.rsp": true,
79+
"**/*.sbr": true,
80+
"**/*.tlb": true,
81+
"**/*.tli": true,
82+
"**/*.tlh": true,
83+
"**/*.tmp": true,
84+
"**/*.tmp_proj": true,
85+
"**/*_wpftmp.csproj": true,
86+
"**/*.log": true,
87+
"**/*.vspscc": true,
88+
"**/*.vssscc": true,
89+
"**/.builds": true,
90+
"**/*.pidb": true,
91+
"**/*.svclog": true,
92+
"**/*.scc": true,
93+
"**/*.jfm": true,
94+
"**/*.dbmdl": true,
95+
"**/*.psess": true,
96+
"**/*.vsp": true,
97+
"**/*.vspx": true,
98+
"**/*.sap": true,
99+
"**/*.e2e": true,
100+
"**/$tf/": true,
101+
"**/*.rsuser": true,
102+
"**/*.suo": true,
103+
"**/*.user": true,
104+
"**/*.userosscache": true,
105+
"**/*.sln.docstates": true,
106+
"packages/": true,
107+
"**/TestResults/": true,
108+
".nupkg/": true,
109+
"**/bin/": true,
110+
"**/obj/": true,
111+
"**/packages.lock.json": true
112+
},
113+
"powershell.codeFormatting.avoidSemicolonsAsLineTerminators": true,
114+
"files.insertFinalNewline": true,
115+
"xml.format.maxLineWidth": 180
116+
},
117+
"extensions": {
118+
"recommendations": [
119+
"yzhang.markdown-all-in-one",
120+
"davidanson.vscode-markdownlint",
121+
"esbenp.prettier-vscode",
122+
"dbaeumer.vscode-eslint",
123+
"ms-vscode.test-adapter-converter",
124+
"hbenl.vscode-test-explorer",
125+
"timonwong.shellcheck",
126+
"github.vscode-github-actions",
127+
"redhat.vscode-yaml"
128+
]
129+
}
130+
}

0 commit comments

Comments
 (0)