Fix some accidental ommisions and missed Sdk change

rubberduck-vba · Oct 23, 2019 · 9d36c04 · 9d36c04
1 parent e7fac99
commit 9d36c04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Rubberduck.Deployment/Rubberduck.Deployment.csproj b/Rubberduck.Deployment/Rubberduck.Deployment.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project>
   <PropertyGroup>
     <Product>Rubberduck.Deployment</Product>
     <Copyright>Copyright © 2018-2019</Copyright>

diff --git a/RubberduckBaseMetaProject.csproj b/RubberduckBaseMetaProject.csproj
@@ -16,15 +16,15 @@
     <!-- Ignore MSB4011 warning, rationale above -->
     <!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
     <DisabledWarnings>$(DisabledWarnings);4011;1001</DisabledWarnings>
-    <Version Condition=" '$(Version)' == ''">2.3.0</Version>
+    <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.3.*</AssemblyVersion>
+    <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>

diff --git a/RubberduckBaseProject.csproj b/RubberduckBaseProject.csproj
@@ -19,6 +19,19 @@
     <Version Condition=" '$(Version)' == ''">2.4.1</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.1.*</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>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" $(UnifyOutputPath) ">
     <OutputPath>bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>