Skip to content

Commit b099fb8

Browse files
Daniel15Daniel15
committed
Convert to project.json / .xproj files, for preparation for .NET Core build.
1 parent e88cefe commit b099fb8

20 files changed

+135
-326
lines changed

‎src/JSPool.Example.Console/JSPool.Example.Console.csproj

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎src/JSPool.Example.Console/JSPool.Example.Console.xproj

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
9+
<PropertyGroup Label="Globals">
10+
<ProjectGuid>d15f97fe-b55c-4e0f-ac7b-cbb4f80ca338</ProjectGuid>
11+
<RootNamespace>JSPool.Example.Console</RootNamespace>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
14+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
15+
</PropertyGroup>
16+
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>

‎src/JSPool.Example.Console/packages.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/JSPool.Example.Console/project.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "1.0.0-*",
3+
"buildOptions": {
4+
"emitEntryPoint": true
5+
},
6+
7+
"dependencies": {
8+
"JavaScriptEngineSwitcher.Msie": "1.5.4",
9+
"JSPool": {
10+
"target": "project"
11+
},
12+
"MsieJavaScriptEngine": "1.7.2"
13+
},
14+
15+
"frameworks": {
16+
"net40": {
17+
}
18+
}
19+
}

‎src/JSPool.Example.Web/JSPool.Example.Web.csproj

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Reference Include="ClearScript, Version=5.4.5.0, Culture=neutral, PublicKeyToken=935d0c957da47c73, processorArchitecture=MSIL">
49-
<HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.5.2\lib\net40\ClearScript.dll</HintPath>
50-
<Private>True</Private>
51-
</Reference>
5248
<Reference Include="JavaScriptEngineSwitcher.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
5349
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.5.0\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
5450
<Private>True</Private>
@@ -57,9 +53,9 @@
5753
<HintPath>..\packages\JavaScriptEngineSwitcher.Msie.1.5.0\lib\net40\JavaScriptEngineSwitcher.Msie.dll</HintPath>
5854
<Private>True</Private>
5955
</Reference>
60-
<Reference Include="JavaScriptEngineSwitcher.V8, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
61-
<HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.5.2\lib\net40\JavaScriptEngineSwitcher.V8.dll</HintPath>
62-
<Private>True</Private>
56+
<Reference Include="JSPool, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>..\JSPool\bin\Debug\net40\JSPool.dll</HintPath>
6359
</Reference>
6460
<Reference Include="Microsoft.CSharp" />
6561
<Reference Include="Microsoft.Web.Infrastructure">
@@ -146,12 +142,6 @@
146142
<ItemGroup>
147143
<Folder Include="App_Data\" />
148144
</ItemGroup>
149-
<ItemGroup>
150-
<ProjectReference Include="..\JSPool\JSPool.csproj">
151-
<Project>{ca552a03-a2f1-4f37-b872-2572ba24d669}</Project>
152-
<Name>JSPool</Name>
153-
</ProjectReference>
154-
</ItemGroup>
155145
<PropertyGroup>
156146
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
157147
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

