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

Commit eeca86b

Browse files
tachyus-ryantachyus-ryan
committed
Bump version to 0.8.0
1 parent 97b092a commit eeca86b

File tree

4 files changed

+121
-211
lines changed

4 files changed

+121
-211
lines changed

‎paket.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NUGET
22
remote: http://nuget.org/api/v2
33
specs:
4-
FAKE (3.5.11)
4+
FAKE (3.7.1)
55
FSharp.Compiler.Service (0.0.62)
66
FSharp.Formatting (2.4.25)
77
FSharp.Compiler.Service (>= 0.0.59)

‎src/Dyfrig.Net.Http/Dyfrig.Net.Http.fsproj

+58-54
Original file line numberDiff line numberDiff line change
@@ -79,66 +79,70 @@
7979
</ProjectReference>
8080
</ItemGroup>
8181
<Choose>
82-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
83-
<ItemGroup>
84-
<Reference Include="FSharpx.Core">
85-
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
86-
<Private>True</Private>
87-
<Paket>True</Paket>
88-
</Reference>
89-
</ItemGroup>
82+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
83+
<Choose>
84+
<When Condition="$(TargetFrameworkVersion) == 'v1.0'">
85+
</When>
86+
<When Condition="$(TargetFrameworkVersion) == 'v1.1'">
87+
</When>
88+
<When Condition="$(TargetFrameworkVersion) == 'v2.0'">
89+
</When>
90+
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
91+
<ItemGroup>
92+
<Reference Include="FSharpx.Core">
93+
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
94+
<Private>True</Private>
95+
<Paket>True</Paket>
96+
</Reference>
97+
</ItemGroup>
98+
</When>
99+
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
100+
<ItemGroup>
101+
<Reference Include="FSharpx.Core">
102+
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
103+
<Private>True</Private>
104+
<Paket>True</Paket>
105+
</Reference>
106+
</ItemGroup>
107+
</When>
108+
<Otherwise>
109+
<ItemGroup>
110+
<Reference Include="FSharpx.Core">
111+
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
112+
<Private>True</Private>
113+
<Paket>True</Paket>
114+
</Reference>
115+
</ItemGroup>
116+
</Otherwise>
117+
</Choose>
90118
</When>
91-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
92-
<ItemGroup>
93-
<Reference Include="FSharpx.Core">
94-
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
95-
<Private>True</Private>
96-
<Paket>True</Paket>
97-
</Reference>
98-
</ItemGroup>
119+
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'">
99120
</When>
100-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
101-
<ItemGroup>
102-
<Reference Include="FSharpx.Core">
103-
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
104-
<Private>True</Private>
105-
<Paket>True</Paket>
106-
</Reference>
107-
</ItemGroup>
121+
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
108122
</When>
109-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
110-
<ItemGroup>
111-
<Reference Include="FSharpx.Core">
112-
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
113-
<Private>True</Private>
114-
<Paket>True</Paket>
115-
</Reference>
116-
</ItemGroup>
117-
</When>
118-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
119-
<ItemGroup>
120-
<Reference Include="FSharpx.Core">
121-
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
122-
<Private>True</Private>
123-
<Paket>True</Paket>
124-
</Reference>
125-
</ItemGroup>
123+
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
126124
</When>
127125
</Choose>
128126
<Choose>
129-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
130-
<ItemGroup>
131-
<Reference Include="System.Net.Http.WebRequest">
132-
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
133-
<Private>True</Private>
134-
<Paket>True</Paket>
135-
</Reference>
136-
<Reference Include="System.Net.Http">
137-
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.dll</HintPath>
138-
<Private>True</Private>
139-
<Paket>True</Paket>
140-
</Reference>
141-
</ItemGroup>
127+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
128+
<Choose>
129+
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
130+
<ItemGroup>
131+
<Reference Include="System.Net.Http.WebRequest">
132+
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
133+
<Private>True</Private>
134+
<Paket>True</Paket>
135+
</Reference>
136+
<Reference Include="System.Net.Http">
137+
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.dll</HintPath>
138+
<Private>True</Private>
139+
<Paket>True</Paket>
140+
</Reference>
141+
</ItemGroup>
142+
</When>
143+
<Otherwise>
144+
</Otherwise>
145+
</Choose>
142146
</When>
143147
</Choose>
144148
</Project>

‎src/Dyfrig/Dyfrig.fsproj

