Skip to content

Commit a6e52bc

Browse files
Merge pull request #142 from microsoft/users/jstatia/migrate_to_cpm
Move to central package management in the repo, also tabs to spaces
2 parents d5a05c2 + 784b6ba commit a6e52bc

File tree

31 files changed

+783
-704
lines changed

31 files changed

+783
-704
lines changed

.editorconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ root = true
55

66
# Default settings:
77
[*]
8+
indent_style = space
9+
indent_size = 4
10+
tab_width = 4
811
trim_trailing_whitespace = true
912
insert_final_newline = false
1013
dotnet_style_coalesce_expression = true:suggestion
@@ -244,5 +247,21 @@ csharp_style_prefer_pattern_matching = true:silent
244247
csharp_style_prefer_not_pattern = true:suggestion
245248
csharp_style_prefer_extended_property_pattern = true:suggestion
246249
dotnet_diagnostic.IDE0043.severity = error
250+
251+
# XML and project files
252+
[*.{xml,csproj,props,targets}]
253+
indent_style = space
254+
indent_size = 4
255+
256+
# JSON files
257+
[*.json]
258+
indent_style = space
259+
indent_size = 2
260+
261+
# Markdown files
262+
[*.md]
263+
indent_style = space
264+
indent_size = 2
265+
trim_trailing_whitespace = false
247266
csharp_style_prefer_top_level_statements = true:silent
248267
csharp_style_prefer_utf8_string_literals = true:suggestion

.github/copilot-instructions.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ This file ensures GitHub Copilot follows the repository's coding standards as de
4444
- **Using statements**: Prefer simple using statements over using blocks
4545

4646
### Formatting Rules
47-
- **Indentation**: 4 spaces (no tabs)
47+
- **Indentation**: **ALWAYS** use 4 spaces for indentation. **NEVER** use tabs.
48+
- This applies to ALL file types: .cs, .csproj, .xml, .json, .md files
49+
- Convert any existing tabs to 4 spaces
50+
- Configure your editor to show whitespace to avoid accidental tab usage
4851
- **End of line**: CRLF (Windows line endings)
4952
- **Final newline**: Do not insert final newline
5053
- **Trim whitespace**: Always trim trailing whitespace

.github/workflows/dotnet.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,12 +298,12 @@ jobs:
298298
RUNTIME_ID=${{ matrix.runtime_id || '' }}
299299
if [ -n "$RUNTIME_ID" ]; then
300300
echo "Publishing for runtime: $RUNTIME_ID"
301-
dotnet publish --configuration Debug --self-contained true --runtime $RUNTIME_ID --output published/debug --property:FileVersion=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
302-
dotnet publish --configuration Release --self-contained true --runtime $RUNTIME_ID --output published/release --property:FileVersion=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
301+
dotnet publish --configuration Debug --self-contained true --runtime $RUNTIME_ID --output published/debug --property:FileVersion=$VERSION --property:VersionNgt=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
302+
dotnet publish --configuration Release --self-contained true --runtime $RUNTIME_ID --output published/release --property:FileVersion=$VERSION --property:VersionNgt=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
303303
else
304304
echo "Publishing for current platform"
305-
dotnet publish --configuration Debug --self-contained true --output published/debug --property:FileVersion=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
306-
dotnet publish --configuration Release --self-contained true --output published/release --property:FileVersion=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
305+
dotnet publish --configuration Debug --self-contained true --output published/debug --property:FileVersion=$VERSION --property:VersionNgt=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
306+
dotnet publish --configuration Release --self-contained true --output published/release --property:FileVersion=$VERSION --property:VersionNgt=$VERSION --property:DeployPlugins=true CoseSignTool/CoseSignTool.csproj
307307
fi
308308
# Self-contained is needed. Must use .csproj instead of .sln.
309309
# DeployPlugins=true enables automatic plugin deployment during publish
@@ -358,6 +358,7 @@ jobs:
358358
--configuration Release \
359359
--property:FileVersion=$VERSION \
360360
--property:PackageVersion=$VERSION \
361+
--property:VersionNgt=$VERSION \
361362
--output published/packages \
362363
--verbosity minimal
363364

.github/workflows/rerelease.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
6868
echo "**** Build and publish $tag ****"
6969
rm -rf published/debug
70-
dotnet publish --configuration Debug --self-contained true --output published/debug CoseSignTool/CoseSignTool.csproj
70+
dotnet publish --configuration Debug --self-contained true --output published/debug --property:VersionNgt=$tag CoseSignTool/CoseSignTool.csproj
7171
rm -rf published/release
72-
dotnet publish --configuration Release --self-contained true --output published/release CoseSignTool/CoseSignTool.csproj
72+
dotnet publish --configuration Release --self-contained true --output published/release --property:VersionNgt=$tag CoseSignTool/CoseSignTool.csproj
7373
echo "publish succeeded"
7474
7575
echo "**** Copy documentation for $tag ****"

0 commit comments

Comments
 (0)