Convert to project.json / .xproj files in preparation for .NET Core b…

…uild. References #318
reactjs · Oct 2, 2016 · 41963d6 · 41963d6
1 parent 956530a
commit 41963d6
Show file tree

Hide file tree

Showing 68 changed files with 754 additions and 1,455 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ src/React.Sample.Webpack/build
 *.generated.min.js
 src/React.Sample.Mvc6/wwwroot/js/Sample.js
 *.lock.json
-src/.vs
+.vs/
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

diff --git a/src/Cassette.React/Cassette.React.csproj b/src/Cassette.React/Cassette.React.csproj
diff --git a/src/Cassette.React/Cassette.React.nutrans b/src/Cassette.React/Cassette.React.nutrans
diff --git a/src/Cassette.React/Cassette.React.xproj b/src/Cassette.React/Cassette.React.xproj
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>b7d39e1d-6caa-4489-a03f-0c176402cfb2</ProjectGuid>
+    <RootNamespace>Cassette.React</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/src/Cassette.React/packages.config b/src/Cassette.React/packages.config
diff --git a/src/Cassette.React/project.json b/src/Cassette.React/project.json
@@ -0,0 +1,37 @@
+{
+  "version": "2.6.0-*",
+  "title": "ReactJS.NET - Babel for Cassette",
+  "authors": [ "Daniel Lo Nigro" ],
+  "copyright": "Copyright 2014-Present Facebook, Inc",
+  "description": "Allows you to transpile JavaScript via Babel using Cassette.",
+
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [
+        "../SharedAssemblyInfo.cs"
+      ]
+    },
+    "xmlDoc": true
+  },
+
+  "packOptions": {
+    "iconUrl": "http://facebook.github.io/react/img/logo_og.png",
+    "licenseUrl": "https://github.com/reactjs/React.NET#licence",
+    "owners": [ "Daniel Lo Nigro" ],
+    "projectUrl": "http://reactjs.net/",
+    "summary": "ReactJS and Babel tools for .NET",
+    "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel", "cassette" ]
+  },
+
+  "dependencies": {
+    "Cassette": "2.4.2",
+    "React.Core": {
+      "target": "project"
+    }
+  },
+
+  "frameworks": {
+    "net40": {
+    }
+  }
+}
diff --git a/src/React.AspNet/React.AspNet.xproj b/src/React.AspNet/React.AspNet.xproj
@@ -8,12 +8,12 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a7acdb56-5e43-40a6-92c9-2c52228e6074</ProjectGuid>
     <RootNamespace>React.AspNet</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\bin\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/src/React.AspNet/project.json b/src/React.AspNet/project.json
@@ -33,18 +33,19 @@
     "Microsoft.Extensions.DependencyInjection": "1.0.0",
     "React.Core": {
       "target": "project"
-    },
-    "VroomJs": "1.2.3" 
+    }
   },
   "frameworks": {
     "net451": {
-      "bin": {
-        "assembly": "../../bin/React.AspNet/bin/{configuration}/net451/React.AspNet.dll",
-        "pdb": "../../bin/React.AspNet/bin/{configuration}/net451/React.AspNet.pdb"
-      }
     }
   },
   "buildOptions": {
+    "compile": {
+      "includeFiles": [
+        "../SharedAssemblyInfo.cs"
+      ]
+    },
+    "keyFile": "../key.snk",
     "xmlDoc": true
   }
 }
diff --git a/src/React.Core/JavaScriptEngineFactory.cs b/src/React.Core/JavaScriptEngineFactory.cs
@@ -103,11 +103,11 @@ protected virtual IJsPool CreatePool()
 		protected virtual void InitialiseEngine(IJsEngine engine)
 		{
 			var thisAssembly = typeof(ReactEnvironment).Assembly;
-			engine.ExecuteResource("React.Resources.shims.js", thisAssembly);
+			engine.ExecuteResource("React.Core.Resources.shims.js", thisAssembly);
 			if (_config.LoadReact)
 			{
 				// TODO: Add option to choose whether to load dev vs prod version of React.
-				engine.ExecuteResource("React.Resources.react.generated.js", thisAssembly);
+				engine.ExecuteResource("React.Core.Resources.react.generated.js", thisAssembly);
 			}
 
 			LoadUserScripts(engine);