更新ci

dotnetcore · Oct 2, 2023 · c378478 · c378478
1 parent a742678
commit c378478
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,9 @@ name: Build/Test/MirrorToGitee
 on:
   workflow_dispatch:
   push:
-    branches: [master, dev/develop]
+    branches: [master/snow, dev/snow]
   pull_request:
-    branches: [master]
+    branches: [master/snow]
 
 jobs:
   build-on-dotnetcore:

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -3,7 +3,7 @@ name: Publish Nuget Packages
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [master/snow]
     tags:
       - "7.0.*"
     paths:

diff --git a/build/OSharpNS.nuspec b/build/OSharpNS.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>OSharpNS</id>
-    <version>7.0.0-preview.1127</version>
+    <version>7.0.11</version>
     <title>OSharpFramework(.NET6.0/.NETCoreApp3.1)</title>
     <authors>柳柳软件(66soft.net)</authors>
     <owners>LiuliuSoft nnc</owners>
@@ -16,18 +16,18 @@
     <tags>osharp</tags>
     <dependencies>
       <group targetFramework=".NETCoreApp3.1">
-        <dependency id="OSharp.Core" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.EntityFrameworkCore" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.AutoMapper" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.AspNetCore" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.Log4Net" version="7.0.0-preview.1127" />
+        <dependency id="OSharp.Core" version="7.0.11" />
+        <dependency id="OSharp.EntityFrameworkCore" version="7.0.11" />
+        <dependency id="OSharp.AutoMapper" version="7.0.11" />
+        <dependency id="OSharp.AspNetCore" version="7.0.11" />
+        <dependency id="OSharp.Log4Net" version="7.0.11" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="OSharp.Core" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.EntityFrameworkCore" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.AutoMapper" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.AspNetCore" version="7.0.0-preview.1127" />
-        <dependency id="OSharp.Log4Net" version="7.0.0-preview.1127" />
+        <dependency id="OSharp.Core" version="7.0.11" />
+        <dependency id="OSharp.EntityFrameworkCore" version="7.0.11" />
+        <dependency id="OSharp.AutoMapper" version="7.0.11" />
+        <dependency id="OSharp.AspNetCore" version="7.0.11" />
+        <dependency id="OSharp.Log4Net" version="7.0.11" />
       </group>
     </dependencies>
   </metadata>

diff --git a/build/version.props b/build/version.props
@@ -2,11 +2,11 @@
   <PropertyGroup>
     <VersionMain>7.0</VersionMain>
     <VersionPrefix>11</VersionPrefix>
-    <VersionSuffix>-preview.</VersionSuffix>
+    <VersionSuffix>-snow</VersionSuffix>
     <VersionSuffixVersion>1001</VersionSuffixVersion>
-    <!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
-    <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>-->
-    <Version>$(VersionMain).$(VersionPrefix)</Version>
-    <FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>
+    <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)</Version>
+    <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
+    <!--<Version>$(VersionMain).$(VersionPrefix)</Version>
+    <FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>-->
   </PropertyGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Publish Nuget Packages @@
     on:
       workflow_dispatch:
       push:
-        branches: [master]
+        branches: [master/snow]
         tags:
           - "7.0.*"
         paths:
@@ Expand Down @@