Skip to content

Commit 41fe9a4

Browse files
davidpodholadavidpodhola
committed
going back to .NET 4.5.2
1 parent 315b790 commit 41fe9a4

File tree

8 files changed

+68
-44
lines changed

8 files changed

+68
-44
lines changed

‎src/UseCaseMaker/App.config

+25-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
4-
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<Paket>True</Paket>
7-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" />
9-
</dependentAssembly>
10-
</assemblyBinding></runtime></configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<Paket>True</Paket>
7+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8+
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
9+
<bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
10+
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
11+
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
12+
<bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
13+
<bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
14+
<bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
15+
<bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
16+
<bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
17+
<bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
18+
<bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
19+
<bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
20+
<bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
21+
</dependentAssembly>
22+
</assemblyBinding>
23+
</runtime>
24+
<startup>
25+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
26+
</startup>
27+
</configuration>

‎src/UseCaseMaker/UseCaseMaker.fsproj

+7-12
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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>UseCaseMaker</RootNamespace>
1111
<AssemblyName>UseCaseMaker</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
1414
<Name>UseCaseMaker</Name>
1515
<TargetFrameworkProfile />
@@ -67,6 +67,9 @@
6767
<Content Include="App.config" />
6868
</ItemGroup>
6969
<ItemGroup>
70+
<Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
71+
<Private>True</Private>
72+
</Reference>
7073
<Reference Include="mscorlib" />
7174
<Reference Include="System" />
7275
<Reference Include="System.Core" />
@@ -82,15 +85,7 @@
8285
</Reference>
8386
</ItemGroup>
8487
</When>
85-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
86-
<ItemGroup>
87-
<Reference Include="FSharp.Core">
88-
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
89-
<Private>True</Private>
90-
<Paket>True</Paket>
91-
</Reference>
92-
</ItemGroup>
93-
</When>
88+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')" />
9489
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
9590
<ItemGroup>
9691
<Reference Include="FSharp.Core">
@@ -137,4 +132,4 @@
137132
</ItemGroup>
138133
</When>
139134
</Choose>
140-
</Project>
135+
</Project>

‎src/UseCaseMakerApp/UseCaseMakerApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</FileUpgradeFlags>
2727
<UpgradeBackupLocation>
2828
</UpgradeBackupLocation>
29-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
29+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
3030
<OldToolsVersion>2.0</OldToolsVersion>
3131
<TargetFrameworkProfile />
3232
<IsWebBootstrapper>true</IsWebBootstrapper>

‎src/UseCaseMakerApp/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

‎src/UseCaseMakerControls/UseCaseMakerControls.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</FileUpgradeFlags>
2828
<UpgradeBackupLocation>
2929
</UpgradeBackupLocation>
30-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
30+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
3131
<OldToolsVersion>2.0</OldToolsVersion>
3232
<TargetFrameworkProfile />
3333
<PublishUrl>publish\</PublishUrl>

‎src/UseCaseMakerLibrary/UseCaseMakerLibrary.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</FileUpgradeFlags>
2828
<UpgradeBackupLocation>
2929
</UpgradeBackupLocation>
30-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
30+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
3131
<OldToolsVersion>2.0</OldToolsVersion>
3232
<TargetFrameworkProfile />
3333
<PublishUrl>publish\</PublishUrl>

‎tests/UseCaseMaker.Tests/App.config

+25-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
4-
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<Paket>True</Paket>
7-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" />
9-
</dependentAssembly>
10-
</assemblyBinding></runtime></configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<Paket>True</Paket>
7+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8+
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
9+
<bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
10+
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
11+
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
12+
<bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
13+
<bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
14+
<bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
15+
<bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
16+
<bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
17+
<bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
18+
<bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
19+
<bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
20+
<bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
21+
</dependentAssembly>
22+
</assemblyBinding>
23+
</runtime>
24+
<startup>
25+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
26+
</startup>
27+
</configuration>

‎tests/UseCaseMaker.Tests/UseCaseMaker.Tests.fsproj

+7-12
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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>UseCaseMaker.Tests</RootNamespace>
1111
<AssemblyName>UseCaseMaker.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
1414
<Name>UseCaseMaker.Tests</Name>
1515
<TargetFrameworkProfile />
@@ -68,6 +68,9 @@
6868
<Content Include="App.config" />
6969
</ItemGroup>
7070
<ItemGroup>
71+
<Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
72+
<Private>True</Private>
73+
</Reference>
7174
<Reference Include="mscorlib" />
7275
<Reference Include="System" />
7376
<Reference Include="System.Core" />
@@ -88,15 +91,7 @@
8891
</Reference>
8992
</ItemGroup>
9093
</When>
91-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
92-
<ItemGroup>
93-
<Reference Include="FSharp.Core">
94-
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
95-
<Private>True</Private>
96-
<Paket>True</Paket>
97-
</Reference>
98-
</ItemGroup>
99-
</When>
94+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')" />
10095
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
10196
<ItemGroup>
10297
<Reference Include="FSharp.Core">
@@ -150,4 +145,4 @@
150145
<Paket>True</Paket>
151146
</Reference>
152147
</ItemGroup>
153-
</Project>
148+
</Project>

0 commit comments

Comments
 (0)