Skip to content

Commit 47f9f57

Browse files
retailcoderretailcoder
authored
Merge pull request #5671 from retailcoder/tentative-version-fix
Fixes CI build version patching.
2 parents c853e05 + 44820cd commit 47f9f57

11 files changed

+31
-59
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,4 @@ Rubberduck.Parsing.xml
192192
/.gradle/
193193
/Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.xml
194194
/Rubberduck.Parsing/Rubberduck.Parsing.xml
195+
/.nuget/NuGet.Config

‎Rubberduck.Core/Rubberduck.Core.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
<ApplicationIcon>Ducky.ico</ApplicationIcon>
1414
<!-- Give a fixed version to not blow XAML generated code to smithereens -->
1515
<!-- This also fixes "Input string was not in the correct format" error message when referring to the current assembly in an XAML-Namespace -->
16-
<AssemblyVersion>2.5.1</AssemblyVersion>
1716
<UseWpf>true</UseWpf>
1817
<UseWindowsForms>true</UseWindowsForms>
18+
19+
<Deterministic>False</Deterministic>
1920
</PropertyGroup>
2021
<Import Project="..\RubberduckBaseProject.csproj" />
2122
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">

‎Rubberduck.Parsing/Binding/Bindings/IndexDefaultBinding.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ private IBoundExpression ResolveLExpressionIsDictionaryAccessExpression(Dictiona
294294
private IBoundExpression ResolveDefaultMember(string asTypeName, Declaration asTypeDeclaration, ArgumentList argumentList, ParserRuleContext expression, Declaration parent, int defaultMemberResolutionRecursionDepth, RecursiveDefaultMemberAccessExpression containedExpression)
295295
{
296296
/*
297-
The declared type of <l-expression> is Object or Variant, and <argument-list> contains no
297+
The declared type of 'l-expression' is Object or Variant, and 'argument-list' contains no
298298
named arguments. In this case, the index expression is classified as an unbound member with
299-
a declared type of Variant, referencing <l-expression> with no member name.
299+
a declared type of Variant, referencing 'l-expression' with no member name.
300300
*/
301301
if (Tokens.Variant.Equals(asTypeName, StringComparison.InvariantCultureIgnoreCase)
302302
&& !argumentList.HasNamedArguments)
@@ -314,7 +314,7 @@ private IBoundExpression ResolveDefaultMember(string asTypeName, Declaration asT
314314
}
315315

316316
/*
317-
The declared type of <l-expression> is a specific class, which has a public default Property
317+
The declared type of 'l-expression' is a specific class, which has a public default Property
318318
Get, Property Let, function or subroutine, and one of the following is true:
319319
*/
320320
if (asTypeDeclaration is ClassModuleDeclaration classModule
@@ -325,7 +325,7 @@ private IBoundExpression ResolveDefaultMember(string asTypeName, Declaration asT
325325
var defaultMemberClassification = DefaultMemberExpressionClassification(defaultMember);
326326

327327
/*
328-
This default member’s parameter list is compatible with <argument-list>. In this case, the
328+
This default member’s parameter list is compatible with 'argument-list'. In this case, the
329329
index expression references this default member and takes on its classification and
330330
declared type.
331331
@@ -340,8 +340,8 @@ declared type.
340340

341341
/**
342342
This default member can accept no parameters. In this case, the static analysis restarts
343-
recursively, as if this default member was specified instead for <l-expression> with the
344-
same <argument-list>.
343+
recursively, as if this default member was specified instead for 'l-expression' with the
344+
same 'argument-list'.
345345
*/
346346
if (parameters.All(parameter => parameter.IsOptional)
347347
&& DEFAULT_MEMBER_RECURSION_LIMIT >= defaultMemberResolutionRecursionDepth)

‎Rubberduck.Parsing/ParserRuleContextExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static IEnumerable<IToken> GetTokens(this ParserRuleContext context, Comm
4444
}
4545

4646
/// <summary>
47-
/// Gets the original source, without "synthetic" text such as "<EOF>
47+
/// Gets the original source, without "synthetic" text such as an 'EOF' token.
4848
/// </summary>
4949
public static string GetText(this ParserRuleContext context, ICharStream stream)
5050
{

‎Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Rubberduck.Parsing/SelectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Rubberduck.Parsing
66
{
77
/// <summary>
8-
/// Provide extensions on selections & contexts/tokens
8+
/// Provide extensions on selections and contexts/tokens
99
/// to assist in validating whether a selection contains
1010
/// a given context or a token.
1111
/// </summary>

‎Rubberduck.Parsing/UIContext/IUiDispatcher.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public interface IUiDispatcher
3434
void FlushMessageQueue();
3535

3636
/// <summary>
37-
/// Raises a COM-visible event on the UI thread. This will use <see cref="UiDispatcher.Invoke()" /> internally
38-
/// but with additional error handling & retry logic for transient failure to fire COM event due to the host
37+
/// Raises a COM-visible event on the UI thread. This will use <see cref="UiDispatcher.Invoke" /> internally
38+
/// but with additional error handling and retry logic for transient failure to fire COM event due to the host
3939
/// being too busy to accept event.
4040
/// </summary>
4141
/// <param name="comEventHandler">The handler for setting up and firing the COM event on the UI thread</param>

‎Rubberduck.Parsing/VBA/SynchronousParseCoordinator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void Parse(CancellationTokenSource token)
3434
}
3535

3636
/// <summary>
37-
/// For the use of tests & reflection API only
37+
/// For the use of tests and reflection API only
3838
/// </summary>
3939
private void SetSavedCancellationTokenSource(CancellationTokenSource tokenSource)
4040
{

‎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: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<Project>
2-
<PropertyGroup>
3-
<RubberduckVersion>2.5.1</RubberduckVersion>
4-
</PropertyGroup>
1+
<Project Skd="Microsoft.NET.Sdk">
2+
<!--
3+
We're specifying the Sdk here to make sure appveyor correctly recognizes this as a .NET Core project
4+
Unfortunately this generates the warning MSB4011, because the including projects already define an Sdk
5+
-->
56
<PropertyGroup>
67
<OutputType>Library</OutputType>
78
<Company>Rubberduck-VBA</Company>
@@ -17,22 +18,10 @@
1718
<UnifyOutputPath Condition=" '$(UnifyOutputPath)' == ''">false</UnifyOutputPath>
1819
<!-- Ignore MSB4011 warning, rationale above -->
1920
<!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
20-
<DisabledWarnings>$(DisabledWarnings);4011;1001</DisabledWarnings>
21-
<Version Condition=" '$(Version)' == ''">$(RubberduckVersion)</Version>
22-
<FileVersion>$(RubberduckVersion)</FileVersion>
23-
</PropertyGroup>
24-
25-
<PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">
26-
<!--
27-
This assembly version specification is considered nonstandard.
28-
As such builds that do not override the assembly version generate a warning, which we ignore.
29-
-->
30-
<AssemblyVersion>$(RubberduckVersion).*</AssemblyVersion>
31-
<!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
32-
<!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
33-
<DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
34-
<!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
35-
<Deterministic>False</Deterministic>
21+
<DisabledWarnings>$(DisabledWarnings);4011;1001;1591</DisabledWarnings>
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 -->
3625
</PropertyGroup>
3726

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

0 commit comments

Comments
 (0)