Merge pull request #5671 from retailcoder/tentative-version-fix

retailcoder · web-flow · commit 47f9f5712964 · 2021-02-17T14:59:08.000-05:00
Fixes CI build version patching.
diff --git a/.gitignore b/.gitignore
@@ -192,3 +192,4 @@ Rubberduck.Parsing.xml
 /.gradle/
 /Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.xml
 /Rubberduck.Parsing/Rubberduck.Parsing.xml
+/.nuget/NuGet.Config
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -13,9 +13,10 @@
     <ApplicationIcon>Ducky.ico</ApplicationIcon>
     <!-- Give a fixed version to not blow XAML generated code to smithereens -->
     <!-- This also fixes "Input string was not in the correct format" error message when referring to the current assembly in an XAML-Namespace -->
-    <AssemblyVersion>2.5.1</AssemblyVersion>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
+
+    <Deterministic>False</Deterministic>
   </PropertyGroup>
   <Import Project="..\RubberduckBaseProject.csproj" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">
diff --git a/Rubberduck.Parsing/Binding/Bindings/IndexDefaultBinding.cs b/Rubberduck.Parsing/Binding/Bindings/IndexDefaultBinding.cs
@@ -294,9 +294,9 @@ private IBoundExpression ResolveLExpressionIsDictionaryAccessExpression(Dictiona
         private IBoundExpression ResolveDefaultMember(string asTypeName, Declaration asTypeDeclaration, ArgumentList argumentList, ParserRuleContext expression, Declaration parent, int defaultMemberResolutionRecursionDepth, RecursiveDefaultMemberAccessExpression containedExpression)
         {
             /*
-                The declared type of <l-expression> is Object or Variant, and <argument-list> contains no 
+                The declared type of 'l-expression' is Object or Variant, and 'argument-list' contains no 
                 named arguments. In this case, the index expression is classified as an unbound member with 
-                a declared type of Variant, referencing <l-expression> with no member name. 
+                a declared type of Variant, referencing 'l-expression' with no member name. 
              */
             if (Tokens.Variant.Equals(asTypeName, StringComparison.InvariantCultureIgnoreCase)
                 && !argumentList.HasNamedArguments)
@@ -314,7 +314,7 @@ private IBoundExpression ResolveDefaultMember(string asTypeName, Declaration asT
             }
 
             /*
-                The declared type of <l-expression> is a specific class, which has a public default Property 
+                The declared type of 'l-expression' is a specific class, which has a public default Property 
                 Get, Property Let, function or subroutine, and one of the following is true:
             */
             if (asTypeDeclaration is ClassModuleDeclaration classModule
@@ -325,7 +325,7 @@ private IBoundExpression ResolveDefaultMember(string asTypeName, Declaration asT
                 var defaultMemberClassification = DefaultMemberExpressionClassification(defaultMember);
 
                 /*
-                    This default member’s parameter list is compatible with <argument-list>. In this case, the 
+                    This default member’s parameter list is compatible with 'argument-list'. In this case, the 
                     index expression references this default member and takes on its classification and 
                     declared type.  
 
@@ -340,8 +340,8 @@ declared type.
 
                 /**
                     This default member can accept no parameters. In this case, the static analysis restarts 
-                    recursively, as if this default member was specified instead for <l-expression> with the 
-                    same <argument-list>.
+                    recursively, as if this default member was specified instead for 'l-expression' with the 
+                    same 'argument-list'.
                 */
                 if (parameters.All(parameter => parameter.IsOptional)
                     && DEFAULT_MEMBER_RECURSION_LIMIT >= defaultMemberResolutionRecursionDepth)
diff --git a/Rubberduck.Parsing/ParserRuleContextExtensions.cs b/Rubberduck.Parsing/ParserRuleContextExtensions.cs
@@ -44,7 +44,7 @@ public static IEnumerable<IToken> GetTokens(this ParserRuleContext context, Comm
         }
 
         /// <summary>
-        ///  Gets the original source, without "synthetic" text such as "<EOF>
+        ///  Gets the original source, without "synthetic" text such as an 'EOF' token.
         /// </summary>
         public static string GetText(this ParserRuleContext context, ICharStream stream)
         {
diff --git a/Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs b/Rubberduck.Parsing/Properties/ParsingSettings.Designer.cs
diff --git a/Rubberduck.Parsing/SelectionExtensions.cs b/Rubberduck.Parsing/SelectionExtensions.cs
@@ -5,7 +5,7 @@
 namespace Rubberduck.Parsing
 {
     /// <summary>
-    /// Provide extensions on selections & contexts/tokens
+    /// Provide extensions on selections and contexts/tokens
     /// to assist in validating whether a selection contains
     /// a given context or a token. 
     /// </summary>
diff --git a/Rubberduck.Parsing/UIContext/IUiDispatcher.cs b/Rubberduck.Parsing/UIContext/IUiDispatcher.cs
@@ -34,8 +34,8 @@ public interface IUiDispatcher
         void FlushMessageQueue();
 
         /// <summary>
-        /// Raises a COM-visible event on the UI thread. This will use <see cref="UiDispatcher.Invoke()" /> internally
-        /// but with additional error handling & retry logic for transient failure to fire COM event due to the host
+        /// Raises a COM-visible event on the UI thread. This will use <see cref="UiDispatcher.Invoke" /> internally
+        /// but with additional error handling and retry logic for transient failure to fire COM event due to the host
         /// being too busy to accept event.
         /// </summary>
         /// <param name="comEventHandler">The handler for setting up and firing the COM event on the UI thread</param>
diff --git a/Rubberduck.Parsing/VBA/SynchronousParseCoordinator.cs b/Rubberduck.Parsing/VBA/SynchronousParseCoordinator.cs
@@ -34,7 +34,7 @@ public void Parse(CancellationTokenSource token)
         }
 
         /// <summary>
-        /// For the use of tests & reflection API only
+        /// For the use of tests and reflection API only
         /// </summary>
         private void SetSavedCancellationTokenSource(CancellationTokenSource tokenSource)
         {
diff --git a/RubberduckBaseMetaProject.csproj b/RubberduckBaseMetaProject.csproj
@@ -16,20 +16,9 @@
     <!-- Ignore MSB4011 warning, rationale above -->
     <!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
     <DisabledWarnings>$(DisabledWarnings);4011;1001</DisabledWarnings>
-    <Version Condition=" '$(Version)' == ''">2.4.0</Version>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">
-    <!--
-     This assembly version specification is considered nonstandard.
-     As such builds that do not override the assembly version generate a warning, which we ignore.
-    -->
-    <AssemblyVersion>2.4.*</AssemblyVersion>
-    <!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
-    <!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
-    <DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
-    <!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
-    <Deterministic>False</Deterministic>
+    <!-- Declare a Version if it's not already declared as a global property through MSBuild invocation -->
+    <Version Condition=" '$(Version)' == '' ">2.5.1</Version>
+    <!-- all other relevant version numbers are computed from Version automagically -->
   </PropertyGroup>
 
   <PropertyGroup Condition=" $(UnifyOutputPath) ">
diff --git a/RubberduckBaseProject.csproj b/RubberduckBaseProject.csproj
@@ -1,7 +1,8 @@
-<Project>
-  <PropertyGroup>
-    <RubberduckVersion>2.5.1</RubberduckVersion>
-  </PropertyGroup>
+<Project Skd="Microsoft.NET.Sdk">
+  <!--
+    We're specifying the Sdk here to make sure appveyor correctly recognizes this as a .NET Core project
+    Unfortunately this generates the warning MSB4011, because the including projects already define an Sdk
+  -->
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <Company>Rubberduck-VBA</Company>
@@ -17,22 +18,10 @@
     <UnifyOutputPath Condition=" '$(UnifyOutputPath)' == ''">false</UnifyOutputPath>
     <!-- Ignore MSB4011 warning, rationale above -->
     <!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
-    <DisabledWarnings>$(DisabledWarnings);4011;1001</DisabledWarnings>
-    <Version Condition=" '$(Version)' == ''">$(RubberduckVersion)</Version>
-    <FileVersion>$(RubberduckVersion)</FileVersion>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">    
-    <!--
-     This assembly version specification is considered nonstandard.
-     As such builds that do not override the assembly version generate a warning, which we ignore.
-    -->
-    <AssemblyVersion>$(RubberduckVersion).*</AssemblyVersion>
-    <!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
-    <!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
-    <DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
-    <!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
-    <Deterministic>False</Deterministic>
+    <DisabledWarnings>$(DisabledWarnings);4011;1001;1591</DisabledWarnings>
+    <!-- Declare a Version if it's not already declared as a global property through MSBuild invocation -->
+    <Version Condition=" '$(Version)' == '' ">2.5.1</Version>
+    <!-- all other relevant version numbers are computed from Version automagically -->
   </PropertyGroup>
 
   <PropertyGroup Condition=" $(UnifyOutputPath) ">
diff --git a/appveyor.yml b/appveyor.yml
@@ -38,14 +38,6 @@ cache:
 install:
   set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;C:\Program Files (x86)\Java\jdk1.8.0;%PATH%
 
-# patch version specifiers in the base project
-dotnet_csproj:
-  patch: true
-  # patch version specifier in Core that's non-wildcard to deal with XAML generated code?
-  file: 'RubberduckBaseProject.csproj' # ;*\Rubberduck.Core.csproj'
-  version: '{version}'
-  assembly_version: '{version}'
-
 # set up the environment variables used later in the build process
 environment:
   installer_dir: Rubberduck.Deployment\InnoSetup\Installers\
@@ -54,14 +46,14 @@ environment:
 
 before_build:
   - development/java/Rubberduck.Parsing/Grammar/gradlew.bat -p development/java/Rubberduck.Parsing/Grammar clean build
-  - cinst innosetup -version 6.0.5
+  - cinst innosetup --version 6.0.5
   - cinst codecov
   - cinst opencover.portable
   - nuget restore RubberduckMeta.sln
   - nuget restore Rubberduck.sln
-build:
-  verbosity: minimal
-  project: Rubberduck.sln
+build_script:
+  - ps: msbuild "C:\projects\rubberduck\Rubberduck.sln" -property:"Version=$env:APPVEYOR_BUILD_VERSION" -verbosity:minimal -logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+ 
 
 # TestScript depends on the build matrix to only contain Release cpu
 # Otherwise we might run tests against artifacts that do not exist

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static IEnumerable<IToken> GetTokens(this ParserRuleContext context, Comm`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// <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.`
`48`	`48`	`/// </summary>`
`49`	`49`	`public static string GetText(this ParserRuleContext context, ICharStream stream)`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Rubberduck.Parsing`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`		`- /// Provide extensions on selections & contexts/tokens`
	`8`	`+ /// Provide extensions on selections and contexts/tokens`
`9`	`9`	`/// to assist in validating whether a selection contains`
`10`	`10`	`/// a given context or a token.`
`11`	`11`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void Parse(CancellationTokenSource token)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/// <summary>`
`37`		`- /// For the use of tests & reflection API only`
	`37`	`+ /// For the use of tests and reflection API only`
`38`	`38`	`/// </summary>`
`39`	`39`	`private void SetSavedCancellationTokenSource(CancellationTokenSource tokenSource)`
`40`	`40`	`{`