Bug-1116460 : Renaming the scripting assemblies and namespaces. Making...

Bug-1116460 : Renaming the scripting assemblies and namespaces. Making corresponding changes in InstallDogfood and RoslynBuildAndTtest to account for new names (changeset 1408119)

src/Compilers/CSharp/Desktop/CSharpCodeAnalysis.Desktop.csproj

@@ -93,7 +93,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler" />
     <InternalsVisibleTo Include="csc" />
     <InternalsVisibleTo Include="csi" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.CSharp" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.CSharp" />
     <InternalsVisibleTo Include="VBCSCompiler" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.CommandLine.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Emit.UnitTests" />
@@ -103,8 +103,8 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Syntax.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
   </ItemGroup>
   <ItemGroup>

src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj

@@ -862,7 +862,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler" />
     <InternalsVisibleTo Include="csc" />
     <InternalsVisibleTo Include="csi" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.CSharp" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.CSharp" />
     <InternalsVisibleTo Include="VBCSCompiler" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.CommandLine.UnitTests" />
@@ -874,8 +874,8 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
   </ItemGroup>
   <ItemGroup>

src/Compilers/CSharp/Portable/Compiler/MethodBodySynthesizer.cs

@@ -71,7 +71,7 @@ internal static partial class MethodBodySynthesizer
         /// Generates a submission initialization part of a Script type constructor that represents an interactive submission.
         /// </summary>
         /// <remarks>
-        /// The constructor takes a parameter of type Roslyn.Scripting.Session - the session reference.
+        /// The constructor takes a parameter of type Microsoft.CodeAnalysis.Scripting.Session - the session reference.
         /// It adds the object being constructed into the session by calling Microsoft.CSharp.RuntimeHelpers.SessionHelpers.SetSubmission,
         /// and retrieves strongly typed references on all previous submission script classes whose members are referenced by this submission.
         /// The references are stored to fields of the submission (<paramref name="synthesizedFields"/>).

src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj

@@ -18,9 +18,9 @@
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\..\Scripting\Test\CommonScriptingTest.csproj">
+    <ProjectReference Include="..\..\..\..\Scripting\Test\ScriptingTest.csproj">
       <Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
-      <Name>CommonScriptingTest</Name>
+      <Name>ScriptingTest</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Test\Utilities\TestUtilities.csproj">
@@ -228,4 +228,4 @@
     <Import Project="..\..\..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Compilers/Core/Desktop/CodeAnalysis.Desktop.csproj

@@ -127,9 +127,9 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler" />
     <InternalsVisibleTo Include="csc" />
     <InternalsVisibleTo Include="csi" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.Common" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.CSharp" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.VisualBasic" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.CSharp" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.VisualBasic" />
     <InternalsVisibleTo Include="vbc" />
     <InternalsVisibleTo Include="vbi" />
     <InternalsVisibleTo Include="VBCSCompiler" />
@@ -157,9 +157,9 @@
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
     <InternalsVisibleToTest Include="RoslynTaoActions" />
   </ItemGroup>

src/Compilers/Core/Portable/CodeAnalysis.csproj

@@ -603,9 +603,9 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler" />
     <InternalsVisibleTo Include="csc" />
     <InternalsVisibleTo Include="csi" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.Common" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.CSharp" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.VisualBasic" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.CSharp" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.VisualBasic" />
     <InternalsVisibleTo Include="vbc" />
     <InternalsVisibleTo Include="vbi" />
     <InternalsVisibleTo Include="VBCSCompiler" />
@@ -633,9 +633,9 @@
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.CompilerServer.UnitTests" />
   </ItemGroup>

src/Compilers/Helpers/GlobalAssemblyCacheHelpers/FusionAssemblyIdentity.cs

