Skip to content

Commit 80242c4

Browse files
ademarademar
authored
Merge pull request #566 from SuaveIO/downgrade-to-4.6
downgrade to 4.6
2 parents afe62de + f89ceb8 commit 80242c4

File tree

26 files changed

+183
-185
lines changed

26 files changed

+183
-185
lines changed

‎docs/server/server.fsproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,7 +7,7 @@
77
<OutputType>Exe</OutputType>
88
<RootNamespace>server</RootNamespace>
99
<AssemblyName>server</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1111
<ResolveNuGetPackages>false</ResolveNuGetPackages>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -65,7 +65,7 @@
6565
</ProjectReference>
6666
</ItemGroup>
6767
<Choose>
68-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
68+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
6969
<ItemGroup>
7070
<Reference Include="Argu">
7171
<HintPath>..\..\packages\docs\Argu\lib\net40\Argu.dll</HintPath>
@@ -76,7 +76,7 @@
7676
</When>
7777
</Choose>
7878
<Choose>
79-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
79+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
8080
<ItemGroup>
8181
<Reference Include="FSharp.Core">
8282
<HintPath>..\..\packages\docs\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -86,4 +86,4 @@
8686
</ItemGroup>
8787
</When>
8888
</Choose>
89-
</Project>
89+
</Project>

‎examples/Asp.NET/Asp.NET.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -102,7 +102,7 @@
102102
</ProjectReference>
103103
</ItemGroup>
104104
<Choose>
105-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
105+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
106106
<ItemGroup>
107107
<Reference Include="FSharp.Core">
108108
<HintPath>..\..\packages\examples\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -112,4 +112,4 @@
112112
</ItemGroup>
113113
</When>
114114
</Choose>
115-
</Project>
115+
</Project>

‎examples/Example/Example.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -117,7 +117,7 @@
117117
</Choose>
118118
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
119119
<Choose>
120-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
120+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
121121
<ItemGroup>
122122
<Reference Include="FSharp.Core">
123123
<HintPath>..\..\packages\examples\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -127,4 +127,4 @@
127127
</ItemGroup>
128128
</When>
129129
</Choose>
130-
</Project>
130+
</Project>

‎examples/Fibonacci/Fibonacci.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -93,7 +93,7 @@
9393
</ProjectReference>
9494
</ItemGroup>
9595
<Choose>
96-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
96+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
9797
<ItemGroup>
9898
<Reference Include="FSharp.Core">
9999
<HintPath>..\..\packages\examples\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -103,4 +103,4 @@
103103
</ItemGroup>
104104
</When>
105105
</Choose>
106-
</Project>
106+
</Project>

