Rename all instances of NanoServer to CoreCLR

daviwil · daviwil · commit 8f1cd234f197 · 2017-01-21T16:07:55.000-08:00
diff --git a/src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj b/src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/src/PowerShellEditorServices.Host/EditorServicesHost.cs b/src/PowerShellEditorServices.Host/EditorServicesHost.cs
@@ -78,7 +78,7 @@ public EditorServicesHost(
 #endif
 
             // Catch unhandled exceptions for logging purposes
-#if !NanoServer
+#if !CoreCLR
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 #endif
         }
@@ -96,7 +96,7 @@ public void StartLogging(string logFilePath, LogLevel logLevel)
         {
             Logger.Initialize(logFilePath, logLevel);
 
-#if NanoServer
+#if CoreCLR
             FileVersionInfo fileVersionInfo =
                 FileVersionInfo.GetVersionInfo(this.GetType().GetTypeInfo().Assembly.Location);
 
@@ -122,7 +122,7 @@ public void StartLogging(string logFilePath, LogLevel logLevel)
                     $"    Name:      {this.hostDetails.Name}" + newLine +
                     $"    ProfileId: {this.hostDetails.ProfileId}" + newLine +
                     $"    Version:   {this.hostDetails.Version}" + newLine +
-#if !NanoServer
+#if !CoreCLR
                     $"    Arch:      {processArchitecture}" + newLine + newLine +
                      "  Operating system details:" + newLine + newLine +
                     $"    Version: {osVersionString}" + newLine +
@@ -220,7 +220,7 @@ public void WaitForCompletion()
 
         #region Private Methods
 
-#if !NanoServer
+#if !CoreCLR
         static void CurrentDomain_UnhandledException(
             object sender, 
             UnhandledExceptionEventArgs e)
diff --git a/src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj b/src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/NamedPipeClientChannel.cs b/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/NamedPipeClientChannel.cs
@@ -22,7 +22,7 @@ public NamedPipeClientChannel(string pipeName)
 
         public override async Task WaitForConnection()
         {
-#if NanoServer
+#if CoreCLR
             await this.pipeClient.ConnectAsync();
 #else
             this.IsConnected = false;
diff --git a/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/NamedPipeServerChannel.cs b/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/NamedPipeServerChannel.cs
@@ -23,7 +23,7 @@ public NamedPipeServerChannel(string pipeName)
 
         public override async Task WaitForConnection()
         {
-#if NanoServer
+#if CoreCLR
             await this.pipeServer.WaitForConnectionAsync();
 #else
             await Task.Factory.FromAsync(this.pipeServer.BeginWaitForConnection, this.pipeServer.EndWaitForConnection, null);
diff --git a/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/StdioServerChannel.cs b/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/StdioServerChannel.cs
@@ -23,7 +23,7 @@ public class StdioServerChannel : ChannelBase
 
         protected override void Initialize(IMessageSerializer messageSerializer)
         {
-#if !NanoServer
+#if !CoreCLR
             // Ensure that the console is using UTF-8 encoding
             System.Console.InputEncoding = Encoding.UTF8;
             System.Console.OutputEncoding = Encoding.UTF8;
diff --git a/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/TcpSocketServerChannel.cs b/src/PowerShellEditorServices.Protocol/MessageProtocol/Channel/TcpSocketServerChannel.cs
@@ -60,7 +60,7 @@ protected override void Shutdown()
 
             if (this.tcpClient != null)
             {
-#if NanoServer
+#if CoreCLR
                 this.tcpClient.Dispose();
 #else
                 this.tcpClient.Close();
diff --git a/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj b/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs b/src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs
@@ -163,7 +163,7 @@ protected async Task HandleLaunchRequest(
 
             if (workingDir == null)
             {
-#if NanoServer
+#if CoreCLR
                 workingDir = AppContext.BaseDirectory;
 #else
                 workingDir = Environment.CurrentDirectory;
diff --git a/src/PowerShellEditorServices/Language/AstOperations.cs b/src/PowerShellEditorServices/Language/AstOperations.cs
@@ -47,7 +47,7 @@ static public CommandCompletion GetCompletions(
         {
             var type = scriptAst.Extent.StartScriptPosition.GetType();
             var method = 
-#if NanoServer
+#if CoreCLR
                 type.GetMethod(
                     "CloneWithNewOffset",
                     BindingFlags.Instance | BindingFlags.NonPublic);
diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -77,7 +77,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/PowerShellEditorServices/Session/PowerShellContext.cs b/src/PowerShellEditorServices/Session/PowerShellContext.cs
@@ -135,7 +135,7 @@ public PowerShellContext(HostDetails hostDetails, ProfilePaths profilePaths)
             var initialSessionState = InitialSessionState.CreateDefault2();
 
             Runspace runspace = RunspaceFactory.CreateRunspace(psHost, initialSessionState);
-#if !NanoServer
+#if !CoreCLR
             runspace.ApartmentState = ApartmentState.STA;
 #endif
             runspace.ThreadOptions = PSThreadOptions.ReuseThread;
diff --git a/src/PowerShellEditorServices/Utility/Logger.cs b/src/PowerShellEditorServices/Utility/Logger.cs
@@ -185,7 +185,7 @@ public LogWriter(LogLevel minimumLogLevel, string logFilePath, bool deleteExisti
             {
                 logFilePath =
                     Path.Combine(
-#if NanoServer
+#if CoreCLR
                         AppContext.BaseDirectory,
 #else
                         AppDomain.CurrentDomain.BaseDirectory,
@@ -199,7 +199,7 @@ public LogWriter(LogLevel minimumLogLevel, string logFilePath, bool deleteExisti
                 // try opening it in a more reliable path
                 this.TryOpenLogFile(
                     Path.Combine(
-#if NanoServer
+#if CoreCLR
                         Environment.GetEnvironmentVariable("TEMP"),
 #else
                         Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
diff --git a/test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj b/test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj
@@ -47,7 +47,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj b/test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj b/test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj b/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/test/PowerShellEditorServices.Test/Language/PowerShellVersionTests.cs b/test/PowerShellEditorServices.Test/Language/PowerShellVersionTests.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-#if !NanoServer
+#if !CoreCLR
 
 using Microsoft.Win32;
 using System;
diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NanoServer</DefineConstants>
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/test/PowerShellEditorServices.Test/Utility/LoggerTests.cs b/test/PowerShellEditorServices.Test/Utility/LoggerTests.cs
@@ -17,7 +17,7 @@ public class LoggerTests
         private const string testMessage = "This is a test log message.";
         private readonly string logFilePath =
             Path.Combine(
-#if NanoServer
+#if CoreCLR
                 AppContext.BaseDirectory,
 #else
                 AppDomain.CurrentDomain.BaseDirectory,

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public NamedPipeClientChannel(string pipeName)`
`22`	`22`
`23`	`23`	`public override async Task WaitForConnection()`
`24`	`24`	`{`
`25`		`-#if NanoServer`
	`25`	`+#if CoreCLR`
`26`	`26`	`await this.pipeClient.ConnectAsync();`
`27`	`27`	`#else`
`28`	`28`	`this.IsConnected = false;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public NamedPipeServerChannel(string pipeName)`
`23`	`23`
`24`	`24`	`public override async Task WaitForConnection()`
`25`	`25`	`{`
`26`		`-#if NanoServer`
	`26`	`+#if CoreCLR`
`27`	`27`	`await this.pipeServer.WaitForConnectionAsync();`
`28`	`28`	`#else`
`29`	`29`	`await Task.Factory.FromAsync(this.pipeServer.BeginWaitForConnection, this.pipeServer.EndWaitForConnection, null);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class StdioServerChannel : ChannelBase`
`23`	`23`
`24`	`24`	`protected override void Initialize(IMessageSerializer messageSerializer)`
`25`	`25`	`{`
`26`		`-#if !NanoServer`
	`26`	`+#if !CoreCLR`
`27`	`27`	`// Ensure that the console is using UTF-8 encoding`
`28`	`28`	`System.Console.InputEncoding = Encoding.UTF8;`
`29`	`29`	`System.Console.OutputEncoding = Encoding.UTF8;`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ protected override void Shutdown()`
`60`	`60`
`61`	`61`	`if (this.tcpClient != null)`
`62`	`62`	`{`
`63`		`-#if NanoServer`
	`63`	`+#if CoreCLR`
`64`	`64`	`this.tcpClient.Dispose();`
`65`	`65`	`#else`
`66`	`66`	`this.tcpClient.Close();`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ protected async Task HandleLaunchRequest(`
`163`	`163`
`164`	`164`	`if (workingDir == null)`
`165`	`165`	`{`
`166`		`-#if NanoServer`
	`166`	`+#if CoreCLR`
`167`	`167`	`workingDir = AppContext.BaseDirectory;`
`168`	`168`	`#else`
`169`	`169`	`workingDir = Environment.CurrentDirectory;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static public CommandCompletion GetCompletions(`
`47`	`47`	`{`
`48`	`48`	`var type = scriptAst.Extent.StartScriptPosition.GetType();`
`49`	`49`	`var method =`
`50`		`-#if NanoServer`
	`50`	`+#if CoreCLR`
`51`	`51`	`type.GetMethod(`
`52`	`52`	`"CloneWithNewOffset",`
`53`	`53`	`BindingFlags.Instance \| BindingFlags.NonPublic);`