Skip to content

Commit d856a6f

Browse files
committed
修正版本号生成逻辑,规范程序集与打包输出
修正各项目 FileVersion 生成方式,避免测试版后缀影响文件版本号,统一为主版本+日期。AntJob.Web 明确指定 Data 组件输出路径,HisAgent/HisWeb/Test 固定 AssemblyVersion 为 1.0.0.0,.gitignore 增加 /out 忽略。
1 parent f2b61c7 commit d856a6f

8 files changed

Lines changed: 10 additions & 9 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ bld/
3333
/Samples/HisData/Config
3434
/AntJob.Web/.config
3535
*.csproj.lscache
36+
/out

AntJob.Data/AntJob.Data.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<VersionPrefix>4.4</VersionPrefix>
99
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
1010
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
11-
<FileVersion>$(Version)</FileVersion>
11+
<FileVersion>$(VersionPrefix).$(VersionSuffix.Split('-')[0])</FileVersion>
1212
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
1313
<Deterministic>false</Deterministic>
1414
<OutputPath>..\Bin</OutputPath>

AntJob.Extensions/AntJob.Extensions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<VersionPrefix>4.4</VersionPrefix>
1010
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
1111
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
12-
<FileVersion>$(Version)</FileVersion>
12+
<FileVersion>$(VersionPrefix).$(VersionSuffix.Split('-')[0])</FileVersion>
1313
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
1414
<Deterministic>false</Deterministic>
1515
<OutputPath>..\Bin</OutputPath>

AntJob.Web/AntJob.Web.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<VersionPrefix>4.4</VersionPrefix>
1111
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
1212
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
13-
<FileVersion>$(Version)</FileVersion>
13+
<FileVersion>$(VersionPrefix).$(VersionSuffix.Split('-')[0])</FileVersion>
1414
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
1515
<Deterministic>false</Deterministic>
1616
<OutputPath>..\Bin\Web</OutputPath>
@@ -48,8 +48,8 @@
4848
</PropertyGroup>
4949
<Target Name="IncludeDataBuildOutput">
5050
<ItemGroup>
51-
<BuildOutputInPackage Include="$(OutputPath)AntJob.Data.dll" />
52-
<BuildOutputInPackage Include="$(OutputPath)AntJob.Data.xml" />
51+
<BuildOutputInPackage Include="..\Bin\netstandard2.1\AntJob.Data.dll" />
52+
<BuildOutputInPackage Include="..\Bin\netstandard2.1\AntJob.Data.xml" />
5353
</ItemGroup>
5454
</Target>
5555

AntJob/AntJob.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<VersionPrefix>4.4</VersionPrefix>
1010
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
1111
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
12-
<FileVersion>$(Version)</FileVersion>
12+
<FileVersion>$(VersionPrefix).$(VersionSuffix.Split('-')[0])</FileVersion>
1313
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
1414
<Deterministic>false</Deterministic>
1515
<OutputPath>..\Bin</OutputPath>

Samples/HisAgent/HisAgent.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net10.0</TargetFramework>
6-
<AssemblyVersion>1.0.*</AssemblyVersion>
6+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
77
<Deterministic>false</Deterministic>
88
<OutputPath>..\..\Bin\HisAgent</OutputPath>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

Samples/HisWeb/HisWeb.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net10.0</TargetFramework>
5-
<AssemblyVersion>1.0.*</AssemblyVersion>
5+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
66
<Deterministic>false</Deterministic>
77
<OutputPath>..\..\Bin\HisWeb</OutputPath>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

Test/Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net10.0</TargetFramework>
6-
<AssemblyVersion>1.0.*</AssemblyVersion>
6+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
77
<Deterministic>false</Deterministic>
88
<OutputPath>..\Bin\Test</OutputPath>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

0 commit comments

Comments
 (0)