‎examples/Freya/Freya.fsproj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,7 +7,7 @@
77
<OutputType>Exe</OutputType>
88
<RootNamespace>Freya</RootNamespace>
99
<AssemblyName>Freya</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1111
<ResolveNuGetPackages>false</ResolveNuGetPackages>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -68,7 +68,7 @@
6868
<Content Include="App.config" />
6969
</ItemGroup>
7070
<Choose>
71-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
71+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
7272
<ItemGroup>
7373
<Reference Include="Aether">
7474
<HintPath>..\..\packages\examples\Aether\lib\net35\Aether.dll</HintPath>
@@ -79,7 +79,7 @@
7979
</When>
8080
</Choose>
8181
<Choose>
82-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
82+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
8383
<ItemGroup>
8484
<Reference Include="Arachne.Core">
8585
<HintPath>..\..\packages\examples\Arachne.Core\lib\net40\Arachne.Core.dll</HintPath>
@@ -90,7 +90,7 @@
9090
</When>
9191
</Choose>
9292
<Choose>
93-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
93+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
9494
<ItemGroup>
9595
<Reference Include="Arachne.Http">
9696
<HintPath>..\..\packages\examples\Arachne.Http\lib\net40\Arachne.Http.dll</HintPath>
@@ -101,7 +101,7 @@
101101
</When>
102102
</Choose>
103103
<Choose>
104-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
104+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
105105
<ItemGroup>
106106
<Reference Include="Arachne.Http.Cors">
107107
<HintPath>..\..\packages\examples\Arachne.Http.Cors\lib\net40\Arachne.Http.Cors.dll</HintPath>
@@ -112,7 +112,7 @@
112112
</When>
113113
</Choose>
114114
<Choose>
115-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
115+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
116116
<ItemGroup>
117117
<Reference Include="Arachne.Language">
118118
<HintPath>..\..\packages\examples\Arachne.Language\lib\net40\Arachne.Language.dll</HintPath>
@@ -123,7 +123,7 @@
123123
</When>
124124
</Choose>
125125
<Choose>
126-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
126+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
127127
<ItemGroup>
128128
<Reference Include="Arachne.Uri">
129129
<HintPath>..\..\packages\examples\Arachne.Uri\lib\net40\Arachne.Uri.dll</HintPath>
@@ -134,7 +134,7 @@
134134
</When>
135135
</Choose>
136136
<Choose>
137-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
137+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
138138
<ItemGroup>
139139
<Reference Include="Arachne.Uri.Template">
140140
<HintPath>..\..\packages\examples\Arachne.Uri.Template\lib\net40\Arachne.Uri.Template.dll</HintPath>
@@ -145,7 +145,7 @@
145145
</When>
146146
</Choose>
147147
<Choose>
148-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
148+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
149149
<ItemGroup>
150150
<Reference Include="FParsec">
151151
<HintPath>..\..\packages\examples\FParsec\lib\net40-client\FParsec.dll</HintPath>
@@ -161,7 +161,7 @@
161161
</When>
162162
</Choose>
163163
<Choose>
164-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
164+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
165165
<ItemGroup>
166166
<Reference Include="Freya.Core">
167167
<HintPath>..\..\packages\examples\Freya.Core\lib\net45\Freya.Core.dll</HintPath>
@@ -172,7 +172,7 @@
172172
</When>
173173
</Choose>
174174
<Choose>
175-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
175+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
176176
<ItemGroup>
177177
<Reference Include="Freya.Lenses.Http">
178178
<HintPath>..\..\packages\examples\Freya.Lenses.Http\lib\net45\Freya.Lenses.Http.dll</HintPath>
@@ -183,7 +183,7 @@
183183
</When>
184184
</Choose>
185185
<Choose>
186-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
186+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
187187
<ItemGroup>
188188
<Reference Include="Freya.Lenses.Http.Cors">
189189
<HintPath>..\..\packages\examples\Freya.Lenses.Http.Cors\lib\net45\Freya.Lenses.Http.Cors.dll</HintPath>
@@ -194,7 +194,7 @@
194194
</When>
195195
</Choose>
196196
<Choose>
197-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
197+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
198198
<ItemGroup>
199199
<Reference Include="Freya.Machine">
200200
<HintPath>..\..\packages\examples\Freya.Machine\lib\net45\Freya.Machine.dll</HintPath>
@@ -205,7 +205,7 @@
205205
</When>
206206
</Choose>
207207
<Choose>
208-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
208+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
209209
<ItemGroup>
210210
<Reference Include="Freya.Machine.Extensions.Http">
211211
<HintPath>..\..\packages\examples\Freya.Machine.Extensions.Http\lib\net45\Freya.Machine.Extensions.Http.dll</HintPath>
@@ -216,7 +216,7 @@
216216
</When>
217217
</Choose>
218218
<Choose>
219-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
219+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
220220
<ItemGroup>
221221
<Reference Include="Freya.Machine.Extensions.Http.Cors">
222222
<HintPath>..\..\packages\examples\Freya.Machine.Extensions.Http.Cors\lib\net45\Freya.Machine.Extensions.Http.Cors.dll</HintPath>
@@ -227,7 +227,7 @@
227227
</When>
228228
</Choose>
229229
<Choose>
230-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
230+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
231231
<ItemGroup>
232232
<Reference Include="Freya.Machine.Router">
233233
<HintPath>..\..\packages\examples\Freya.Machine.Router\lib\net45\Freya.Machine.Router.dll</HintPath>
@@ -238,7 +238,7 @@
238238
</When>
239239
</Choose>
240240
<Choose>
241-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
241+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
242242
<ItemGroup>
243243
<Reference Include="Freya.Recorder">
244244
<HintPath>..\..\packages\examples\Freya.Recorder\lib\net45\Freya.Recorder.dll</HintPath>
@@ -249,7 +249,7 @@
249249
</When>
250250
</Choose>
251251
<Choose>
252-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
252+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
253253
<ItemGroup>
254254
<Reference Include="Freya.Router">
255255
<HintPath>..\..\packages\examples\Freya.Router\lib\net45\Freya.Router.dll</HintPath>
@@ -260,7 +260,7 @@
260260
</When>
261261
</Choose>
262262
<Choose>
263-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
263+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
264264
<ItemGroup>
265265
<Reference Include="FSharp.Core">
266266
<HintPath>..\..\packages\examples\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -271,7 +271,7 @@
271271
</When>
272272
</Choose>
273273
<Choose>
274-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
274+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
275275
<ItemGroup>
276276
<Reference Include="Hekate">
277277
<HintPath>..\..\packages\examples\Hekate\lib\net35\Hekate.dll</HintPath>
@@ -281,4 +281,4 @@
281281
</ItemGroup>
282282
</When>
283283
</Choose>
284-
</Project>
284+
</Project>

‎examples/IdentityServerIntegration/IndentityServerIntegration.fsproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,7 +9,7 @@
99
<OutputType>Exe</OutputType>
1010
<RootNamespace>Suave.IdentityServer</RootNamespace>
1111
<AssemblyName>IdentityServerIntegration</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
<ResolveNuGetPackages>false</ResolveNuGetPackages>
@@ -76,7 +76,7 @@
7676
</ProjectReference>
7777
</ItemGroup>
7878
<Choose>
79-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
79+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
8080
<ItemGroup>
8181
<Reference Include="FSharp.Core">
8282
<HintPath>..\..\packages\examples\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -87,7 +87,7 @@
8787
</When>
8888
</Choose>
8989
<Choose>
90-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
90+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
9191
<ItemGroup>
9292
<Reference Include="IdentityServer3">
9393
<HintPath>..\..\packages\examples\IdentityServer3\lib\net45\IdentityServer3.dll</HintPath>
@@ -98,7 +98,7 @@
9898
</When>
9999
</Choose>
100100
<Choose>
101-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
101+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
102102
<ItemGroup>
103103
<Reference Include="Microsoft.Owin">
104104
<HintPath>..\..\packages\examples\Microsoft.Owin\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -109,7 +109,7 @@
109109
</When>
110110
</Choose>
111111
<Choose>
112-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
112+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
113113
<ItemGroup>
114114
<Reference Include="Owin">
115115
<HintPath>..\..\packages\examples\Owin\lib\net40\Owin.dll</HintPath>
@@ -119,4 +119,4 @@
119119
</ItemGroup>
120120
</When>
121121
</Choose>
122-
</Project>
122+
</Project>

0 commit comments

Comments
 (0)