+39-41
Original file line numberDiff line numberDiff line change
@@ -77,50 +77,48 @@
7777
-->
7878
<Import Project="$(SolutionDir)\.paket\paket.targets" />
7979
<Choose>
80-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
81-
<ItemGroup>
82-
<Reference Include="FSharpx.Core">
83-
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
84-
<Private>True</Private>
85-
<Paket>True</Paket>
86-
</Reference>
87-
</ItemGroup>
80+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
81+
<Choose>
82+
<When Condition="$(TargetFrameworkVersion) == 'v1.0'">
83+
</When>
84+
<When Condition="$(TargetFrameworkVersion) == 'v1.1'">
85+
</When>
86+
<When Condition="$(TargetFrameworkVersion) == 'v2.0'">
87+
</When>
88+
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
89+
<ItemGroup>
90+
<Reference Include="FSharpx.Core">
91+
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
92+
<Private>True</Private>
93+
<Paket>True</Paket>
94+
</Reference>
95+
</ItemGroup>
96+
</When>
97+
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
98+
<ItemGroup>
99+
<Reference Include="FSharpx.Core">
100+
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
101+
<Private>True</Private>
102+
<Paket>True</Paket>
103+
</Reference>
104+
</ItemGroup>
105+
</When>
106+
<Otherwise>
107+
<ItemGroup>
108+
<Reference Include="FSharpx.Core">
109+
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
110+
<Private>True</Private>
111+
<Paket>True</Paket>
112+
</Reference>
113+
</ItemGroup>
114+
</Otherwise>
115+
</Choose>
88116
</When>
89-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
90-
<ItemGroup>
91-
<Reference Include="FSharpx.Core">
92-
<HintPath>..\..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll</HintPath>
93-
<Private>True</Private>
94-
<Paket>True</Paket>
95-
</Reference>
96-
</ItemGroup>
117+
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'">
97118
</When>
98-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
99-
<ItemGroup>
100-
<Reference Include="FSharpx.Core">
101-
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
102-
<Private>True</Private>
103-
<Paket>True</Paket>
104-
</Reference>
105-
</ItemGroup>
119+
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
106120
</When>
107-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
108-
<ItemGroup>
109-
<Reference Include="FSharpx.Core">
110-
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
111-
<Private>True</Private>
112-
<Paket>True</Paket>
113-
</Reference>
114-
</ItemGroup>
115-
</When>
116-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
117-
<ItemGroup>
118-
<Reference Include="FSharpx.Core">
119-
<HintPath>..\..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll</HintPath>
120-
<Private>True</Private>
121-
<Paket>True</Paket>
122-
</Reference>
123-
</ItemGroup>
121+
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
124122
</When>
125123
</Choose>
126124
</Project>

‎tests/Dyfrig.Tests/Dyfrig.Tests.fsproj

