Skip to content
This repository was archived by the owner on Nov 16, 2017. It is now read-only.

Commit 93b061a

Browse files
sebastienrossebastienros
committed
Upgrading to Visual Studio 2010
1 parent 632a5b1 commit 93b061a

File tree

7 files changed

+136
-18
lines changed

7 files changed

+136
-18
lines changed

‎Evaluant.Calculator.Play/NCalc.Play.csproj

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,9 +12,26 @@
1112
<AssemblyName>Play</AssemblyName>
1213
<FileUpgradeFlags>
1314
</FileUpgradeFlags>
14-
<OldToolsVersion>2.0</OldToolsVersion>
15+
<OldToolsVersion>3.5</OldToolsVersion>
1516
<UpgradeBackupLocation>
1617
</UpgradeBackupLocation>
18+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
19+
<PublishUrl>publish\</PublishUrl>
20+
<Install>true</Install>
21+
<InstallFrom>Disk</InstallFrom>
22+
<UpdateEnabled>false</UpdateEnabled>
23+
<UpdateMode>Foreground</UpdateMode>
24+
<UpdateInterval>7</UpdateInterval>
25+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26+
<UpdatePeriodically>false</UpdatePeriodically>
27+
<UpdateRequired>false</UpdateRequired>
28+
<MapFileExtensions>true</MapFileExtensions>
29+
<ApplicationRevision>0</ApplicationRevision>
30+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31+
<IsWebBootstrapper>false</IsWebBootstrapper>
32+
<UseApplicationTrust>false</UseApplicationTrust>
33+
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
1735
</PropertyGroup>
1836
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1937
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +41,7 @@
2341
<DefineConstants>DEBUG;TRACE</DefineConstants>
2442
<ErrorReport>prompt</ErrorReport>
2543
<WarningLevel>4</WarningLevel>
44+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
2645
</PropertyGroup>
2746
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2847
<DebugType>pdbonly</DebugType>
@@ -31,6 +50,7 @@
3150
<DefineConstants>TRACE</DefineConstants>
3251
<ErrorReport>prompt</ErrorReport>
3352
<WarningLevel>4</WarningLevel>
53+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
3454
</PropertyGroup>
3555
<ItemGroup>
3656
<Reference Include="System" />
@@ -47,6 +67,23 @@
4767
<Name>NCalc</Name>
4868
</ProjectReference>
4969
</ItemGroup>
70+
<ItemGroup>
71+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
72+
<Visible>False</Visible>
73+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
74+
<Install>false</Install>
75+
</BootstrapperPackage>
76+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
77+
<Visible>False</Visible>
78+
<ProductName>.NET Framework 3.5 SP1</ProductName>
79+
<Install>true</Install>
80+
</BootstrapperPackage>
81+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
82+
<Visible>False</Visible>
83+
<ProductName>Windows Installer 3.1</ProductName>
84+
<Install>true</Install>
85+
</BootstrapperPackage>
86+
</ItemGroup>
5087
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
5188
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5289
Other similar extension points exist, see Microsoft.Common.targets.

‎Evaluant.Calculator.Tests/NCalc.Tests.csproj

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,9 +10,29 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>NCalc.Tests</RootNamespace>
1112
<AssemblyName>NCalc.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16+
<FileUpgradeFlags>
17+
</FileUpgradeFlags>
18+
<OldToolsVersion>3.5</OldToolsVersion>
19+
<UpgradeBackupLocation />
20+
<PublishUrl>publish\</PublishUrl>
21+
<Install>true</Install>
22+
<InstallFrom>Disk</InstallFrom>
23+
<UpdateEnabled>false</UpdateEnabled>
24+
<UpdateMode>Foreground</UpdateMode>
25+
<UpdateInterval>7</UpdateInterval>
26+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
27+
<UpdatePeriodically>false</UpdatePeriodically>
28+
<UpdateRequired>false</UpdateRequired>
29+
<MapFileExtensions>true</MapFileExtensions>
30+
<ApplicationRevision>0</ApplicationRevision>
31+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32+
<IsWebBootstrapper>false</IsWebBootstrapper>
33+
<UseApplicationTrust>false</UseApplicationTrust>
34+
<BootstrapperEnabled>true</BootstrapperEnabled>
35+
<TargetFrameworkProfile />
1536
</PropertyGroup>
1637
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1738
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +42,7 @@
2142
<DefineConstants>DEBUG;TRACE</DefineConstants>
2243
<ErrorReport>prompt</ErrorReport>
2344
<WarningLevel>4</WarningLevel>
45+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
2446
</PropertyGroup>
2547
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2648
<DebugType>pdbonly</DebugType>
@@ -29,13 +51,14 @@
2951
<DefineConstants>TRACE</DefineConstants>
3052
<ErrorReport>prompt</ErrorReport>
3153
<WarningLevel>4</WarningLevel>
54+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
3255
</PropertyGroup>
3356
<ItemGroup>
3457
<Reference Include="Antlr3.Runtime, Version=3.1.2.41038, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
3558
<SpecificVersion>False</SpecificVersion>
3659
<HintPath>..\Binaries\Antlr3.Runtime.dll</HintPath>
3760
</Reference>
38-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
61+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
3962
<Reference Include="System" />
4063
</ItemGroup>
4164
<ItemGroup>
@@ -48,6 +71,28 @@
4871
<Name>NCalc</Name>
4972
</ProjectReference>
5073
</ItemGroup>
74+
<ItemGroup>
75+
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
76+
<Visible>False</Visible>
77+
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
78+
<Install>true</Install>
79+
</BootstrapperPackage>
80+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
81+
<Visible>False</Visible>
82+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
83+
<Install>false</Install>
84+
</BootstrapperPackage>
85+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
86+
<Visible>False</Visible>
87+
<ProductName>.NET Framework 3.5 SP1</ProductName>
88+
<Install>false</Install>
89+
</BootstrapperPackage>
90+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
91+
<Visible>False</Visible>
92+
<ProductName>Windows Installer 3.1</ProductName>
93+
<Install>true</Install>
94+
</BootstrapperPackage>
95+
</ItemGroup>
5196
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
5297
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5398
Other similar extension points exist, see Microsoft.Common.targets.

