Skip to content

Commit d600537

Browse files
ForNeVeRForNeVeR
committed
Convert the project to the latest available versions of .NET and F#.
1 parent 4530b50 commit d600537

7 files changed

Lines changed: 98 additions & 18 deletions

File tree

‎Naggum.Runtime/Naggum.Runtime.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Naggum.Runtime</RootNamespace>
1212
<AssemblyName>Naggum.Runtime</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<DefineConstants>DEBUG;TRACE</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
2931
<DefineConstants>TRACE</DefineConstants>
3032
<ErrorReport>prompt</ErrorReport>
3133
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
3235
</PropertyGroup>
3336
<ItemGroup>
3437
<Reference Include="System" />

‎Naggum.Test/Naggum.Test.fsproj‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>Naggum.Test</RootNamespace>
1111
<AssemblyName>Naggum.Test</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<Name>Naggum.Test</Name>
14+
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
15+
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
16+
<TargetFrameworkProfile />
1417
</PropertyGroup>
1518
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1619
<DebugSymbols>true</DebugSymbols>
@@ -31,15 +34,28 @@
3134
<WarningLevel>3</WarningLevel>
3235
<DocumentationFile>bin\Release\Naggum.Test.XML</DocumentationFile>
3336
</PropertyGroup>
34-
<Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
35-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
37+
<Choose>
38+
<When Condition="'$(VisualStudioVersion)' == '11.0'">
39+
<PropertyGroup>
40+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
41+
</PropertyGroup>
42+
</When>
43+
<Otherwise>
44+
<PropertyGroup>
45+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
46+
</PropertyGroup>
47+
</Otherwise>
48+
</Choose>
49+
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
3650
<ItemGroup>
3751
<Compile Include="CompilerTest.fs" />
3852
<None Include="packages.config" />
3953
</ItemGroup>
4054
<ItemGroup>
55+
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
56+
<Private>True</Private>
57+
</Reference>
4158
<Reference Include="mscorlib" />
42-
<Reference Include="FSharp.Core" />
4359
<Reference Include="nunit.framework">
4460
<HintPath>..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
4561
<Private>True</Private>

‎Naggum.sln‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
4-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ngc", "ngc\ngc.fsproj", "{A4269C5E-E4AC-44BF-A06E-1B45248910AD}"
5-
EndProject
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test programs", "Test programs", "{2972575D-A421-4759-AE89-57560E0224AE}"
77
ProjectSection(SolutionItems) = preProject
88
tests\comment.naggum = tests\comment.naggum
@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test programs", "Test progr
1111
tests\test.result = tests\test.result
1212
EndProjectSection
1313
EndProject
14+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ngc", "ngc\ngc.fsproj", "{A4269C5E-E4AC-44BF-A06E-1B45248910AD}"
15+
EndProject
1416
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Naggum.Runtime", "Naggum.Runtime\Naggum.Runtime.csproj", "{402B5E79-E063-4833-AE4B-2986AEEC1D75}"
1517
EndProject
1618
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ngi", "ngi\ngi.csproj", "{34E781DF-EAD9-4034-ADE4-8DA41A16644A}"
@@ -64,6 +66,7 @@ Global
6466
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6567
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
6668
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
69+
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
6770
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|x86.ActiveCfg = Debug|Any CPU
6871
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
6972
{38230CBD-DE3E-4470-925F-DE966E8691AA}.Release|Any CPU.Build.0 = Release|Any CPU

‎ngc/App.config‎

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

‎ngc/ngc.fsproj‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
<OutputType>Exe</OutputType>
1010
<RootNamespace>ngc</RootNamespace>
1111
<AssemblyName>ngc</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkProfile>
14+
</TargetFrameworkProfile>
1415
<Name>ngc</Name>
1516
<ReferencePath>
1617
</ReferencePath>
18+
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
19+
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1922
<DebugSymbols>true</DebugSymbols>
@@ -37,8 +40,19 @@
3740
<PlatformTarget>AnyCPU</PlatformTarget>
3841
<DocumentationFile>bin\Release\ngc.XML</DocumentationFile>
3942
</PropertyGroup>
40-
<Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
41-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
43+
<Choose>
44+
<When Condition="'$(VisualStudioVersion)' == '11.0'">
45+
<PropertyGroup>
46+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
47+
</PropertyGroup>
48+
</When>
49+
<Otherwise>
50+
<PropertyGroup>
51+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
52+
</PropertyGroup>
53+
</Otherwise>
54+
</Choose>
55+
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
4256
<ItemGroup>
4357
<Compile Include="Globals.fs" />
4458
<Compile Include="Reader.fs" />
@@ -61,8 +75,10 @@
6175
<Reference Include="FParsecCS">
6276
<HintPath>..\3rdparty\FParsecCS.dll</HintPath>
6377
</Reference>
78+
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
79+
<Private>True</Private>
80+
</Reference>
6481
<Reference Include="mscorlib" />
65-
<Reference Include="FSharp.Core" />
6682
<Reference Include="System" />
6783
<Reference Include="System.Core" />
6884
<Reference Include="System.Numerics" />
@@ -74,6 +90,11 @@
7490
<Private>True</Private>
7591
</ProjectReference>
7692
</ItemGroup>
93+
<ItemGroup>
94+
<Content Include="App.config">
95+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
96+
</Content>
97+
</ItemGroup>
7798
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7899
Other similar extension points exist, see Microsoft.Common.targets.
79100
<Target Name="BeforeBuild">

‎ngi/app.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎ngi/ngi.csproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ngi</RootNamespace>
1212
<AssemblyName>ngi</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
2324
<DefineConstants>DEBUG;TRACE</DefineConstants>
2425
<ErrorReport>prompt</ErrorReport>
2526
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
2628
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2830
<PlatformTarget>x86</PlatformTarget>
@@ -32,6 +34,7 @@
3234
<DefineConstants>TRACE</DefineConstants>
3335
<ErrorReport>prompt</ErrorReport>
3436
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
3538
</PropertyGroup>
3639
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3740
<DebugSymbols>true</DebugSymbols>
@@ -49,6 +52,7 @@
4952
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
5053
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
5154
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
55+
<Prefer32Bit>false</Prefer32Bit>
5256
</PropertyGroup>
5357
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
5458
<OutputPath>bin\Release\</OutputPath>
@@ -66,6 +70,7 @@
6670
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
6771
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
6872
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
73+
<Prefer32Bit>false</Prefer32Bit>
6974
</PropertyGroup>
7075
<ItemGroup>
7176
<Reference Include="System" />
@@ -86,6 +91,9 @@
8691
<Name>Naggum.Runtime</Name>
8792
</ProjectReference>
8893
</ItemGroup>
94+
<ItemGroup>
95+
<None Include="app.config" />
96+
</ItemGroup>
8997
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9098
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9199
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)