Publish/DevOps2/build-bash/19.get-app-version.bash

@@ -26,19 +26,19 @@ cd $curPath
 
 
 #----------------------------------------------
-echo "#1 get version" 
-export version=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
-echo "version from csproj: $version"
+echo "#1 get appVersion" 
+export appVersion=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<appVersion>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
+echo "appVersion from csproj: $appVersion"
 
 # get v1 v2 v3
-v1=$(echo $version | tr '.' '\n' | sed -n 1p)
-v2=$(echo $version | tr '.' '\n' | sed -n 2p)
-v3=$(echo $version | tr '.-' '\n' | sed -n 3p)
+v1=$(echo $appVersion | tr '.' '\n' | sed -n 1p)
+v2=$(echo $appVersion | tr '.' '\n' | sed -n 2p)
+v3=$(echo $appVersion | tr '.-' '\n' | sed -n 3p)
 
 
-#export appVersion="${version%%-*}$versionSuffix"
-export appVersion="$v1.$v2.$v3$versionSuffix"
-echo "appVersion: $appVersion"
+#export nextAppVersion="${appVersion%%-*}$versionSuffix"
+export nextAppVersion="$v1.$v2.$v3$versionSuffix"
+echo "nextAppVersion: $nextAppVersion"
 
 
 

Publish/DevOps2/build-bash/20.change-app-version.bash

@@ -26,24 +26,24 @@ cd $curPath
 
 
 #----------------------------------------------
-echo "#1 get version" 
-export version=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
-echo "version from csproj: $version"
+echo "#1 get appVersion" 
+export appVersion=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<appVersion>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
+echo "appVersion from csproj: $appVersion"
 
 # get v1 v2 v3
-v1=$(echo $version | tr '.' '\n' | sed -n 1p)
-v2=$(echo $version | tr '.' '\n' | sed -n 2p)
-v3=$(echo $version | tr '.-' '\n' | sed -n 3p)
+v1=$(echo $appVersion | tr '.' '\n' | sed -n 1p)
+v2=$(echo $appVersion | tr '.' '\n' | sed -n 2p)
+v3=$(echo $appVersion | tr '.-' '\n' | sed -n 3p)
 
 
-#export appVersion="${version%%-*}$versionSuffix"
-export appVersion="$v1.$v2.$v3$versionSuffix"
-echo "appVersion: $appVersion"
+#export nextAppVersion="${appVersion%%-*}$versionSuffix"
+export nextAppVersion="$v1.$v2.$v3$versionSuffix"
+echo "nextAppVersion: $nextAppVersion"
 
 
 #----------------------------------------------
-echo "#2 change app version from [$version] to [$appVersion]" 
-sed -i 's/'"$version"'/'"$appVersion"'/g'  `find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \;`
+echo "#2 change app version from [$appVersion] to [$nextAppVersion]" 
+sed -i 's/'"$appVersion"'/'"$nextAppVersion"'/g'  `find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \;`
 
 
 

Publish/DevOps2/build-bash/21.change-to-next-version.bash

@@ -26,24 +26,24 @@ cd $curPath
 
 
 #----------------------------------------------
-echo "#1 get version" 
-export version=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
-echo "version from csproj: $version"
+echo "#1 get appVersion" 
+export appVersion=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<appVersion>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
+echo "appVersion from csproj: $appVersion"
 
 # get v1 v2 v3
-v1=$(echo $version | tr '.' '\n' | sed -n 1p)
-v2=$(echo $version | tr '.' '\n' | sed -n 2p)
-v3=$(echo $version | tr '.-' '\n' | sed -n 3p)
+v1=$(echo $appVersion | tr '.' '\n' | sed -n 1p)
+v2=$(echo $appVersion | tr '.' '\n' | sed -n 2p)
+v3=$(echo $appVersion | tr '.-' '\n' | sed -n 3p)
 ((v3++));
 
 
-export appVersion="$v1.$v2.$v3$versionSuffix"
-echo "appVersion: $appVersion"
-
+#export nextAppVersion="${appVersion%%-*}$versionSuffix"
+export nextAppVersion="$v1.$v2.$v3$versionSuffix"
+echo "nextAppVersion: $nextAppVersion"
 
 #----------------------------------------------
-echo "#2 change app version from [$version] to [$appVersion]" 
-sed -i 's/'"$version"'/'"$appVersion"'/g'  `find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \;`
+echo "#2 change app version from [$appVersion] to [$nextAppVersion]" 
+sed -i 's/'"$appVersion"'/'"$nextAppVersion"'/g'  `find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \;`
 
 
 

dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -1,36 +1,37 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<pack>nuget</pack>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.20-preview11</Version>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>Sers微服务-核心库</Description>
-		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<DocumentationFile>bin\Debug\netstandard2.0\Sers.Core.xml</DocumentationFile>
-	</PropertyGroup>
-
-
-	<ItemGroup>
-		<PackageReference Include="System.Text.Json" Version="5.0.2" />
-		<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\..\Vit\Vit.Core\Vit.Core\Vit.Core.csproj" />
-		<ProjectReference Include="..\..\Sers.Hardware\Sers.Hardware\Sers.Hardware.csproj" />
-	</ItemGroup>
+    <PropertyGroup>
+        <pack>nuget</pack>
+        <appVersion></appVersion>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>2.1.20-preview11</Version>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>Sers微服务-核心库</Description>
+        <PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <DocumentationFile>bin\Debug\netstandard2.0\Sers.Core.xml</DocumentationFile>
+    </PropertyGroup>
+
+
+    <ItemGroup>
+        <PackageReference Include="System.Text.Json" Version="5.0.2" />
+        <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
+    </ItemGroup>
+
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\Vit\Vit.Core\Vit.Core\Vit.Core.csproj" />
+        <ProjectReference Include="..\..\Sers.Hardware\Sers.Hardware\Sers.Hardware.csproj" />
+    </ItemGroup>
 
 
 </Project>