‎src/JSPool.Tests/JSPool.Tests.csproj

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/JSPool.Tests/packages.config

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/JSPool.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSPool", "JSPool\JSPool.csproj", "{CA552A03-A2F1-4F37-B872-2572BA24D669}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSPool.Tests", "JSPool.Tests\JSPool.Tests.csproj", "{2A694F07-F503-46BF-AA7A-5C8DA8FB4B35}"
9-
EndProject
106
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5A237428-0D45-4D88-A5E4-0E232E07090F}"
117
ProjectSection(SolutionItems) = preProject
128
.nuget\packages.config = .nuget\packages.config
@@ -29,38 +25,42 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{D1
2925
EndProject
3026
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9A1CB8A1-7EFC-4BC1-A4D9-F036DAC3F84B}"
3127
EndProject
32-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSPool.Example.Console", "JSPool.Example.Console\JSPool.Example.Console.csproj", "{FB1E9161-E3C7-4915-AB69-A832968CDA98}"
28+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JSPool", "JSPool\JSPool.xproj", "{1FCDC650-03B8-49B0-938C-A06C4E06C50B}"
29+
EndProject
30+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JSPool.Tests", "..\tests\JSPool.Tests\JSPool.Tests.xproj", "{DD31FF18-0274-4A30-9983-B42A2598CA12}"
31+
EndProject
32+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JSPool.Example.Console", "JSPool.Example.Console\JSPool.Example.Console.xproj", "{D15F97FE-B55C-4E0F-AC7B-CBB4F80CA338}"
3333
EndProject
3434
Global
3535
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3636
Debug|Any CPU = Debug|Any CPU
3737
Release|Any CPU = Release|Any CPU
3838
EndGlobalSection
3939
GlobalSection(ProjectConfigurationPlatforms) = postSolution
40-
{CA552A03-A2F1-4F37-B872-2572BA24D669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{CA552A03-A2F1-4F37-B872-2572BA24D669}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{CA552A03-A2F1-4F37-B872-2572BA24D669}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{CA552A03-A2F1-4F37-B872-2572BA24D669}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{2A694F07-F503-46BF-AA7A-5C8DA8FB4B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{2A694F07-F503-46BF-AA7A-5C8DA8FB4B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{2A694F07-F503-46BF-AA7A-5C8DA8FB4B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{2A694F07-F503-46BF-AA7A-5C8DA8FB4B35}.Release|Any CPU.Build.0 = Release|Any CPU
4840
{9B7976EC-462F-4287-B545-C34D1601BB17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4941
{9B7976EC-462F-4287-B545-C34D1601BB17}.Debug|Any CPU.Build.0 = Debug|Any CPU
5042
{9B7976EC-462F-4287-B545-C34D1601BB17}.Release|Any CPU.ActiveCfg = Release|Any CPU
5143
{9B7976EC-462F-4287-B545-C34D1601BB17}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{FB1E9161-E3C7-4915-AB69-A832968CDA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{FB1E9161-E3C7-4915-AB69-A832968CDA98}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{FB1E9161-E3C7-4915-AB69-A832968CDA98}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{FB1E9161-E3C7-4915-AB69-A832968CDA98}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{1FCDC650-03B8-49B0-938C-A06C4E06C50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{1FCDC650-03B8-49B0-938C-A06C4E06C50B}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{1FCDC650-03B8-49B0-938C-A06C4E06C50B}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{1FCDC650-03B8-49B0-938C-A06C4E06C50B}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{DD31FF18-0274-4A30-9983-B42A2598CA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{DD31FF18-0274-4A30-9983-B42A2598CA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{DD31FF18-0274-4A30-9983-B42A2598CA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{DD31FF18-0274-4A30-9983-B42A2598CA12}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{D15F97FE-B55C-4E0F-AC7B-CBB4F80CA338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{D15F97FE-B55C-4E0F-AC7B-CBB4F80CA338}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{D15F97FE-B55C-4E0F-AC7B-CBB4F80CA338}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{D15F97FE-B55C-4E0F-AC7B-CBB4F80CA338}.Release|Any CPU.Build.0 = Release|Any CPU
5656
EndGlobalSection
5757
GlobalSection(SolutionProperties) = preSolution
5858
HideSolutionNode = FALSE
5959
EndGlobalSection
6060
GlobalSection(NestedProjects) = preSolution
61-
{CA552A03-A2F1-4F37-B872-2572BA24D669} = {9A1CB8A1-7EFC-4BC1-A4D9-F036DAC3F84B}
62-
{2A694F07-F503-46BF-AA7A-5C8DA8FB4B35} = {9A1CB8A1-7EFC-4BC1-A4D9-F036DAC3F84B}
6361
{9B7976EC-462F-4287-B545-C34D1601BB17} = {D1BF49FA-FBDD-4AF6-A063-D191B78D399B}
64-
{FB1E9161-E3C7-4915-AB69-A832968CDA98} = {D1BF49FA-FBDD-4AF6-A063-D191B78D399B}
62+
{1FCDC650-03B8-49B0-938C-A06C4E06C50B} = {9A1CB8A1-7EFC-4BC1-A4D9-F036DAC3F84B}
63+
{DD31FF18-0274-4A30-9983-B42A2598CA12} = {9A1CB8A1-7EFC-4BC1-A4D9-F036DAC3F84B}
64+
{D15F97FE-B55C-4E0F-AC7B-CBB4F80CA338} = {D1BF49FA-FBDD-4AF6-A063-D191B78D399B}
6565
EndGlobalSection
6666
EndGlobal

0 commit comments

Comments
 (0)