+23-115
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<Reference Include="System" />
4848
<Reference Include="System.Core" />
4949
<Reference Include="System.Numerics" />
50+
<Reference Include="Unquote">
51+
<HintPath>..\..\packages\Unquote\lib\net40\Unquote.dll</HintPath>
52+
</Reference>
5053
</ItemGroup>
5154
<ItemGroup>
5255
<None Include="App.config" />
@@ -96,70 +99,7 @@
9699
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="&lt;dependentAssembly&gt;([\s]+.)&lt;assemblyIdentity name=&quot;FSharp\.Core&quot; publicKeyToken=&quot;b03f5f7f11d50a3a&quot; culture=&quot;neutral&quot; \/&gt;([\s\S]+?)&lt;\/dependentAssembly&gt;" RegexOptionList="IgnoreCase|Singleline" Replacement="&lt;dependentAssembly&gt;&#xD;&#xA; &lt;assemblyIdentity name=&quot;FSharp.Core&quot; publicKeyToken=&quot;b03f5f7f11d50a3a&quot; culture=&quot;neutral&quot; /&gt;&#xD;&#xA; &lt;bindingRedirect oldVersion=&quot;0.0.0.0-$(TargetFSharpCoreVersion)&quot; newVersion=&quot;$(TargetFSharpCoreVersion)&quot;/&gt;&#xD;&#xA; &lt;/dependentAssembly&gt;" Files="App.config" />
97100
</Target>
98101
<Choose>
99-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v1.0'">
100-
<ItemGroup>
101-
<Reference Include="Fuchu">
102-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
103-
<Private>True</Private>
104-
<Paket>True</Paket>
105-
</Reference>
106-
</ItemGroup>
107-
</When>
108-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v1.1'">
109-
<ItemGroup>
110-
<Reference Include="Fuchu">
111-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
112-
<Private>True</Private>
113-
<Paket>True</Paket>
114-
</Reference>
115-
</ItemGroup>
116-
</When>
117-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v2.0'">
118-
<ItemGroup>
119-
<Reference Include="Fuchu">
120-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
121-
<Private>True</Private>
122-
<Paket>True</Paket>
123-
</Reference>
124-
</ItemGroup>
125-
</When>
126-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
127-
<ItemGroup>
128-
<Reference Include="Fuchu">
129-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
130-
<Private>True</Private>
131-
<Paket>True</Paket>
132-
</Reference>
133-
</ItemGroup>
134-
</When>
135-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
136-
<ItemGroup>
137-
<Reference Include="Fuchu">
138-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
139-
<Private>True</Private>
140-
<Paket>True</Paket>
141-
</Reference>
142-
</ItemGroup>
143-
</When>
144-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
145-
<ItemGroup>
146-
<Reference Include="Fuchu">
147-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
148-
<Private>True</Private>
149-
<Paket>True</Paket>
150-
</Reference>
151-
</ItemGroup>
152-
</When>
153-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
154-
<ItemGroup>
155-
<Reference Include="Fuchu">
156-
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
157-
<Private>True</Private>
158-
<Paket>True</Paket>
159-
</Reference>
160-
</ItemGroup>
161-
</When>
162-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
102+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
163103
<ItemGroup>
164104
<Reference Include="Fuchu">
165105
<HintPath>..\..\packages\Fuchu\lib\Fuchu.dll</HintPath>
@@ -170,57 +110,25 @@
170110
</When>
171111
</Choose>
172112
<Choose>
173-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
174-
<ItemGroup>
175-
<Reference Include="System.Net.Http.WebRequest">
176-
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
177-
<Private>True</Private>
178-
<Paket>True</Paket>
179-
</Reference>
180-
<Reference Include="System.Net.Http">
181-
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.dll</HintPath>
182-
<Private>True</Private>
183-
<Paket>True</Paket>
184-
</Reference>
185-
</ItemGroup>
186-
</When>
187-
</Choose>
188-
<Choose>
189-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
190-
<ItemGroup>
191-
<Reference Include="Unquote">
192-
<HintPath>..\..\packages\Unquote\lib\net40\Unquote.dll</HintPath>
193-
<Private>True</Private>
194-
<Paket>True</Paket>
195-
</Reference>
196-
</ItemGroup>
197-
</When>
198-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
199-
<ItemGroup>
200-
<Reference Include="Unquote">
201-
<HintPath>..\..\packages\Unquote\lib\net40\Unquote.dll</HintPath>
202-
<Private>True</Private>
203-
<Paket>True</Paket>
204-
</Reference>
205-
</ItemGroup>
206-
</When>
207-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.1'">
208-
<ItemGroup>
209-
<Reference Include="Unquote">
210-
<HintPath>..\..\packages\Unquote\lib\net40\Unquote.dll</HintPath>
211-
<Private>True</Private>
212-
<Paket>True</Paket>
213-
</Reference>
214-
</ItemGroup>
215-
</When>
216-
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight' And $(SilverlightVersion) == 'v4.0'">
217-
<ItemGroup>
218-
<Reference Include="Unquote">
219-
<HintPath>..\..\packages\Unquote\lib\sl4\Unquote.dll</HintPath>
220-
<Private>True</Private>
221-
<Paket>True</Paket>
222-
</Reference>
223-
</ItemGroup>
113+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
114+
<Choose>
115+
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
116+
<ItemGroup>
117+
<Reference Include="System.Net.Http.WebRequest">
118+
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
119+
<Private>True</Private>
120+
<Paket>True</Paket>
121+
</Reference>
122+
<Reference Include="System.Net.Http">
123+
<HintPath>..\..\packages\Microsoft.Net.Http\lib\net40\System.Net.Http.dll</HintPath>
124+
<Private>True</Private>
125+
<Paket>True</Paket>
126+
</Reference>
127+
</ItemGroup>
128+
</When>
129+
<Otherwise>
130+
</Otherwise>
131+
</Choose>
224132
</When>
225133
</Choose>
226134
</Project>

0 commit comments

Comments
 (0)