Skip to content

Commit d63a5ef

Browse files
committed
Patch csproj versions through appveyor
Drop XML preamble in shared project file to make sure the first line is the root "Project" declaration. Add Sdk to base project declaration, provoking MSB4011, but fixing version patching.
1 parent b6259f1 commit d63a5ef

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

RubberduckBaseProject.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project>
3-
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<!-- We're specifying the Sdk here to make appveyor happy, but this generates warning MSB4011 -->
43
<PropertyGroup>
54
<OutputType>Library</OutputType>
65
<Company>Rubberduck-VBA</Company>
@@ -17,13 +16,13 @@
1716
<UnifyOutputPath Condition=" '$(UnifyOutputPath)' == ''">false</UnifyOutputPath>
1817
</PropertyGroup>
1918

20-
<PropertyGroup Condition=" '$(AssemblyVersion)' == ''">
19+
<PropertyGroup Condition=" '$(Version)' == ''">
20+
<Version>2.2.0</Version>
2121
<!--
2222
This assembly version specification is considered nonstandard.
2323
As such builds that do not override the assembly version generate a warning.
2424
-->
25-
<AssemblyVersion>2.2.*</AssemblyVersion>
26-
<FileVersion Condition=" '$(FileVersion)' == '' ">2.2.*</FileVersion>
25+
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">2.2.*</AssemblyVersion>
2726
<!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
2827
<Deterministic>False</Deterministic>
2928
</PropertyGroup>
@@ -61,4 +60,4 @@
6160
</Target>
6261
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
6362

64-
</Project>
63+
</Project>

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ install:
3838
set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%
3939

4040
# patch version specifiers in the base project
41-
# also patch version specifier in Core that's fixed to deal with XAML generated code
4241
dotnet_csproj:
4342
patch: true
44-
file: 'RubberduckBaseProject.csproj;*\Rubberduck.Core.csproj'
43+
# patch version specifier in Core that's non-wildcard to deal with XAML generated code?
44+
file: 'RubberduckBaseProject.csproj' # ;*\Rubberduck.Core.csproj'
4545
version: '{version}'
4646
assembly_version: '{version}'
47-
file_version: '{version}'
48-
informational_version: '{version}'
47+
#file_version: '{version}'
48+
#informational_version: '{version}'
4949

5050

5151
before_build:

0 commit comments

Comments
 (0)