Change all Microsoft.AspNet.* namespaces and references to Microsoft.AspNetCore.*

This commit is contained in:
SteveSandersonMS
2016-04-08 17:22:12 +01:00
parent 4a0e4bdf1a
commit 25c728f885
62 changed files with 89 additions and 101 deletions

View File

@@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>421807e6-b62c-417b-b901-46c5dedaa8f1</ProjectGuid>
<RootNamespace>Microsoft.AspNet.AngularServices</RootNamespace>
<RootNamespace>Microsoft.AspNetCore.AngularServices</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

View File

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace Microsoft.AspNet.AngularServices {
namespace Microsoft.AspNetCore.AngularServices {
public static class PrimeCacheHelper {
public static async Task<HtmlString> PrimeCache(this IHtmlHelper html, string url) {
// TODO: Consider deduplicating the PrimeCache calls (that is, if there are multiple requests to precache

View File

@@ -7,10 +7,6 @@
"test": "echo \"Error: no test specified\" && exit 1",
"prepublish": "tsd install && tsc && node build.js"
},
"repository": {
"type": "git",
"url": "https://github.com/aspnet/NodeServices/tree/master/Microsoft.AspNet.AngularServices"
},
"typings": "dist/Exports",
"author": "Microsoft",
"license": "Apache-2.0",

View File

@@ -1,6 +1,6 @@
{
"version": "1.0.0-*",
"description": "Helpers for building Angular 2 applications on ASP.NET 5.",
"description": "Helpers for building Angular 2 applications on ASP.NET Core.",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
@@ -10,7 +10,7 @@
"url": "git://github.com/aspnet/nodeservices"
},
"tooling": {
"defaultNamespace": "Microsoft.AspNet.AngularServices"
"defaultNamespace": "Microsoft.AspNetCore.AngularServices"
},
"frameworks": {
"dnx451": {},
@@ -26,7 +26,7 @@
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNet.NodeServices": "1.0.0-*",
"Microsoft.AspNet.SpaServices": "1.0.0-*"
"Microsoft.AspNetCore.NodeServices": "1.0.0-*",
"Microsoft.AspNetCore.SpaServices": "1.0.0-*"
}
}

View File

@@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.AspNetCore.Hosting;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
public static class Configuration {
private readonly static string[] defaultWatchFileExtensions = new[] { ".js", ".jsx", ".ts", ".tsx", ".json", ".html" };
private readonly static NodeServicesOptions defaultOptions = new NodeServicesOptions {

View File

@@ -52,10 +52,10 @@ var server = http.createServer(function(req, res) {
server.listen(requestedPortOrZero, 'localhost', function () {
// Signal to HttpNodeHost which port it should make its HTTP connections on
console.log('[Microsoft.AspNet.NodeServices.HttpNodeHost:Listening on port ' + server.address().port + '\]');
console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port ' + server.address().port + '\]');
// Signal to the NodeServices base class that we're ready to accept invocations
console.log('[Microsoft.AspNet.NodeServices:Listening]');
console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
});
function readRequestBodyAsJson(request, callback) {

View File

@@ -20,4 +20,4 @@ readline.createInterface({ input: process.stdin }).on('line', function (message)
}
});
console.log('[Microsoft.AspNet.NodeServices:Listening]'); // The .NET app waits for this signal before sending any invocations
console.log('[Microsoft.AspNetCore.NodeServices:Listening]'); // The .NET app waits for this signal before sending any invocations

View File

@@ -7,9 +7,9 @@ using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
internal class HttpNodeInstance : OutOfProcessNodeInstance {
private readonly static Regex PortMessageRegex = new Regex(@"^\[Microsoft.AspNet.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");
private readonly static Regex PortMessageRegex = new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");
private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings {
ContractResolver = new CamelCasePropertyNamesContractResolver()

View File

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
// This is just to demonstrate that other transports are possible. This implementation is extremely
// dubious - if the Node-side code fails to conform to the expected protocol in any way (e.g., has an
// error), then it will just hang forever. So don't use this.

View File

@@ -1,4 +1,4 @@
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
public class NodeInvocationInfo
{
public string ModuleName;

View File

@@ -3,7 +3,7 @@ using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
/**
* Class responsible for launching the Node child process, determining when it is ready to accept invocations,
* and finally killing it when the parent process exits. Also it restarts the child process if it dies.
@@ -91,7 +91,7 @@ namespace Microsoft.AspNet.NodeServices {
this._nodeProcessIsReadySource = new TaskCompletionSource<bool>();
this._nodeProcess.OutputDataReceived += (sender, evt) => {
if (evt.Data == "[Microsoft.AspNet.NodeServices:Listening]" && !initializationIsCompleted) {
if (evt.Data == "[Microsoft.AspNetCore.NodeServices:Listening]" && !initializationIsCompleted) {
this._nodeProcessIsReadySource.SetResult(true);
initializationIsCompleted = true;
} else if (evt.Data != null) {

View File

@@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
public interface INodeServices : IDisposable {
Task<T> Invoke<T>(string moduleName, params object[] args);

View File

@@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b0fa4175-8b29-4904-9780-28b3c24b0567</ProjectGuid>
<RootNamespace>Microsoft.AspNet.NodeServices</RootNamespace>
<RootNamespace>Microsoft.AspNetCore.NodeServices</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\NodeServices.sln\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\NodeServices.sln\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

View File

@@ -1,4 +1,4 @@
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
public enum NodeHostingModel {
Http,
InputOutputStream,

View File

@@ -2,7 +2,7 @@ using System;
using System.IO;
using System.Reflection;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
public static class EmbeddedResourceReader {
public static string Read(Type assemblyContainingType, string path) {
var asm = assemblyContainingType.GetTypeInfo().Assembly;

View File

@@ -1,7 +1,7 @@
using System;
using System.IO;
namespace Microsoft.AspNet.NodeServices {
namespace Microsoft.AspNetCore.NodeServices {
// Makes it easier to pass script files to Node in a way that's sure to clean up after the process exits
public sealed class StringAsTempFile : IDisposable {
public string FileName { get; private set; }

View File

@@ -1,6 +1,6 @@
{
"version": "1.0.0-*",
"description": "Invoke Node.js modules at runtime in ASP.NET 5 applications.",
"description": "Invoke Node.js modules at runtime in ASP.NET Core applications.",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},

View File

@@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b04381de-991f-4831-a0b5-fe1bd3ef80c4</ProjectGuid>
<RootNamespace>Microsoft.AspNet.ReactServices</RootNamespace>
<RootNamespace>Microsoft.AspNetCore.ReactServices</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

View File

@@ -1,6 +1,6 @@
{
"version": "1.0.0-*",
"description": "Helpers for building React applications on ASP.NET 5.",
"description": "Helpers for building React applications on ASP.NET Core.",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
@@ -10,12 +10,12 @@
"url": "git://github.com/aspnet/nodeservices"
},
"tooling": {
"defaultNamespace": "Microsoft.AspNet.ReactServices"
"defaultNamespace": "Microsoft.AspNetCore.ReactServices"
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNet.NodeServices": "1.0.0-*",
"Microsoft.AspNet.SpaServices": "1.0.0-*"
"Microsoft.AspNetCore.NodeServices": "1.0.0-*",
"Microsoft.AspNetCore.SpaServices": "1.0.0-*"
},
"frameworks": {
"dnx451": {},

View File

@@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>4624f728-6dff-44b6-93b5-3c7d9c94bf3f</ProjectGuid>
<RootNamespace>Microsoft.AspNet.SpaServices</RootNamespace>
<RootNamespace>Microsoft.AspNetCore.SpaServices</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

View File

@@ -6,12 +6,12 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNet.NodeServices;
using Microsoft.AspNetCore.NodeServices;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.PlatformAbstractions;
using Newtonsoft.Json;
namespace Microsoft.AspNet.SpaServices.Prerendering
namespace Microsoft.AspNetCore.SpaServices.Prerendering
{
[HtmlTargetElement(Attributes = PrerenderModuleAttributeName)]
public class PrerenderTagHelper : TagHelper

View File

@@ -1,9 +1,9 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNet.NodeServices;
using Microsoft.AspNetCore.NodeServices;
using Newtonsoft.Json.Linq;
namespace Microsoft.AspNet.SpaServices.Prerendering
namespace Microsoft.AspNetCore.SpaServices.Prerendering
{
public static class Prerenderer
{

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
namespace Microsoft.AspNet.SpaServices
namespace Microsoft.AspNetCore.SpaServices
{
internal class SpaRouteConstraint : IRouteConstraint
{

View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNet.SpaServices;
using Microsoft.AspNetCore.SpaServices;
// Putting in this namespace so it's always available whenever MapRoute is
namespace Microsoft.AspNetCore.Builder

View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.SpaServices.Webpack
namespace Microsoft.AspNetCore.SpaServices.Webpack
{
// Based on https://github.com/aspnet/Proxy/blob/dev/src/Microsoft.AspNetCore.Proxy/ProxyMiddleware.cs
// Differs in that, if the proxied request returns a 404, we pass through to the next middleware in the chain

View File

@@ -1,8 +1,8 @@
using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNet.NodeServices;
using Microsoft.AspNet.SpaServices.Webpack;
using Microsoft.AspNetCore.NodeServices;
using Microsoft.AspNetCore.SpaServices.Webpack;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.PlatformAbstractions;
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Builder
appBuilder.UseMiddleware<ConditionalProxyMiddleware>(devServerInfo.PublicPath, proxyOptions);
// While it would be nice to proxy the /__webpack_hmr requests too, these return an EventStream,
// and the Microsoft.Aspnet.Proxy code doesn't handle that entirely - it throws an exception after
// and the Microsoft.AspNetCore.Proxy code doesn't handle that entirely - it throws an exception after
// a while. So, just serve a 302 for those.
appBuilder.Map(WebpackHotMiddlewareEndpoint, builder => {
builder.Use(next => async ctx => {

View File

@@ -1,4 +1,4 @@
namespace Microsoft.AspNet.SpaServices.Webpack {
namespace Microsoft.AspNetCore.SpaServices.Webpack {
public class WebpackDevMiddlewareOptions {
public bool HotModuleReplacement { get; set; }
public bool ReactHotModuleReplacement { get; set; }

View File

@@ -1,6 +1,6 @@
# Not for general use
This NPM package is an internal implementation detail of the `Microsoft.AspNet.SpaServices` NuGet package.
This NPM package is an internal implementation detail of the `Microsoft.AspNetCore.SpaServices` NuGet package.
You should not use this package directly in your own applications, because it is not supported, and there are no
guarantees about how its APIs will change in the future.

View File

@@ -1,7 +1,7 @@
{
"name": "aspnet-prerendering",
"version": "1.0.1",
"description": "Helpers for server-side rendering of JavaScript applications in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
"description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
"main": "index.js",
"scripts": {
"prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",

View File

@@ -1,6 +1,6 @@
# Not for general use
This NPM package is an internal implementation detail of the `Microsoft.AspNet.SpaServices` NuGet package.
This NPM package is an internal implementation detail of the `Microsoft.AspNetCore.SpaServices` NuGet package.
You should not use this package directly in your own applications, because it is not supported, and there are no
guarantees about how its APIs will change in the future.

View File

@@ -1,7 +1,7 @@
{
"name": "aspnet-webpack-react",
"version": "1.0.1",
"description": "Helpers for using Webpack with React in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
"description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
"main": "index.js",
"scripts": {
"prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",

View File

@@ -1,6 +1,6 @@
# Not for general use
This NPM package is an internal implementation detail of the `Microsoft.AspNet.SpaServices` NuGet package.
This NPM package is an internal implementation detail of the `Microsoft.AspNetCore.SpaServices` NuGet package.
You should not use this package directly in your own applications, because it is not supported, and there are no
guarantees about how its APIs will change in the future.

View File

@@ -1,7 +1,7 @@
{
"name": "aspnet-webpack",
"version": "1.0.3",
"description": "Helpers for using Webpack in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
"description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
"main": "index.js",
"scripts": {
"prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack\"'",

View File

@@ -1,6 +1,6 @@
{
"version": "1.0.0-*",
"description": "Microsoft.AspNet.SpaServices",
"description": "Helpers for building single-page applications on ASP.NET Core",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
@@ -15,7 +15,7 @@
"dependencies": {
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Routing": "1.0.0-*",
"Microsoft.AspNet.NodeServices": "1.0.0-*"
"Microsoft.AspNetCore.NodeServices": "1.0.0-*"
},
"frameworks": {
"dnx451": {},