@@ -473,7 +473,7 @@ internal static IAssemblyName ToAssemblyNameObject(AssemblyName name)
                 {
 #if SCRIPTING
 
-                    throw new ArgumentException(Roslyn.Scripting.CommonScriptingResources.InvalidCharactersInAssemblyName, "name");
+                    throw new ArgumentException(Microsoft.CodeAnalysis.Scripting.ScriptingResources.InvalidCharactersInAssemblyName, "name");
 
 #elif WORKSPACE_DESKTOP
 
@@ -504,7 +504,7 @@ internal static IAssemblyName ToAssemblyNameObject(AssemblyName name)
                 {
 #if SCRIPTING
 
-                    throw new ArgumentException(Roslyn.Scripting.CommonScriptingResources.InvalidCharactersInAssemblyName, "name");
+                    throw new ArgumentException(Microsoft.CodeAnalysis.Scripting.ScriptingResources.InvalidCharactersInAssemblyName, "name");
 
 #elif WORKSPACE_DESKTOP
 

src/Compilers/Helpers/GlobalAssemblyCacheHelpers/GacFileResolver.cs

@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Extends <see cref="MetadataFileReferenceResolver"/> to enable resolution of assembly

src/Compilers/Helpers/GlobalAssemblyCacheHelpers/GlobalAssemblyCache.cs

@@ -212,7 +212,7 @@ public static IEnumerable<string> GetAssemblySimpleNames(ImmutableArray<Processo
                 {
                     // for some reason it might happen that CreateAssemblyEnum returns non-zero HR that doesn't correspond to any exception:
 #if SCRIPTING
-                    throw new ArgumentException(Roslyn.Scripting.CommonScriptingResources.InvalidAssemblyName);
+                    throw new ArgumentException(Microsoft.CodeAnalysis.Scripting.ScriptingResources.InvalidAssemblyName);
 #else
                     throw new ArgumentException(Microsoft.CodeAnalysis.WorkspaceDesktopResources.InvalidAssemblyName);
 #endif

src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj

@@ -106,7 +106,7 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Syntax.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
   </ItemGroup>
   <ItemGroup>

src/Compilers/Test/Utilities/VisualBasic/BasicCompilerTestUtilities.vbproj

@@ -125,7 +125,7 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Syntax.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
   </ItemGroup>
   <ItemGroup>

src/Compilers/VisualBasic/Desktop/BasicCodeAnalysis.Desktop.vbproj

@@ -102,7 +102,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="Roslyn.Scripting.VisualBasic" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.VisualBasic" />
     <InternalsVisibleTo Include="vbc" />
     <InternalsVisibleTo Include="vbi" />
     <InternalsVisibleTo Include="VBCSCompiler" />
@@ -113,8 +113,8 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Syntax.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
   </ItemGroup>
   <ItemGroup>

src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj

@@ -979,7 +979,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.Desktop" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.VisualBasic" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.VisualBasic" />
     <InternalsVisibleTo Include="vbc" />
     <InternalsVisibleTo Include="vbi" />
     <InternalsVisibleTo Include="VBCSCompiler" />
@@ -993,8 +993,8 @@
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.VisualStudio.Services.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
   </ItemGroup>

src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj

@@ -52,7 +52,7 @@
       <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
       <Name>BasicCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Scripting\Test\CommonScriptingTest.csproj">
+    <ProjectReference Include="..\..\..\..\Scripting\Test\ScriptingTest.csproj">
       <Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
       <Name>CommonScriptingTest</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -209,4 +209,4 @@
     <Import Project="..\..\..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj

@@ -111,9 +111,9 @@
       <Project>{76C6F005-C89D-4348-BB4A-39189DDBEB52}</Project>
       <Name>ServicesTestUtilities</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\Test\CommonScriptingTest.csproj">
+    <ProjectReference Include="..\..\Scripting\Test\ScriptingTest.csproj">
       <Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
-      <Name>CommonScriptingTest</Name>
+      <Name>ScriptingTest</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>

src/EditorFeatures/Test/EditorServicesTest.csproj

@@ -125,9 +125,9 @@
       <Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project>
       <Name>EditorFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\TestUtilities\ServicesTestUtilities.csproj">
       <Project>{76C6F005-C89D-4348-BB4A-39189DDBEB52}</Project>

src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj

@@ -31,9 +31,9 @@
       <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
       <Name>CSharpCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Scripting\CSharp\CSharpScripting.csproj">
       <Project>{066F0DBD-C46C-4C20-AFEC-99829A172625}</Project>

src/Interactive/EditorFeatures/CSharp/Interactive/CSharpRepl.cs

@@ -3,8 +3,8 @@
 using System.Diagnostics;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Interactive;
-using Roslyn.Scripting;
-using Roslyn.Scripting.CSharp;
+using Microsoft.CodeAnalysis.Scripting;
+using Microsoft.CodeAnalysis.Scripting.CSharp;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Interactive
 {

src/Interactive/EditorFeatures/Core/Extensibility/Interactive/InteractiveEvaluator.cs

@@ -22,9 +22,9 @@
 using Microsoft.VisualStudio.Utilities;
 using Roslyn.Editor.InteractiveWindow;
 using Roslyn.Editor.InteractiveWindow.Commands;
-using Roslyn.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
 using Roslyn.Utilities;
-using GacFileResolver = WORKSPACES::Roslyn.Scripting.GacFileResolver;
+using GacFileResolver = WORKSPACES::Microsoft.CodeAnalysis.Scripting.GacFileResolver;
 
 namespace Microsoft.CodeAnalysis.Editor.Interactive
 {

src/Interactive/EditorFeatures/Core/Extensibility/Interactive/InteractiveMetadataReferenceResolver.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Reflection;
-using Roslyn.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
 
 namespace Microsoft.CodeAnalysis.Editor.Interactive
 {

src/Interactive/EditorFeatures/Core/InteractiveEditorFeatures.csproj

@@ -33,9 +33,9 @@
       <Name>Workspaces.Desktop</Name>
       <Aliases>global,WORKSPACES</Aliases>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Workspaces.csproj">
       <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>

src/Interactive/EditorFeatures/VisualBasic/BasicInteractiveEditorFeatures.vbproj

@@ -38,9 +38,9 @@
       <Project>{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}</Project>
       <Name>BasicScripting</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Features\VisualBasic\BasicFeatures.vbproj">
       <Project>{A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D}</Project>

src/Interactive/EditorFeatures/VisualBasic/Interactive/VisualBasicRepl.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports Microsoft.CodeAnalysis.Interactive
-Imports Roslyn.Scripting
-Imports Roslyn.Scripting.VisualBasic
+Imports Microsoft.CodeAnalysis.Scripting
+Imports Microsoft.CodeAnalysis.Scripting.VisualBasic
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Interactive
 

src/Interactive/Features/Interactive/Core/IRepl.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Roslyn.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
 
 namespace Microsoft.CodeAnalysis.Interactive
 {

src/Interactive/Features/Interactive/Core/InteractiveHost.Service.cs

@@ -17,7 +17,7 @@
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
-using Roslyn.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Interactive

src/Interactive/Features/InteractiveFeatures.csproj

@@ -30,9 +30,9 @@
       <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
       <Name>Workspaces.Desktop</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Workspaces.csproj">
       <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
@@ -137,4 +137,4 @@
     <Import Project="..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Interactive/Host/InteractiveHost.csproj

@@ -15,9 +15,9 @@
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Workspaces.csproj">
       <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>

src/Interactive/HostTest/InteractiveHostTest.csproj

@@ -49,9 +49,9 @@
       <Project>{73f3e2c5-d742-452e-b9e1-20732ddbc75d}</Project>
       <Name>BasicCodeAnalysis.Desktop</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Test\Utilities\TestUtilities.csproj">
       <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>

src/Interactive/HostTest/InteractiveHostTests.cs

@@ -12,7 +12,7 @@
 using Microsoft.CodeAnalysis.Editor.CSharp.Interactive;
 using Microsoft.CodeAnalysis.Interactive;
 using Microsoft.CodeAnalysis.Test.Utilities;
-using Roslyn.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
 using Xunit;

src/Interactive/csi/Csi.cs

@@ -9,7 +9,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Instrumentation;
 using Microsoft.VisualStudio.Shell.Interop;
-using Roslyn.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
 
 namespace CSharpInteractive
 {

src/Interactive/csi/csi.csproj

@@ -33,9 +33,9 @@
       <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
       <Name>CSharpCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

src/Interactive/vbi/Vbi.vb

@@ -7,7 +7,7 @@ Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Instrumentation
 Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.VisualStudio.Shell.Interop
-Imports Roslyn.Scripting
+Imports Microsoft.CodeAnalysis.Scripting
 Imports VisualBasicInteractive.BasicInteractive
 
 Friend NotInheritable Class Vbi

src/Interactive/vbi/vbi.vbproj

@@ -34,9 +34,9 @@
       <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
       <Name>BasicCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

src/Roslyn.sln

@@ -185,9 +185,9 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScripting", "Scripting
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest", "Scripting\VisualBasicTest\BasicScriptingTest.vbproj", "{ABC7262E-1053-49F3-B846-E3091BB92E8C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonScripting", "Scripting\Core\CommonScripting.csproj", "{12A68549-4E8C-42D6-8703-A09335F97997}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scripting", "Scripting\Core\Scripting.csproj", "{12A68549-4E8C-42D6-8703-A09335F97997}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonScriptingTest", "Scripting\Test\CommonScriptingTest.csproj", "{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest", "Scripting\Test\ScriptingTest.csproj", "{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScripting", "Scripting\CSharp\CSharpScripting.csproj", "{066F0DBD-C46C-4C20-AFEC-99829A172625}"
 EndProject

src/Scripting/CSharp/CSharpObjectFormatter.cs

@@ -11,7 +11,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting.CSharp
+namespace Microsoft.CodeAnalysis.Scripting.CSharp
 {
     public sealed class CSharpObjectFormatter : ObjectFormatter
     {

src/Scripting/CSharp/CSharpScript.cs

@@ -8,7 +8,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Roslyn.Scripting.CSharp
+namespace Microsoft.CodeAnalysis.Scripting.CSharp
 {
     /// <summary>
     /// A factory for creating and running csharp scripts.

src/Scripting/CSharp/CSharpScripting.csproj

@@ -9,8 +9,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{066F0DBD-C46C-4C20-AFEC-99829A172625}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>Roslyn.Scripting.CSharp</RootNamespace>
-    <AssemblyName>Roslyn.Scripting.CSharp</AssemblyName>
+    <RootNamespace>Microsoft.CodeAnalysis.Scripting.CSharp</RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.Scripting.CSharp</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -27,9 +27,9 @@
       <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
       <Name>CSharpCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Any CPU' ">
@@ -42,6 +42,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
     <PlatformTarget>ARM</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -63,8 +65,8 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Emit.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Emit.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CSharpScriptingResources.resx">
@@ -80,4 +82,4 @@
     <Import Project="..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/CSharp/CSharpScriptingResources.Designer.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18210
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Roslyn.Scripting.CSharp {
+namespace Microsoft.CodeAnalysis.Scripting.CSharp {
     using System;
     
     
@@ -39,7 +39,7 @@ internal class CSharpScriptingResources {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Roslyn.Scripting.CSharp.CSharpScriptingResources", typeof(CSharpScriptingResources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScriptingResources", typeof(CSharpScriptingResources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Scripting/CSharpTest/CSharpScriptEngine.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 
-namespace Roslyn.Scripting.CSharp
+namespace Microsoft.CodeAnalysis.Scripting.CSharp
 {
     /// <summary>
     /// Represents a runtime execution context for C# scripts.

src/Scripting/CSharpTest/CSharpScriptingTest.csproj

@@ -11,8 +11,8 @@
     <ProjectGuid>{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Roslyn.Scripting.CSharpTest</RootNamespace>
-    <AssemblyName>Roslyn.Scripting.CSharp.UnitTests</AssemblyName>
+    <RootNamespace>Microsoft.CodeAnalysis.Scripting.CSharpTest</RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -50,13 +50,13 @@
       <Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}</Project>
       <Name>CSharpCompilerTestUtilities</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Test\CommonScriptingTest.csproj">
+    <ProjectReference Include="..\Test\ScriptingTest.csproj">
       <Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
-      <Name>CommonScriptingTest</Name>
+      <Name>ScriptingTest</Name>
     </ProjectReference>
     <ProjectReference Include="..\CSharp\CSharpScripting.csproj">
       <Project>{066F0DBD-C46C-4C20-AFEC-99829A172625}</Project>
@@ -113,4 +113,4 @@
     <Import Project="..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/CSharpTest/InteractiveSessionTests.cs

@@ -19,9 +19,9 @@
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
 using Microsoft.CodeAnalysis.CSharp.UnitTests;
 using Microsoft.CodeAnalysis.Test.Utilities;
-using Roslyn.Scripting;
-using Roslyn.Scripting.CommonTest;
-using Roslyn.Scripting.CSharp;
+using Microsoft.CodeAnalysis.Scripting;
+using Microsoft.CodeAnalysis.Scripting.Test;
+using Microsoft.CodeAnalysis.Scripting.CSharp;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
 using Xunit;
@@ -53,7 +53,7 @@ public interface System { }
 
 #endregion
 
-namespace Roslyn.Scripting.CSharp.Test
+namespace Microsoft.CodeAnalysis.Scripting.CSharp.Test
 {
     public class HostModel
     {

src/Scripting/CSharpTest/ObjectFormatterTests.cs

@@ -19,7 +19,7 @@
 using SymbolDisplay = Microsoft.CodeAnalysis.CSharp.SymbolDisplay;
 using VB = Microsoft.CodeAnalysis.VisualBasic;
 using ObjectFormatterFixtures;
-using Roslyn.Scripting.CSharp;
+using Microsoft.CodeAnalysis.Scripting.CSharp;
 
 #region Fixtures
 
@@ -500,7 +500,7 @@ public class LongMembers
 
 #endregion
 
-namespace Roslyn.Scripting.UnitTests
+namespace Microsoft.CodeAnalysis.Scripting.UnitTests
 {
     public class ObjectFormatterTests
     {

src/Scripting/CSharpTest/ScriptTests.cs

@@ -4,10 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
+using Microsoft.CodeAnalysis.Scripting;
+using Microsoft.CodeAnalysis.Scripting.CSharp;
 using Roslyn.Utilities;
 using Xunit;
 
-namespace Roslyn.Scripting.CSharp.Test
+namespace Microsoft.CodeAnalysis.Scripting.CSharp.Test
 {
     public class ScriptTests : CSharpTestBase
     {

src/Scripting/Core/AssemblyLoadResult.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// The result of loading an assembly reference to the interactive session.

src/Scripting/Core/AssemblyLoader.cs

@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis;
 using System.Reflection;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Loads assemblies for Reflection based APIs.

src/Scripting/Core/CompilationErrorException.cs

@@ -4,7 +4,7 @@
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// An exception thrown when the compilation stage of interactive execution produces compilation errors.

src/Scripting/Core/Emit/CommonCompilationExtensions.cs

@@ -10,7 +10,7 @@
 using Cci = Microsoft.Cci;
 using Microsoft.CodeAnalysis.Emit;
 
-namespace Roslyn.Scripting.Emit
+namespace Microsoft.CodeAnalysis.Scripting.Emit
 {
     internal static class CommonCompilationExtensions
     {

src/Scripting/Core/Emit/ReflectionEmitter.Refs.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Roslyn.Scripting.Emit
+namespace Microsoft.CodeAnalysis.Scripting.Emit
 {
     internal partial class ReflectionEmitter
     {

src/Scripting/Core/Emit/ReflectionEmitter.cs

@@ -16,7 +16,7 @@
 using Roslyn.Utilities;
 using Cci = Microsoft.Cci;
 
-namespace Roslyn.Scripting.Emit
+namespace Microsoft.CodeAnalysis.Scripting.Emit
 {
     /// <summary>
     /// Emits types in a given <see cref="Cci.IModule"/> to a <see cref="ModuleBuilder"/>.

src/Scripting/Core/InteractiveAssemblyLoader.cs

@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Implements an assembly loader for interactive compiler and REPL.

src/Scripting/Core/MemberDisplayFormat.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     public enum MemberDisplayFormat
     {

src/Scripting/Core/MetadataShadowCopyProvider.cs

@@ -10,7 +10,7 @@
 using System.Runtime.InteropServices;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Implements shadow-copying metadata file cache.
@@ -152,7 +152,7 @@ private static void RequireAbsolutePath(string path, string argumentName)
 
             if (!PathUtilities.IsAbsolute(path))
             {
-                throw new ArgumentException(Roslyn.Scripting.CommonScriptingResources.AbsolutePathExpected, argumentName);
+                throw new ArgumentException(Microsoft.CodeAnalysis.Scripting.ScriptingResources.AbsolutePathExpected, argumentName);
             }
         }
 

src/Scripting/Core/ObjectFormatter.Formatter.cs

@@ -9,7 +9,7 @@
 using Roslyn.Utilities;
 using Ref = System.Reflection;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     public abstract partial class ObjectFormatter
     {
@@ -54,7 +54,7 @@ public string FormatObject(object obj)
                 }
                 catch (InsufficientExecutionStackException)
                 {
-                    return CommonScriptingResources.StackOverflowWhileEvaluat;
+                    return ScriptingResources.StackOverflowWhileEvaluat;
                 }
             }
 

src/Scripting/Core/ObjectFormatter.cs

@@ -9,7 +9,7 @@
 using Roslyn.Utilities;
 using Ref = System.Reflection;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Object pretty printer.

src/Scripting/Core/ObjectFormattingOptions.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     [Serializable]
     public sealed class ObjectFormattingOptions

src/Scripting/Core/Script.cs

@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// A delegate that will run a script when invoked.
@@ -269,7 +269,7 @@ public ScriptState Run(object globals = null)
                     }
                     else
                     {
-                        throw new InvalidOperationException(CommonScriptingResources.StartingStateIncompatible);
+                        throw new InvalidOperationException(ScriptingResources.StartingStateIncompatible);
                     }
                 }
             }
@@ -284,7 +284,7 @@ public ScriptState Run(object globals = null)
                     var runtimeType = globals.GetType();
                     if (!_globalsType.IsAssignableFrom(runtimeType))
                     {
-                        throw new ArgumentException(string.Format(CommonScriptingResources.GlobalsNotAssignable, runtimeType, _globalsType));
+                        throw new ArgumentException(string.Format(ScriptingResources.GlobalsNotAssignable, runtimeType, _globalsType));
                     }
                 }
 

src/Scripting/Core/ScriptBuilder.cs

@@ -8,10 +8,10 @@
 using System.Reflection.Emit;
 using System.Threading;
 using Microsoft.CodeAnalysis;
-using Roslyn.Scripting.Emit;
+using Microsoft.CodeAnalysis.Scripting.Emit;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Represents a runtime execution context for C# scripts.

src/Scripting/Core/ScriptExecutionState.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Represents the submission states and globals that get passed to a script entry point when run.
@@ -66,7 +66,7 @@ public object RunSubmission(Func<object[], object> submissionRunner)
         {
             if (_frozen != 0)
             {
-                throw new InvalidOperationException(CommonScriptingResources.ExecutionStateFrozen);
+                throw new InvalidOperationException(ScriptingResources.ExecutionStateFrozen);
             }
 
             // make sure there is enough free space for the submission to add its state

src/Scripting/Core/ScriptOptions.cs

@@ -9,7 +9,7 @@
 using Microsoft.CodeAnalysis;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Options for creating and running scripts.
@@ -294,7 +294,7 @@ private MetadataReference ResolveReference(string assemblyDisplayNameOrPath)
             string fullPath = _referenceResolver.PathResolver.ResolveReference(assemblyDisplayNameOrPath, baseFilePath: null);
             if (fullPath == null)
             {
-                throw new System.IO.FileNotFoundException(CommonScriptingResources.AssemblyNotFound, assemblyDisplayNameOrPath);
+                throw new System.IO.FileNotFoundException(ScriptingResources.AssemblyNotFound, assemblyDisplayNameOrPath);
             }
 
             return _referenceResolver.Provider.GetReference(fullPath, MetadataReferenceProperties.Assembly);

src/Scripting/Core/ScriptState.cs

@@ -10,7 +10,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// The result of running a script.

src/Scripting/Core/ScriptVariable.cs

@@ -10,7 +10,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// A variable declared by the script.

src/Scripting/Core/ScriptVariables.cs

@@ -10,7 +10,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// A collection that holds the final state of all global variables used by the script.

src/Scripting/Core/CommonScripting.csproj → src/Scripting/Core/Scripting.csproj

@@ -9,8 +9,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{12A68549-4E8C-42D6-8703-A09335F97997}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>Roslyn.Scripting</RootNamespace>
-    <AssemblyName>Roslyn.Scripting.Common</AssemblyName>
+    <RootNamespace>Microsoft.CodeAnalysis.Scripting</RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.Scripting</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -86,10 +86,10 @@
     <Compile Include="ObjectFormatter.Formatter.cs" />
     <Compile Include="Script.cs" />
     <Compile Include="ScriptBuilder.cs" />
-    <Compile Include="CommonScriptingResources.Designer.cs">
+    <Compile Include="ScriptingResources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>CommonScriptingResources.resx</DependentUpon>
+      <DependentUpon>ScriptingResources.resx</DependentUpon>
     </Compile>
     <Compile Include="CompilationErrorException.cs" />
     <Compile Include="Emit\CommonCompilationExtensions.cs" />
@@ -109,8 +109,8 @@
     <Compile Include="ShadowCopy.cs" />
   </ItemGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="Roslyn.Scripting.CSharp" />
-    <InternalsVisibleTo Include="Roslyn.Scripting.VisualBasic" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.CSharp" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.VisualBasic" />
     <InternalsVisibleTo Include="Roslyn.InteractiveFeatures" />
     <InternalsVisibleTo Include="Roslyn.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.InteractiveServices" />
@@ -118,16 +118,16 @@
     <InternalsVisibleTo Include="vbi" />
     <!-- GAC helpers -->
     <InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Test.Utilities" />
     <InternalsVisibleToTest Include="RoslynTaoActions" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="CommonScriptingResources.resx">
+    <EmbeddedResource Include="ScriptingResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>CommonScriptingResources.Designer.cs</LastGenOutput>
+      <LastGenOutput>ScriptingResources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
@@ -139,4 +139,4 @@
     <Import Project="..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/Core/CommonScriptingResources.Designer.cs → src/Scripting/Core/ScriptingResources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Roslyn.Scripting {
+namespace Microsoft.CodeAnalysis.Scripting {
     using System;
     
     
@@ -22,14 +22,14 @@ namespace Roslyn.Scripting {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class CommonScriptingResources {
+    internal class ScriptingResources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal CommonScriptingResources() {
+        internal ScriptingResources() {
         }
         
         /// <summary>
@@ -39,7 +39,7 @@ internal class CommonScriptingResources {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Roslyn.Scripting.CommonScriptingResources", typeof(CommonScriptingResources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.Scripting.ScriptingResources", typeof(ScriptingResources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Scripting/Test/AssemblyLoader.cs

@@ -4,9 +4,9 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Test.Utilities;
 
-namespace Roslyn.Scripting.CommonTest
+namespace Microsoft.CodeAnalysis.Scripting.Test
 {
-    internal sealed class AssemblyLoader : Roslyn.Scripting.AssemblyLoader
+    internal sealed class AssemblyLoader : Microsoft.CodeAnalysis.Scripting.AssemblyLoader
     {
         private readonly RuntimeAssemblyManager _manager;
 

src/Scripting/Test/MetadataShadowCopyProviderTests.cs

@@ -8,6 +8,7 @@
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Xunit;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Scripting;
 
 namespace Roslyn.Services.UnitTests
 {

src/Scripting/Test/ScriptEngine.cs

@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis;
 using Roslyn.Utilities;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Represents a runtime execution context for C# scripts.
@@ -144,7 +144,7 @@ internal Session CreateCollectibleSession<THostObject>(THostObject hostObject)
             Type actualType = hostObject.GetType();
             if (!hostObjectType.IsAssignableFrom(actualType))
             {
-                throw new ArgumentException(String.Format(CommonScriptingResources.CantAssignTo, actualType, hostObjectType), "hostObjectType");
+                throw new ArgumentException(String.Format(ScriptingResources.CantAssignTo, actualType, hostObjectType), "hostObjectType");
             }
 
             return new Session(this, _options, hostObject, hostObjectType);
@@ -264,7 +264,7 @@ public void AddReference(MetadataReference reference)
 
             if (reference.Properties.Kind != MetadataImageKind.Assembly)
             {
-                throw new ArgumentException(CommonScriptingResources.ExpectedAnAssemblyReference, nameof(reference));
+                throw new ArgumentException(ScriptingResources.ExpectedAnAssemblyReference, nameof(reference));
             }
 
             _options = _options.AddReferences(reference);

src/Scripting/Test/CommonScriptingTest.csproj → src/Scripting/Test/ScriptingTest.csproj

@@ -11,8 +11,8 @@
     <ProjectGuid>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Roslyn.Scripting.CommonTest</RootNamespace>
-    <AssemblyName>Roslyn.Scripting.Common.UnitTests</AssemblyName>
+    <RootNamespace>Microsoft.CodeAnalysis.Scripting.Test</RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.Scripting.UnitTests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -50,9 +50,9 @@
       <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
       <Name>TestUtilities</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
     <ProjectReference Include="..\CSharp\CSharpScripting.csproj">
       <Project>{066F0DBD-C46C-4C20-AFEC-99829A172625}</Project>
@@ -89,8 +89,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -101,4 +101,4 @@
     <Import Project="..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/Test/ScriptingTestHelpers.cs

@@ -9,12 +9,12 @@
 using System.Reflection.Emit;
 using System.Threading;
 using Microsoft.CodeAnalysis;
-using Roslyn.Scripting;
-using Roslyn.Scripting.Emit;
+using Microsoft.CodeAnalysis.Scripting;
+using Microsoft.CodeAnalysis.Scripting.Emit;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Xunit;
 
-namespace Roslyn.Scripting.CommonTest
+namespace Microsoft.CodeAnalysis.Scripting.Test
 {
     public class ScriptingTestHelpers
     {

src/Scripting/Test/Session.cs

@@ -12,7 +12,7 @@
 using Roslyn.Utilities;
 using Ref = System.Reflection;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Runtime representation of an interactive session.

src/Scripting/Test/Submission.cs

@@ -5,7 +5,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 
-namespace Roslyn.Scripting
+namespace Microsoft.CodeAnalysis.Scripting
 {
     /// <summary>
     /// Compiled executable submission.

src/Scripting/VisualBasic/BasicScripting.vbproj

@@ -9,7 +9,7 @@
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <ProjectGuid>{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AssemblyName>Roslyn.Scripting.VisualBasic</AssemblyName>
+    <AssemblyName>Microsoft.CodeAnalysis.Scripting.VisualBasic</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -30,9 +30,9 @@
       <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
       <Name>BasicCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -42,12 +42,14 @@
     <RemoveIntegerChecks>true</RemoveIntegerChecks>
     <Optimize>false</Optimize>
     <DebugType>full</DebugType>
+    <DocumentationFile>Microsoft.CodeAnalysis.Scripting.VisualBasic.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <DefineTrace>true</DefineTrace>
     <RemoveIntegerChecks>true</RemoveIntegerChecks>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
+    <DocumentationFile>Microsoft.CodeAnalysis.Scripting.VisualBasic.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,7 @@
     <Optimize>false</Optimize>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
+    <DocumentationFile>Microsoft.CodeAnalysis.Scripting.VisualBasic.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <DefineTrace>true</DefineTrace>
@@ -64,6 +67,7 @@
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
+    <DocumentationFile>Microsoft.CodeAnalysis.Scripting.VisualBasic.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -97,12 +101,12 @@
   <ItemGroup>
     <InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Emit.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VBScriptingResources.resx">
-      <CustomToolNamespace>Roslyn.Scripting.VisualBasic</CustomToolNamespace>
+      <CustomToolNamespace>Microsoft.CodeAnalysis.Scripting.VisualBasic</CustomToolNamespace>
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>VBScriptingResources.Designer.vb</LastGenOutput>
     </EmbeddedResource>
@@ -118,4 +122,4 @@
     <Import Project="..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/VisualBasic/VBScriptingResources.Designer.vb

@@ -13,8 +13,8 @@ Option Explicit On
 
 Imports System
 
-Namespace Roslyn.Scripting.VisualBasic
-    
+Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic
+
     'This class was auto-generated by the StronglyTypedResourceBuilder
     'class via a tool like ResGen or Visual Studio.
     'To add or remove a member, edit your .ResX file then rerun ResGen
@@ -22,20 +22,20 @@ Namespace Roslyn.Scripting.VisualBasic
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>
     Friend Module VBScriptingResources
-        
+
         Private resourceMan As Global.System.Resources.ResourceManager
-        
+
         Private resourceCulture As Global.System.Globalization.CultureInfo
-        
+
         '''<summary>
         '''  Returns the cached ResourceManager instance used by this class.
         '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -45,18 +45,18 @@ Namespace Roslyn.Scripting.VisualBasic
                 Return resourceMan
             End Get
         End Property
-        
+
         '''<summary>
         '''  Overrides the current thread's CurrentUICulture property for all
         '''  resource lookups using this strongly typed resource class.
         '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
         Friend Property Culture() As Global.System.Globalization.CultureInfo
             Get
                 Return resourceCulture
             End Get
             Set
-                resourceCulture = value
+                resourceCulture = Value
             End Set
         End Property
     End Module

src/Scripting/VisualBasic/VisualBasicObjectFormatter.vb

@@ -11,7 +11,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Roslyn.Utilities
 
-Namespace Roslyn.Scripting.VisualBasic
+Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic
 
     Public NotInheritable Class VisualBasicObjectFormatter
         Inherits ObjectFormatter
@@ -116,7 +116,7 @@ Namespace Roslyn.Scripting.VisualBasic
         End Function
 
         Private Shared Function GetPrimitiveTypeName(type As Type) As String
-            Select Case type.GetTypeCode(type)
+            Select Case Type.GetTypeCode(type)
                 Case TypeCode.Boolean
                     Return "Boolean"
                 Case TypeCode.Byte

src/Scripting/VisualBasic/VisualBasicScript.vb

@@ -4,7 +4,7 @@ Imports System.Globalization
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.VisualBasic
 
-Namespace Roslyn.Scripting.VisualBasic
+Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic
 
     Public NotInheritable Class VisualBasicScript
         Inherits Script

src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj

@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>
     </RootNamespace>
-    <AssemblyName>Roslyn.Scripting.VisualBasic.UnitTests</AssemblyName>
+    <AssemblyName>Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -43,13 +43,13 @@
       <Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F8}</Project>
       <Name>BasicCompilerTestUtilities</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core\CommonScripting.csproj">
+    <ProjectReference Include="..\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
-      <Name>CommonScripting</Name>
+      <Name>Scripting</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Test\CommonScriptingTest.csproj">
+    <ProjectReference Include="..\Test\ScriptingTest.csproj">
       <Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
-      <Name>CommonScriptingTest</Name>
+      <Name>ScriptingTest</Name>
     </ProjectReference>
     <ProjectReference Include="..\VisualBasic\BasicScripting.vbproj">
       <Project>{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}</Project>
@@ -98,4 +98,4 @@
     <Import Project="..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/VisualBasicTest/InteractiveSessionTests.vb

@@ -6,11 +6,14 @@ Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests
-Imports Roslyn.Scripting.CommonTest
+Imports Microsoft.CodeAnalysis.Scripting
+Imports Microsoft.CodeAnalysis.Scripting.VisualBasic
+Imports Microsoft.CodeAnalysis.Scripting.Test
 Imports Roslyn.Test.Utilities
 Imports Xunit
 
-Namespace Roslyn.Scripting.VisualBasic.Test
+
+Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic.Test
 
     Public Class InteractiveSessionTests
         Inherits BasicTestBase

src/Scripting/VisualBasicTest/ObjectFormatterTests.vb

@@ -3,8 +3,8 @@
 Imports System.Globalization
 Imports System.Threading.Thread
 Imports Microsoft.CodeAnalysis.VisualBasic
-Imports Roslyn.Scripting
-Imports Roslyn.Scripting.VisualBasic
+Imports Microsoft.CodeAnalysis.Scripting
+Imports Microsoft.CodeAnalysis.Scripting.VisualBasic
 Imports Roslyn.Test.Utilities
 Imports Xunit
 

src/Scripting/VisualBasicTest/ScriptTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports Microsoft.CodeAnalysis.Scripting.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests
 Imports Xunit
 
-Namespace Roslyn.Scripting.VisualBasic.Test
+Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic.Test
 
     Public Class ScriptTests
         Inherits BasicTestBase

src/Scripting/VisualBasicTest/VisualBasicScriptEngine.vb

@@ -8,7 +8,7 @@ Imports System.IO
 Imports System.Linq
 Imports Microsoft.CodeAnalysis
 
-Namespace Roslyn.Scripting.VisualBasic
+Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic
     ''' <summary> 
     ''' Represents a runtime execution context for Visual Basic scripts.
     ''' </summary>    

src/Test/Utilities/App.config

@@ -5,7 +5,7 @@
   <roslyn.unittests>
     <emit>
       <method assembly="Roslyn.Test.Utilities" type="Microsoft.CodeAnalysis.Test.Utilities.CommonTestBase" name="Emit" />
-      <method assembly="Roslyn.Scripting.Common.UnitTests" type="Roslyn.Scripting.CommonTest.ScriptingTestHelpers" name="ReflectionEmit" />
+      <method assembly="Microsoft.CodeAnalysis.Scripting.UnitTests" type="Microsoft.CodeAnalysis.Scripting.Test.ScriptingTestHelpers" name="ReflectionEmit" />
     </emit>
   </roslyn.unittests>
 </configuration>

src/Test/Utilities/TestUtilities.csproj

@@ -213,9 +213,9 @@
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
-    <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />

src/Workspaces/Core/Desktop/Utilities/ReferencePathUtilities.cs

@@ -50,7 +50,7 @@ public static bool TryFindXmlDocumentationFile(string assemblyFilePath, out stri
 
             // 1. Look in subdirectories based on the current culture
             // TODO: This logic is somewhat duplicated between here and 
-            // Roslyn.Scripting.MetadataShadowCopyProvider
+            // Microsoft.CodeAnalysis.Scripting.MetadataShadowCopyProvider
             string xmlFileName = Path.ChangeExtension(Path.GetFileName(assemblyFilePath), ".xml");
             string originalDirectory = Path.GetDirectoryName(assemblyFilePath);