Skip to content

Commit 44820cd

Browse files
committed
Simplify versioning logic in csproj files
1 parent 4da73fb commit 44820cd

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed

Rubberduck.Core/Rubberduck.Core.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<UseWindowsForms>true</UseWindowsForms>
1818

1919
<Deterministic>False</Deterministic>
20-
<Version>2.5.1.0</Version>
21-
<AssemblyVersion>2.5.1.*</AssemblyVersion>
2220
</PropertyGroup>
2321
<Import Project="..\RubberduckBaseProject.csproj" />
2422
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">

RubberduckBaseMetaProject.csproj

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,9 @@
1616
<!-- Ignore MSB4011 warning, rationale above -->
1717
<!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
1818
<DisabledWarnings>$(DisabledWarnings);4011;1001</DisabledWarnings>
19-
<Version Condition=" '$(Version)' == ''">2.4.0</Version>
20-
</PropertyGroup>
21-
22-
<PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">
23-
<!--
24-
This assembly version specification is considered nonstandard.
25-
As such builds that do not override the assembly version generate a warning, which we ignore.
26-
-->
27-
<AssemblyVersion>2.4.*</AssemblyVersion>
28-
<!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
29-
<!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
30-
<DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
31-
<!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
32-
<Deterministic>False</Deterministic>
19+
<!-- Declare a Version if it's not already declared as a global property through MSBuild invocation -->
20+
<Version Condition=" '$(Version)' == '' ">2.5.1</Version>
21+
<!-- all other relevant version numbers are computed from Version automagically -->
3322
</PropertyGroup>
3423

3524
<PropertyGroup Condition=" $(UnifyOutputPath) ">

RubberduckBaseProject.csproj

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
We're specifying the Sdk here to make sure appveyor correctly recognizes this as a .NET Core project
44
Unfortunately this generates the warning MSB4011, because the including projects already define an Sdk
55
-->
6-
<PropertyGroup>
7-
<RubberduckVersion>2.5.1</RubberduckVersion>
8-
</PropertyGroup>
96
<PropertyGroup>
107
<OutputType>Library</OutputType>
118
<Company>Rubberduck-VBA</Company>
@@ -22,21 +19,9 @@
2219
<!-- Ignore MSB4011 warning, rationale above -->
2320
<!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
2421
<DisabledWarnings>$(DisabledWarnings);4011;1001;1591</DisabledWarnings>
25-
<Version>$(RubberduckVersion)</Version>
26-
<FileVersion>$(RubberduckVersion)</FileVersion>
27-
</PropertyGroup>
28-
29-
<PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">
30-
<!--
31-
This assembly version specification is considered nonstandard.
32-
As such builds that do not override the assembly version generate a warning, which we ignore.
33-
-->
34-
<Deterministic>False</Deterministic>
35-
<AssemblyVersion>$(RubberduckVersion).*</AssemblyVersion>
36-
<!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
37-
<!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
38-
<DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
39-
<!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
22+
<!-- Declare a Version if it's not already declared as a global property through MSBuild invocation -->
23+
<Version Condition=" '$(Version)' == '' ">2.5.1</Version>
24+
<!-- all other relevant version numbers are computed from Version automagically -->
4025
</PropertyGroup>
4126

4227
<PropertyGroup Condition=" $(UnifyOutputPath) ">

0 commit comments

Comments
 (0)