Skip to content

Commit 7c1947e

Browse files
rasmusrasmus
committed
Update Paket targets
1 parent e0f354e commit 7c1947e

24 files changed

Lines changed: 62 additions & 37 deletions

File tree

‎.paket/paket.targets‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,62 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
34
<PropertyGroup>
45
<!-- Enable the restore command to run before builds -->
56
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6-
<!-- Download Paket.exe if it does not already exist -->
7-
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
87
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
98
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
109
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
1110
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
1211
</PropertyGroup>
12+
1313
<PropertyGroup>
1414
<!-- Paket command -->
15+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
1516
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
16-
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
1717
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
1818
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19-
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
20-
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
21-
<!-- Commands -->
22-
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
19+
</PropertyGroup>
20+
21+
<Choose> <!-- MyProject.fsproj.paket.references has the highest precedence -->
22+
<When Condition="Exists('$(MSBuildProjectFullPath).paket.references')">
23+
<PropertyGroup>
24+
<PaketReferences>$(MSBuildProjectFullPath).paket.references</PaketReferences>
25+
</PropertyGroup>
26+
</When> <!-- MyProject.paket.references -->
27+
<When Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')">
28+
<PropertyGroup>
29+
<PaketReferences>$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences>
30+
</PropertyGroup>
31+
</When> <!-- paket.references -->
32+
<When Condition="Exists('$(MSBuildProjectDirectory)\paket.references')">
33+
<PropertyGroup>
34+
<PaketReferences>$(MSBuildProjectDirectory)\paket.references</PaketReferences>
35+
</PropertyGroup>
36+
</When> <!-- Set to empty if a reference file isn't found matching one of the 3 format options -->
37+
<Otherwise>
38+
<PropertyGroup>
39+
<PaketReferences></PaketReferences>
40+
</PropertyGroup>
41+
</Otherwise>
42+
</Choose>
43+
44+
<PropertyGroup>
45+
<!-- Commands -->
46+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences>
47+
<PaketReferences Condition="!Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
2348
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
2449
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
2550
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
26-
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
2751
<!-- We need to ensure packages are restored prior to assembly resolve -->
2852
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
2953
</PropertyGroup>
30-
<Target Name="CheckPrerequisites">
31-
<!-- Raise an error if we're unable to locate paket.exe -->
32-
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
33-
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
34-
</Target>
35-
<Target Name="DownloadPaket">
36-
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
37-
</Target>
38-
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
39-
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
54+
<Target Name="RestorePackages">
55+
<Exec Command="$(RestoreCommand)"
56+
IgnoreStandardErrorWarningFormat="true"
57+
WorkingDirectory="$(PaketRootPath)"
58+
ContinueOnError="true"
59+
Condition=" Exists('$(PaketReferences)') AND '$(PaketReferences)' != '' "
60+
/>
4061
</Target>
4162
</Project>

‎Source/EventFlow.Autofac.Tests/EventFlow.Autofac.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<Target Name="AfterBuild">
7777
</Target>
7878
-->
79-
<Import Project="..\..\.paket\paket.targets" />
8079
<Choose>
8180
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
8281
<ItemGroup>
@@ -115,4 +114,5 @@
115114
</ItemGroup>
116115
</When>
117116
</Choose>
117+
<Import Project="..\..\.paket\paket.targets" />
118118
</Project>

‎Source/EventFlow.Autofac/EventFlow.Autofac.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<Target Name="AfterBuild">
6868
</Target>
6969
-->
70-
<Import Project="..\..\.paket\paket.targets" />
7170
<Choose>
7271
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
7372
<ItemGroup>
@@ -79,4 +78,5 @@
7978
</ItemGroup>
8079
</When>
8180
</Choose>
81+
<Import Project="..\..\.paket\paket.targets" />
8282
</Project>

‎Source/EventFlow.Elasticsearch.Tests/EventFlow.Elasticsearch.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<Target Name="AfterBuild">
8383
</Target>
8484
-->
85-
<Import Project="..\..\.paket\paket.targets" />
8685
<Choose>
8786
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
8887
<ItemGroup>
@@ -146,4 +145,5 @@
146145
</ItemGroup>
147146
</When>
148147
</Choose>
148+
<Import Project="..\..\.paket\paket.targets" />
149149
</Project>

‎Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<Target Name="AfterBuild">
7676
</Target>
7777
-->
78-
<Import Project="..\..\.paket\paket.targets" />
7978
<Choose>
8079
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
8180
<ItemGroup>
@@ -112,4 +111,5 @@
112111
</ItemGroup>
113112
</When>
114113
</Choose>
114+
<Import Project="..\..\.paket\paket.targets" />
115115
</Project>

‎Source/EventFlow.EventStores.EventStore.Tests/EventFlow.EventStores.EventStore.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<Target Name="AfterBuild">
7878
</Target>
7979
-->
80-
<Import Project="..\..\.paket\paket.targets" />
8180
<Choose>
8281
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
8382
<ItemGroup>
@@ -171,4 +170,5 @@
171170
</ItemGroup>
172171
</When>
173172
</Choose>
173+
<Import Project="..\..\.paket\paket.targets" />
174174
</Project>

‎Source/EventFlow.EventStores.EventStore/EventFlow.EventStores.EventStore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<Target Name="AfterBuild">
6767
</Target>
6868
-->
69-
<Import Project="..\..\.paket\paket.targets" />
7069
<Choose>
7170
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
7271
<ItemGroup>
@@ -89,4 +88,5 @@
8988
</ItemGroup>
9089
</When>
9190
</Choose>
91+
<Import Project="..\..\.paket\paket.targets" />
9292
</Project>

‎Source/EventFlow.Examples.Shipping.Tests/EventFlow.Examples.Shipping.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<Target Name="AfterBuild">
8181
</Target>
8282
-->
83-
<Import Project="..\..\.paket\paket.targets" />
8483
<Choose>
8584
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
8685
<ItemGroup>
@@ -152,4 +151,5 @@
152151
</ItemGroup>
153152
</When>
154153
</Choose>
154+
<Import Project="..\..\.paket\paket.targets" />
155155
</Project>

‎Source/EventFlow.Examples.Shipping/EventFlow.Examples.Shipping.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<Target Name="AfterBuild">
113113
</Target>
114114
-->
115-
<Import Project="..\..\.paket\paket.targets" />
116115
<Choose>
117116
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
118117
<ItemGroup>
@@ -124,4 +123,5 @@
124123
</ItemGroup>
125124
</When>
126125
</Choose>
126+
<Import Project="..\..\.paket\paket.targets" />
127127
</Project>

‎Source/EventFlow.Hangfire.Tests/EventFlow.Hangfire.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<Target Name="AfterBuild">
7575
</Target>
7676
-->
77-
<Import Project="..\..\.paket\paket.targets" />
7877
<Choose>
7978
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
8079
<ItemGroup>
@@ -223,4 +222,5 @@
223222
</ItemGroup>
224223
</When>
225224
</Choose>
225+
<Import Project="..\..\.paket\paket.targets" />
226226
</Project>

0 commit comments

Comments
 (0)