Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Commit c4c7f20

Browse files
[KopiLua] Using targetFramework 4.5 to run tests.
1 parent 583ad23 commit c4c7f20

20 files changed

+11075
-46
lines changed

KopiLua.Net40.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KopiLua", "KopiLua\KopiLua.Net40.csproj", "{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}"
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KopiLua.Net40", "KopiLua\KopiLua.Net40.csproj", "{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}"
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lua", "Lua\Lua.csproj", "{1F39043F-11B4-4202-9B0A-6606FA7BB355}"
77
EndProject
@@ -33,6 +33,6 @@ Global
3333
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Release|Any CPU.Build.0 = Release|Any CPU
3434
EndGlobalSection
3535
GlobalSection(MonoDevelopProperties) = preSolution
36-
StartupItem = KopiLua.Net40.csproj
36+
StartupItem = Lua\Lua.csproj
3737
EndGlobalSection
3838
EndGlobal

KopiLua.Net45.sln

+21-3
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,39 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2012
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KopiLua.Net45", "KopiLua\KopiLua.Net45.csproj", "{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}"
55
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KopiLua.Tests", "KopiLua.Tests\KopiLua.Tests.csproj", "{9C7932E8-A045-4AE4-A3B4-9F4C44511087}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lua", "Lua\Lua.csproj", "{1F39043F-11B4-4202-9B0A-6606FA7BB355}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luac", "Luac\Luac.csproj", "{6962DD1F-A32D-4827-B5C5-DB1742CB4D48}"
11+
EndProject
612
Global
713
GlobalSection(SolutionConfigurationPlatforms) = preSolution
814
Debug|Any CPU = Debug|Any CPU
915
Release|Any CPU = Release|Any CPU
1016
EndGlobalSection
1117
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{1F39043F-11B4-4202-9B0A-6606FA7BB355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{1F39043F-11B4-4202-9B0A-6606FA7BB355}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{1F39043F-11B4-4202-9B0A-6606FA7BB355}.Release|Any CPU.ActiveCfg = Release|Any CPU
21+
{1F39043F-11B4-4202-9B0A-6606FA7BB355}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{6962DD1F-A32D-4827-B5C5-DB1742CB4D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{6962DD1F-A32D-4827-B5C5-DB1742CB4D48}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{6962DD1F-A32D-4827-B5C5-DB1742CB4D48}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{6962DD1F-A32D-4827-B5C5-DB1742CB4D48}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{9C7932E8-A045-4AE4-A3B4-9F4C44511087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{9C7932E8-A045-4AE4-A3B4-9F4C44511087}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{9C7932E8-A045-4AE4-A3B4-9F4C44511087}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{9C7932E8-A045-4AE4-A3B4-9F4C44511087}.Release|Any CPU.Build.0 = Release|Any CPU
1230
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1331
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
1432
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
1533
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Release|Any CPU.Build.0 = Release|Any CPU
1634
EndGlobalSection
35+
GlobalSection(MonoDevelopProperties) = preSolution
36+
StartupItem = KopiLua\KopiLua.Net45.csproj
37+
EndGlobalSection
1738
GlobalSection(SolutionProperties) = preSolution
1839
HideSolutionNode = FALSE
1940
EndGlobalSection
20-
GlobalSection(MonoDevelopProperties) = preSolution
21-
StartupItem = KopiLua.Net45.csproj
22-
EndGlobalSection
2341
EndGlobal

KopiLua.Tests/KopiLua.Tests.csproj

+11-12
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>
7-
</ProductVersion>
8-
<SchemaVersion>2.0</SchemaVersion>
96
<ProjectGuid>{9C7932E8-A045-4AE4-A3B4-9F4C44511087}</ProjectGuid>
107
<OutputType>Library</OutputType>
118
<AppDesignerFolder>Properties</AppDesignerFolder>
129
<RootNamespace>KopiLua.Tests</RootNamespace>
1310
<AssemblyName>KopiLua.Tests</AssemblyName>
1411
<FileAlignment>512</FileAlignment>
12+
<ReleaseVersion>1.0</ReleaseVersion>
13+
<SynchReleaseVersion>false</SynchReleaseVersion>
14+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>True</DebugSymbols>
@@ -32,20 +32,16 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="System" />
35-
<Reference Include="System.Core">
36-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
37-
</Reference>
35+
<Reference Include="System.Core" />
3836
<Reference Include="nunit.framework">
39-
<HintPath>..\lib\nunit\nunit.framework.dll</HintPath>
37+
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
4038
</Reference>
4139
</ItemGroup>
4240
<ItemGroup>
4341
<Compile Include="..\tests\core.cs">
4442
<Link>core.cs</Link>
4543
</Compile>
46-
</ItemGroup>
47-
<ItemGroup>
48-
<None Include="packages.config" />
44+
<Compile Include="Properties\AssemblyInfo.cs" />
4945
</ItemGroup>
5046
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
5147
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -59,9 +55,12 @@
5955
<Folder Include="Properties\" />
6056
</ItemGroup>
6157
<ItemGroup>
62-
<ProjectReference Include="..\KopiLua\KopiLua.Net40.csproj">
58+
<None Include="packages.config" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<ProjectReference Include="..\KopiLua\KopiLua.Net45.csproj">
6362
<Project>{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}</Project>
64-
<Name>KopiLua.Net40</Name>
63+
<Name>KopiLua.Net45</Name>
6564
</ProjectReference>
6665
</ItemGroup>
6766
</Project>
+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
using System;
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("KopiLuaTests")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("KopiLuaTests")]
13+
[assembly: AssemblyCopyright("Copyright © 2014")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
[assembly: CLSCompliantAttribute (true)]
17+
18+
// Setting ComVisible to false makes the types in this assembly not visible
19+
// to COM components. If you need to access a type in this assembly from
20+
// COM, set the ComVisible attribute to true on that type.
21+
[assembly: ComVisible(false)]
22+
23+
// The following GUID is for the ID of the typelib if this project is exposed to COM
24+
[assembly: Guid("42f29677-47be-4860-a332-c7c4c75b7119")]
25+
26+
// Version information for an assembly consists of the following four values:
27+
//
28+
// Major Version
29+
// Minor Version
30+
// Build Number
31+
// Revision
32+
//
33+
// You can specify all the values or you can default the Build and Revision Numbers
34+
// by using the '*' as shown below:
35+
// [assembly: AssemblyVersion("1.0.*")]
36+
[assembly: AssemblyVersion("1.0.*")]
37+
[assembly: AssemblyFileVersion("1.0.0.0")]

KopiLua.Tests/packages.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="NUnit" version="2.6.2" targetFramework="net40" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="2.6.3" targetFramework="net40" />
44
</packages>

KopiLua/KopiLua.Net40.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
6+
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}</ProjectGuid>
99
<OutputType>Library</OutputType>
@@ -31,7 +31,6 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
<ReleaseVersion>2.x</ReleaseVersion>
3534
<TargetFrameworkProfile />
3635
</PropertyGroup>
3736
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

KopiLua/KopiLua.Net45.csproj

-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}</ProjectGuid>
97
<OutputType>Library</OutputType>
108
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -31,7 +29,6 @@
3129
<IsWebBootstrapper>false</IsWebBootstrapper>
3230
<UseApplicationTrust>false</UseApplicationTrust>
3331
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
<ReleaseVersion>2.x</ReleaseVersion>
3532
<TargetFrameworkProfile />
3633
</PropertyGroup>
3734
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

KopiLua/Properties/AssemblyInfo_KopiLua.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("")]
1313
[assembly: AssemblyProduct("KopiLua")]
14-
[assembly: AssemblyCopyright("Copyright © 2013")]
14+
[assembly: AssemblyCopyright("Copyright © 2014")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
1717
[assembly: CLSCompliantAttribute(true)]

KopiLua/Properties/AssemblyInfo_KopiLua_wp7.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
[assembly: AssemblyTitle("KopiLua_wp7")]
1010
[assembly: AssemblyDescription("")]
1111
[assembly: AssemblyConfiguration("")]
12-
[assembly: AssemblyCompany("MICROSOFT")]
12+
[assembly: AssemblyCompany("Microsoft")]
1313
[assembly: AssemblyProduct("KopiLua_wp7")]
14-
[assembly: AssemblyCopyright("Copyright © 2012 Gerasimov Sergey")]
14+
[assembly: AssemblyCopyright("Copyright © 2014 Gerasimov Sergey")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
1717

Lua/Lua.csproj

+9-12
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{1F39043F-11B4-4202-9B0A-6606FA7BB355}</ProjectGuid>
97
<OutputType>Exe</OutputType>
108
<AppDesignerFolder>Properties</AppDesignerFolder>
119
<RootNamespace>Lua</RootNamespace>
1210
<AssemblyName>Lua</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1412
<FileAlignment>512</FileAlignment>
1513
<FileUpgradeFlags>
1614
</FileUpgradeFlags>
@@ -42,6 +40,7 @@
4240
<ErrorReport>prompt</ErrorReport>
4341
<WarningLevel>4</WarningLevel>
4442
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
43+
<Externalconsole>true</Externalconsole>
4544
</PropertyGroup>
4645
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4746
<Optimize>True</Optimize>
@@ -54,9 +53,7 @@
5453
<ItemGroup>
5554
<Reference Include="Accessibility" />
5655
<Reference Include="System" />
57-
<Reference Include="System.Core">
58-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
59-
</Reference>
56+
<Reference Include="System.Core" />
6057
<Reference Include="System.Data" />
6158
</ItemGroup>
6259
<ItemGroup>
@@ -83,12 +80,6 @@
8380
<ItemGroup>
8481
<None Include="app.config" />
8582
</ItemGroup>
86-
<ItemGroup>
87-
<ProjectReference Include="..\KopiLua\KopiLua.Net40.csproj">
88-
<Project>{e8ddbc21-ef74-4aba-9c49-bfc702be25d8}</Project>
89-
<Name>KopiLua.Net40</Name>
90-
</ProjectReference>
91-
</ItemGroup>
9283
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9384
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9485
Other similar extension points exist, see Microsoft.Common.targets.
@@ -101,4 +92,10 @@
10192
<PostBuildEvent>
10293
</PostBuildEvent>
10394
</PropertyGroup>
95+
<ItemGroup>
96+
<ProjectReference Include="..\KopiLua\KopiLua.Net45.csproj">
97+
<Project>{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}</Project>
98+
<Name>KopiLua.Net45</Name>
99+
</ProjectReference>
100+
</ItemGroup>
104101
</Project>

Lua/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Lua")]
13-
[assembly: AssemblyCopyright("Copyright © 2012 LoDC")]
13+
[assembly: AssemblyCopyright("Copyright © 2014")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616
[assembly: CLSCompliantAttribute (true)]

Luac/Luac.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{6962DD1F-A32D-4827-B5C5-DB1742CB4D48}</ProjectGuid>
97
<OutputType>Exe</OutputType>
108
<AppDesignerFolder>Properties</AppDesignerFolder>
119
<RootNamespace>Luac</RootNamespace>
1210
<AssemblyName>Luac</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1412
<FileAlignment>512</FileAlignment>
1513
<FileUpgradeFlags>
1614
</FileUpgradeFlags>

Luac/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("")]
1313
[assembly: AssemblyProduct("Luac")]
14-
[assembly: AssemblyCopyright("Copyright © 2012 LoDC")]
14+
[assembly: AssemblyCopyright("Copyright © 2014")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
1717
[assembly: CLSCompliantAttribute (true)]
96.2 KB
Binary file not shown.
148 KB
Binary file not shown.

0 commit comments

Comments
 (0)