‎Evaluant.Calculator/NCalc.csproj

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,9 +12,26 @@
1112
<AssemblyName>NCalc</AssemblyName>
1213
<FileUpgradeFlags>
1314
</FileUpgradeFlags>
14-
<OldToolsVersion>2.0</OldToolsVersion>
15+
<OldToolsVersion>3.5</OldToolsVersion>
1516
<UpgradeBackupLocation>
1617
</UpgradeBackupLocation>
18+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
19+
<PublishUrl>publish\</PublishUrl>
20+
<Install>true</Install>
21+
<InstallFrom>Disk</InstallFrom>
22+
<UpdateEnabled>false</UpdateEnabled>
23+
<UpdateMode>Foreground</UpdateMode>
24+
<UpdateInterval>7</UpdateInterval>
25+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26+
<UpdatePeriodically>false</UpdatePeriodically>
27+
<UpdateRequired>false</UpdateRequired>
28+
<MapFileExtensions>true</MapFileExtensions>
29+
<ApplicationRevision>0</ApplicationRevision>
30+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31+
<IsWebBootstrapper>false</IsWebBootstrapper>
32+
<UseApplicationTrust>false</UseApplicationTrust>
33+
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
1735
</PropertyGroup>
1836
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1937
<DebugSymbols>true</DebugSymbols>
@@ -24,6 +42,7 @@
2442
<ErrorReport>prompt</ErrorReport>
2543
<WarningLevel>4</WarningLevel>
2644
<UseVSHostingProcess>true</UseVSHostingProcess>
45+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
2746
</PropertyGroup>
2847
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2948
<DebugType>pdbonly</DebugType>
@@ -32,6 +51,7 @@
3251
<DefineConstants>TRACE</DefineConstants>
3352
<ErrorReport>prompt</ErrorReport>
3453
<WarningLevel>4</WarningLevel>
54+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
3555
</PropertyGroup>
3656
<ItemGroup>
3757
<Reference Include="Antlr3.Runtime, Version=3.3.0.7239, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -65,6 +85,23 @@
6585
<Compile Include="FunctionArgs.cs" />
6686
<Compile Include="Properties\AssemblyInfo.cs" />
6787
</ItemGroup>
88+
<ItemGroup>
89+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
90+
<Visible>False</Visible>
91+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
92+
<Install>false</Install>
93+
</BootstrapperPackage>
94+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
95+
<Visible>False</Visible>
96+
<ProductName>.NET Framework 3.5 SP1</ProductName>
97+
<Install>true</Install>
98+
</BootstrapperPackage>
99+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
100+
<Visible>False</Visible>
101+
<ProductName>Windows Installer 3.1</ProductName>
102+
<Install>true</Install>
103+
</BootstrapperPackage>
104+
</ItemGroup>
68105
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
69106
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
70107
Other similar extension points exist, see Microsoft.Common.targets.

‎Evaluant.Calculator/NCalcParser.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using NCalc.Domain;
1313
using System;
1414

15-
using System.Collections.Generic;
1615
using Antlr.Runtime;
1716
using Stack = System.Collections.Generic.Stack<object>;
1817
using List = System.Collections.IList;

‎LocalTestRun.testrunconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<TestRunConfiguration name="Local Test Run" id="2ac98c66-44ab-4803-aec6-5d9a148cece0" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TestRunConfiguration name="Local Test Run" id="2ac98c66-44ab-4803-aec6-5d9a148cece0" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
33
<Description>This is a default test run configuration for a local test run.</Description>
44
<TestTypeSpecific />
55
</TestRunConfiguration>

‎NCalc.20.vsmdi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
33
<TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
44
<RunConfiguration id="2ac98c66-44ab-4803-aec6-5d9a148cece0" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, PublicKeyToken=b03f5f7f11d50a3a" />
55
</TestList>

‎NCalc.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 10.00
3-
# Visual Studio 2008
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCalc", "Evaluant.Calculator\NCalc.csproj", "{5F014003-50D8-49E0-8AFE-91D38DCCC97C}"
5-
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCalc.Play", "Evaluant.Calculator.Play\NCalc.Play.csproj", "{4183699B-5B7E-4294-9807-9709BAD86477}"
7-
EndProject
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
84
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C27AD8D7-BE62-4A13-8857-368B555D3385}"
95
ProjectSection(SolutionItems) = preProject
106
LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
117
NCalc.20.vsmdi = NCalc.20.vsmdi
128
NCalc.vsmdi = NCalc.vsmdi
139
EndProjectSection
1410
EndProject
11+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCalc", "Evaluant.Calculator\NCalc.csproj", "{5F014003-50D8-49E0-8AFE-91D38DCCC97C}"
12+
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCalc.Play", "Evaluant.Calculator.Play\NCalc.Play.csproj", "{4183699B-5B7E-4294-9807-9709BAD86477}"
14+
EndProject
1515
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCalc.Tests", "Evaluant.Calculator.Tests\NCalc.Tests.csproj", "{F8E5E800-F842-4F84-A0C6-B3E1E5DB2BB4}"
1616
EndProject
1717
Global

0 commit comments

Comments
 (0)