Skip to content
This repository was archived by the owner on Jun 22, 2023. It is now read-only.

Commit 0a880f5

Browse files
committed
Attempt to fix Travis CI
1 parent c49d2f1 commit 0a880f5

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,4 @@ FakesAssemblies/
187187

188188
*.vs/
189189
*.old
190-
*.json.lock
190+
*.lock.json

GeoAPI.Pcl/GeoAPI.Pcl.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<DebugType>pdbonly</DebugType>
3131
<Optimize>true</Optimize>
3232
<OutputPath>..\Release\PCL\AnyCPU\</OutputPath>
33-
<DefineConstants>TRACE;PCL</DefineConstants>
33+
<DefineConstants>TRACE;PCL;NET45</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
3636
<DocumentationFile>..\Release\PCL\AnyCPU\GeoAPI.xml</DocumentationFile>
@@ -43,7 +43,7 @@
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CIBuild|AnyCPU'">
4545
<OutputPath>bin\CIBuild\</OutputPath>
46-
<DefineConstants>TRACE;PCL</DefineConstants>
46+
<DefineConstants>TRACE;PCL;NET45</DefineConstants>
4747
<DocumentationFile>..\Release\PCL\AnyCPU\GeoAPI.xml</DocumentationFile>
4848
<Optimize>true</Optimize>
4949
<DebugType>pdbonly</DebugType>

TeamCity.targets

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,31 @@
5959
<RemoveDir Directories="$(MSBuildThisFileDirectory)obj\v4.5" ContinueOnError="true"/>
6060
<MSBuild Projects="$(SolutionFile)"
6161
Targets="GeoAPI"
62-
Properties="Configuration=Release;TargetFrameworkVersion=v4.5;TargetFrameworkProfile=;DefineConstants=TRACE;NET20;NET35;NET40;BaseIntermediateOutputPath=$(MSBuildThisFileDirectory)obj\v4.5\"
62+
Properties="Configuration=Release;TargetFrameworkVersion=v4.5;TargetFrameworkProfile=;DefineConstants=TRACE;NET20;NET35;NET40;NET45;BaseIntermediateOutputPath=$(MSBuildThisFileDirectory)obj\v4.5\"
6363
RunEachTargetSeparately="true"
6464
ContinueOnError="true"
6565
/>
6666
</Target>
67-
<Target Name="BuildReleasePCL">
67+
<Target Name="BuildReleasePCL40">
6868
<RemoveDir Directories="$(MSBuildThisFileDirectory)obj\PCL" ContinueOnError="true"/>
6969
<MSBuild Projects="$(SolutionFile)"
7070
Targets="GeoAPI_PCL"
71-
Properties="Configuration=Release;TargetFrameworkVersion=v4.0;TargetFrameworkProfile=Profile336;DefineConstants=TRACE;PCL;BaseIntermediateOutputPath=$(MSBuildThisFileDirectory)obj\PCL\"
71+
Properties="Configuration=Release;TargetFrameworkVersion=v4.0;TargetFrameworkProfile=Profile328;DefineConstants=TRACE;PCL40;BaseIntermediateOutputPath=$(MSBuildThisFileDirectory)obj\PCL40\"
7272
RunEachTargetSeparately="true"
7373
ContinueOnError="true"
7474
/>
7575
</Target>
7676

77+
<Target Name="BuildReleasePCL">
78+
<RemoveDir Directories="$(MSBuildThisFileDirectory)obj\PCL" ContinueOnError="true"/>
79+
<MSBuild Projects="$(SolutionFile)"
80+
Targets="GeoAPI_PCL"
81+
Properties="Configuration=Release;TargetFrameworkVersion=v4.5;TargetFrameworkProfile=Profile259;DefineConstants=TRACE;PCL;NET45;BaseIntermediateOutputPath=$(MSBuildThisFileDirectory)obj\PCL\"
82+
RunEachTargetSeparately="true"
83+
ContinueOnError="true"
84+
/>
85+
</Target>
86+
7787
<Target Name="BuildRelease" DependsOnTargets="BuildRelease20;BuildRelease35;BuildRelease40;BuildRelease403;BuildRelease45;BuildReleasePCL"/>
7888

7989
<Target Name="NuGetPack" DependsOnTargets="BuildRelease">

0 commit comments

Comments
 (0)