Skip to content

Commit 30f0c9e

Browse files
stratosbluestratosblue
committed
chore: update sln; update tfm; update workflow;
1 parent b1dfc6e commit 30f0c9e

7 files changed

Lines changed: 34 additions & 43 deletions

File tree

‎.github/workflows/PublishNugetPackage.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
on:
44
release:
55
types: [released,prereleased]
6-
branches: [ master ]
6+
branches: [ main ]
77

88
jobs:
99
publish-with-build:
1010

1111
runs-on: ubuntu-latest
12-
12+
13+
permissions:
14+
id-token: write
15+
1316
steps:
1417
- uses: actions/checkout@v4
1518
- name: Setup .NET Core SDK
@@ -18,15 +21,21 @@ jobs:
1821
dotnet-version: |
1922
8.x
2023
9.x
21-
- name: restore dependencies
22-
run: dotnet restore
24+
10.x
2325
- name: build
24-
run: dotnet build --no-restore -c Release
26+
run: dotnet build -c Release
2527
- name: test
26-
run: dotnet test -f net9.0 && dotnet test -c Release -f net9.0
28+
run: dotnet test --no-restore -c Release
2729
- name: pack
2830
run: dotnet pack -c Release -o ./output
31+
32+
- name: NuGet login
33+
uses: NuGet/login@v1
34+
id: login
35+
with:
36+
user: ${{ secrets.NUGET_USER }}
37+
2938
- name: push package
3039
shell: pwsh
3140
working-directory: ./output
32-
run: Get-ChildItem -File -Filter '*.nupkg' | ForEach-Object { dotnet nuget push $_ -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --no-service-endpoint --skip-duplicate; dotnet nuget push $_ -k ${{secrets.NUGET_GITHUB_KEY}} -s https://nuget.pkg.github.com/stratosblue/index.json --no-service-endpoint --skip-duplicate; }
41+
run: Get-ChildItem -File -Filter '*.nupkg' | ForEach-Object { dotnet nuget push $_ -k ${{steps.login.outputs.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --no-service-endpoint --skip-duplicate; dotnet nuget push $_ -k ${{secrets.NUGET_GITHUB_KEY}} -s https://nuget.pkg.github.com/StratosBlue/index.json --no-service-endpoint --skip-duplicate; }

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,6 @@ MigrationBackup/
360360
.ionide/
361361

362362
# Fody - auto-generated XML schema
363-
FodyWeavers.xsd
363+
FodyWeavers.xsd
364+
365+
[Aa]uto[Gg]enerated/

‎CodeMaid.config‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,47 +62,21 @@
6262
<value>Consolas</value>
6363
</setting>
6464
<setting name="Reorganizing_ReverseOrderByAccessLevel" serializeAs="String">
65-
<value>False</value>
65+
<value>True</value>
6666
</setting>
6767
<setting name="Reorganizing_ExplicitMembersAtEnd" serializeAs="String">
6868
<value>True</value>
6969
</setting>
7070
<setting name="General_Theme" serializeAs="String">
7171
<value>1</value>
7272
</setting>
73-
<setting name="Cleaning_AutoSaveAndCloseIfOpenedByCleanup" serializeAs="String">
74-
<value>False</value>
75-
</setting>
7673
<setting name="Collapsing_CollapseSolutionWhenOpened" serializeAs="String">
7774
<value>False</value>
7875
</setting>
7976
<setting name="Collapsing_KeepSoloProjectExpanded" serializeAs="String">
8077
<value>False</value>
8178
</setting>
82-
<setting name="Cleaning_RemoveEndOfFileTrailingNewLine" serializeAs="String">
83-
<value>False</value>
84-
</setting>
85-
<setting name="Cleaning_InsertEndOfFileTrailingNewLine" serializeAs="String">
86-
<value>True</value>
87-
</setting>
88-
<setting name="Cleaning_InsertBlankLinePaddingBeforePropertiesSingleLine"
89-
serializeAs="String">
90-
<value>True</value>
91-
</setting>
92-
<setting name="Cleaning_InsertBlankLinePaddingBeforeFieldsSingleLine"
93-
serializeAs="String">
94-
<value>True</value>
95-
</setting>
96-
<setting name="Feature_SettingCleanupOnSave" serializeAs="String">
97-
<value>True</value>
98-
</setting>
99-
<setting name="Finding_TemporarilyOpenSolutionFolders" serializeAs="String">
100-
<value>False</value>
101-
</setting>
102-
<setting name="Progressing_HideBuildProgressOnBuildStop" serializeAs="String">
103-
<value>True</value>
104-
</setting>
105-
<setting name="Feature_FindInSolutionExplorer" serializeAs="String">
79+
<setting name="Feature_CollapseAllSolutionExplorer" serializeAs="String">
10680
<value>False</value>
10781
</setting>
10882
</SteveCadwallader.CodeMaid.Properties.Settings>

‎Cuture.Extensions.SystemTextJson.Dynamic.slnx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<Solution>
2-
<Folder Name="/.github/" />
3-
<Folder Name="/.github/workflows/">
4-
<File Path=".github/workflows/PublishNugetPackage.yml" />
5-
</Folder>
62
<Folder Name="/benchmark/">
73
<Project Path="benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark.csproj" />
84
</Folder>
95
<Folder Name="/solution items/">
106
<File Path=".editorconfig" />
7+
<File Path=".gitattributes" />
8+
<File Path=".gitignore" />
9+
<File Path="CodeMaid.config" />
1110
<File Path="Directory.Build.props" />
1211
<File Path="global.json" />
1312
<File Path="LICENSE.txt" />
1413
<File Path="README.md" />
1514
</Folder>
15+
<Folder Name="/solution items/.github/" />
16+
<Folder Name="/solution items/.github/workflows/">
17+
<File Path=".github/workflows/PublishNugetPackage.yml" />
18+
</Folder>
1619
<Folder Name="/src/">
1720
<Project Path="src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.csproj" />
1821
</Folder>

‎global.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"msbuild-sdks": {
3-
"MSTest.Sdk": "3.10.1"
3+
"MSTest.Sdk": "4.0.2"
4+
},
5+
"test": {
6+
"runner": "Microsoft.Testing.Platform"
47
}
58
}

‎src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
55

66
<IsPackable>true</IsPackable>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎test/Cuture.Extensions.SystemTextJson.Dynamic.Test/Cuture.Extensions.SystemTextJson.Dynamic.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSTest.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0;net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)