Skip to content

Commit c378478

Browse files
committed
更新ci
1 parent a742678 commit c378478

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Build/Test/MirrorToGitee
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [master, dev/develop]
6+
branches: [master/snow, dev/snow]
77
pull_request:
8-
branches: [master]
8+
branches: [master/snow]
99

1010
jobs:
1111
build-on-dotnetcore:

.github/workflows/nuget.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish Nuget Packages
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [master]
6+
branches: [master/snow]
77
tags:
88
- "7.0.*"
99
paths:

build/OSharpNS.nuspec

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>OSharpNS</id>
5-
<version>7.0.0-preview.1127</version>
5+
<version>7.0.11</version>
66
<title>OSharpFramework(.NET6.0/.NETCoreApp3.1)</title>
77
<authors>柳柳软件(66soft.net)</authors>
88
<owners>LiuliuSoft nnc</owners>
@@ -16,18 +16,18 @@
1616
<tags>osharp</tags>
1717
<dependencies>
1818
<group targetFramework=".NETCoreApp3.1">
19-
<dependency id="OSharp.Core" version="7.0.0-preview.1127" />
20-
<dependency id="OSharp.EntityFrameworkCore" version="7.0.0-preview.1127" />
21-
<dependency id="OSharp.AutoMapper" version="7.0.0-preview.1127" />
22-
<dependency id="OSharp.AspNetCore" version="7.0.0-preview.1127" />
23-
<dependency id="OSharp.Log4Net" version="7.0.0-preview.1127" />
19+
<dependency id="OSharp.Core" version="7.0.11" />
20+
<dependency id="OSharp.EntityFrameworkCore" version="7.0.11" />
21+
<dependency id="OSharp.AutoMapper" version="7.0.11" />
22+
<dependency id="OSharp.AspNetCore" version="7.0.11" />
23+
<dependency id="OSharp.Log4Net" version="7.0.11" />
2424
</group>
2525
<group targetFramework="net6.0">
26-
<dependency id="OSharp.Core" version="7.0.0-preview.1127" />
27-
<dependency id="OSharp.EntityFrameworkCore" version="7.0.0-preview.1127" />
28-
<dependency id="OSharp.AutoMapper" version="7.0.0-preview.1127" />
29-
<dependency id="OSharp.AspNetCore" version="7.0.0-preview.1127" />
30-
<dependency id="OSharp.Log4Net" version="7.0.0-preview.1127" />
26+
<dependency id="OSharp.Core" version="7.0.11" />
27+
<dependency id="OSharp.EntityFrameworkCore" version="7.0.11" />
28+
<dependency id="OSharp.AutoMapper" version="7.0.11" />
29+
<dependency id="OSharp.AspNetCore" version="7.0.11" />
30+
<dependency id="OSharp.Log4Net" version="7.0.11" />
3131
</group>
3232
</dependencies>
3333
</metadata>

build/version.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<PropertyGroup>
33
<VersionMain>7.0</VersionMain>
44
<VersionPrefix>11</VersionPrefix>
5-
<VersionSuffix>-preview.</VersionSuffix>
5+
<VersionSuffix>-snow</VersionSuffix>
66
<VersionSuffixVersion>1001</VersionSuffixVersion>
7-
<!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
8-
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>-->
9-
<Version>$(VersionMain).$(VersionPrefix)</Version>
10-
<FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>
7+
<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)</Version>
8+
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
9+
<!--<Version>$(VersionMain).$(VersionPrefix)</Version>
10+
<FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>-->
1111
</PropertyGroup>
1212
</Project>

0 commit comments

Comments
 (0)