Skip to content

Commit f63aebc

Browse files
authored
Merge branch 'main' into develop
2 parents ee7048c + de04dc7 commit f63aebc

File tree

4 files changed

+51
-5
lines changed

4 files changed

+51
-5
lines changed

.github/workflows/publish-nuget.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/setup-dotnet@v4
1818
with:
1919
dotnet-version: 8.0.x
20-
20+
2121
- name: Restore dependencies
2222
run: dotnet restore
2323

GitVersion.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
mode: ContinuousDeployment
2+
branches:
3+
main:
4+
regex: ^main$
5+
tag: ''
6+
increment: Minor
7+
prevent-increment-of-merged-branch-version: true
8+
track-merge-target: false
9+
tracks-release-branches: false
10+
is-release-branch: false
11+
is-mainline: true
12+
pre-release-weight: 55000
13+
release:
14+
regex: ^releases?[/-]
15+
mode: ContinuousDelivery
16+
tag: beta
17+
increment: Patch
18+
prevent-increment-of-merged-branch-version: true
19+
track-merge-target: false
20+
tracks-release-branches: false
21+
is-release-branch: true
22+
is-mainline: false
23+
pre-release-weight: 30000
24+
feature:
25+
regex: ^features?[/-]
26+
mode: ContinuousDelivery
27+
tag: useBranchName
28+
increment: Inherit
29+
prevent-increment-of-merged-branch-version: false
30+
track-merge-target: false
31+
tracks-release-branches: false
32+
is-release-branch: false
33+
is-mainline: false
34+
pre-release-weight: 30000
35+
develop:
36+
regex: ^dev(elop)?(ment)?$
37+
mode: ContinuousDeployment
38+
tag: alpha
39+
increment: Minor
40+
prevent-increment-of-merged-branch-version: true
41+
track-merge-target: false
42+
tracks-release-branches: true
43+
is-release-branch: false
44+
is-mainline: false
45+
pre-release-weight: 0
46+
ignore:
47+
sha: []
48+
merge-message-formats: {}

global.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"sdk": {
3-
"version": "10.0.0",
4-
"rollForward": "latestMajor",
5-
"allowPrerelease": true
3+
"version": "10.0.100-preview.4.25258.110"
64
}
75
}

src/KSFramework/KSFramework.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>net8.0;net6.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

0 commit comments

Comments
 (0)