Skip to content

Commit 6c144f6

Browse files
cYCL157cYCL157
committed
update latest nuget packages and scripts
1 parent 9af6377 commit 6c144f6

25 files changed

Lines changed: 378 additions & 123 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ DocProject/Help/Html2
135135
DocProject/Help/html
136136

137137
# Click-Once directory
138-
publish/
138+
#publish/
139139

140140
# Publish Web Output
141141
*.[Pp]ublish.xml
@@ -249,8 +249,11 @@ coverage.opencover.xml
249249
*.ncrunchproject
250250

251251
*.zip
252-
.vscode/*
253252

254253
*.local.json
255254
.refsignored
256255
.env.local
256+
257+
amqptools.json
258+
event.json
259+
event-json/**

‎.vscode/extensions.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"recommendations": [
3+
"ms-dotnettools.csdevkit",
4+
"ms-dotnettools.csharp",
5+
"ms-dotnettools.vscode-dotnet-runtime",
6+
"EditorConfig.EditorConfig",
7+
"patcx.vscode-nuget-gallery"
8+
]
9+
}

‎.vscode/launch.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": ".NET: Launch (auto-detect startup project)",
6+
"type": "dotnet",
7+
"request": "launch"
8+
}
9+
]
10+
}

‎.vscode/settings.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"editor.formatOnSave": false,
3+
"editor.useEditorConfig": true,
4+
"editor.detectIndentation": false,
5+
"editor.codeActionsOnSave": {
6+
"source.organizeImports": "explicit"
7+
},
8+
"files.trimTrailingWhitespace": true,
9+
"files.insertFinalNewline": true,
10+
"[csharp]": {
11+
"editor.formatOnSave": true
12+
},
13+
"dotnet.defaultSolution": "src/*.sln"
14+
}

‎.vscode/tasks.json‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "dotnet: restore",
6+
"type": "shell",
7+
"command": "dotnet",
8+
"options": {
9+
"cwd": "${workspaceFolder}/src"
10+
},
11+
"args": [
12+
"restore",
13+
"${workspaceFolder}/src/Cortside.Common.sln"
14+
],
15+
"group": "build",
16+
"problemMatcher": "$msCompile"
17+
},
18+
{
19+
"label": "dotnet: build",
20+
"type": "shell",
21+
"command": "dotnet",
22+
"options": {
23+
"cwd": "${workspaceFolder}/src"
24+
},
25+
"args": [
26+
"build",
27+
"${workspaceFolder}/src/Cortside.Common.sln",
28+
"-c",
29+
"Debug"
30+
],
31+
"group": {
32+
"kind": "build",
33+
"isDefault": true
34+
},
35+
"dependsOn": "dotnet: restore",
36+
"problemMatcher": "$msCompile"
37+
},
38+
{
39+
"label": "dotnet: test",
40+
"type": "shell",
41+
"command": "dotnet",
42+
"options": {
43+
"cwd": "${workspaceFolder}/src"
44+
},
45+
"args": [
46+
"test",
47+
"${workspaceFolder}/src/Cortside.Common.sln",
48+
"-c",
49+
"Debug",
50+
"--no-build"
51+
],
52+
"group": "test",
53+
"dependsOn": "dotnet: build",
54+
"problemMatcher": "$msCompile"
55+
},
56+
{
57+
"label": "dotnet: clean",
58+
"type": "shell",
59+
"command": "dotnet",
60+
"options": {
61+
"cwd": "${workspaceFolder}/src"
62+
},
63+
"args": [
64+
"clean",
65+
"${workspaceFolder}/src/Cortside.Common.sln"
66+
],
67+
"problemMatcher": "$msCompile"
68+
},
69+
{
70+
"label": "dotnet: format",
71+
"type": "shell",
72+
"command": "dotnet",
73+
"options": {
74+
"cwd": "${workspaceFolder}/src"
75+
},
76+
"args": [
77+
"format",
78+
"${workspaceFolder}/src/Cortside.Common.sln"
79+
],
80+
"problemMatcher": []
81+
},
82+
{
83+
"label": "dotnet: format (verify)",
84+
"type": "shell",
85+
"command": "dotnet",
86+
"options": {
87+
"cwd": "${workspaceFolder}/src"
88+
},
89+
"args": [
90+
"format",
91+
"${workspaceFolder}/src/Cortside.Common.sln",
92+
"--verify-no-changes"
93+
],
94+
"problemMatcher": []
95+
},
96+
{
97+
"label": "line-endings: preview (src)",
98+
"type": "shell",
99+
"command": "git",
100+
"options": {
101+
"cwd": "${workspaceFolder}"
102+
},
103+
"args": [
104+
"ls-files",
105+
"--eol",
106+
"src"
107+
],
108+
"problemMatcher": []
109+
},
110+
{
111+
"label": "line-endings: normalize (src)",
112+
"type": "shell",
113+
"command": "git",
114+
"options": {
115+
"cwd": "${workspaceFolder}"
116+
},
117+
"args": [
118+
"add",
119+
"--renormalize",
120+
"src"
121+
],
122+
"problemMatcher": []
123+
},
124+
{
125+
"label": "line-endings: unstage",
126+
"type": "shell",
127+
"command": "git",
128+
"options": {
129+
"cwd": "${workspaceFolder}"
130+
},
131+
"args": [
132+
"reset",
133+
"HEAD",
134+
"--"
135+
],
136+
"problemMatcher": []
137+
}
138+
]
139+
}

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ nuget:
6363
deploy:
6464
- provider: NuGet
6565
api_key:
66-
secure: D7B7/pzGIeteV3H4DrdBtyKCxLrgcBAL6XWtWrm/kJrshDwUZ5acauR9QWll7TWi
66+
secure: Egi9LPmRCLrBDQ41NzEURf4ChJFR2CscyyPA6qzJmJ+NJhKWAIeJm/7f/z8E2ppI

‎clean.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Function Invoke-Cleanup {
104104
$dir = "$($_.DirectoryName)\dist";
105105
If (Test-Path $dir ){
106106
Write-Output "Removing $dir";
107-
rm $dir -force -recurse
107+
Remove-Item $dir -force -recurse
108108
}
109109
}
110110

‎coverage.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ dotnet test src --collect:"XPlat Code Coverage" --settings src/coverlet.runsetti
55
dotnet-coverage merge *.cobertura.xml --recursive --output coverage.cobertura.xml --output-format cobertura
66
reportgenerator -reports:"coverage.cobertura.xml" -targetdir:"coveragereport" -reporttypes:Html
77

8-
rm coverage.cobertura.xml
8+
Remove-Item coverage.cobertura.xml

‎create-release.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Function Update-Version {
9090
}
9191

9292
# common repository functions
93-
Import-Module .\Repository.psm1 -Force
93+
Import-Module .\repository.psm1 -Force
9494

9595
Invoke-Exe -cmd git -args "checkout master"
9696
Invoke-Exe -cmd git -args "pull"
@@ -101,7 +101,7 @@ Invoke-Exe -cmd git -args "push"
101101

102102
$version = Get-Version
103103
$branch = "release/$($version)"
104-
echo $branch
104+
Write-Output $branch
105105

106106
$exists = (git ls-remote origin $branch)
107107
if ($exists.Length -eq 0) {
@@ -118,14 +118,14 @@ if ($exists.Length -eq 0) {
118118
gh repo set-default
119119
gh pr create --title "Release $version" --body "$releaseNotes" --base master
120120
} else {
121-
echo "should create the pr here -- everything passed - $branch"
122-
echo $body
121+
Write-Output "should create the pr here -- everything passed - $branch"
122+
Write-Output $body
123123
}
124124

125125
git checkout develop
126126
git merge $branch
127127
Update-Version
128128
git push
129129
} else {
130-
echo "release branch already exists"
130+
Write-Output "release branch already exists"
131131
}

‎format.ps1‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ if ($FixEncoding.IsPresent) {
3131
dotnet tool update -g dotnet-format --version "8.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
3232

3333
# Format code to match editorconfig settings
34-
#dotnet format --verbosity normal .\src
35-
36-
# per readme and because of dotnet cli issues, executing via command directly is best for now
37-
dotnet-format --verbosity normal .\src
38-
34+
dotnet format --verbosity normal src
3935

4036
git status

0 commit comments

Comments
 (0)