refactor package for AzF use

Author: TylerLeonhardt

azure-functions-powershell-worker.sln

@@ -5,11 +5,11 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C758288-3909-4CE1-972D-1BE966628D6C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.PowerShell.Worker", "src\Azure.Functions.PowerShell.Worker.csproj", "{939262BA-4823-405E-81CD-436C0B77D524}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Functions.PowerShellWorker", "src\Microsoft.Azure.Functions.PowerShellWorker.csproj", "{939262BA-4823-405E-81CD-436C0B77D524}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{12092936-4F2A-4B40-9AF2-56C840D44FEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.PowerShell.Worker.Test", "test\Azure.Functions.PowerShell.Worker.Test.csproj", "{535C8DA3-479D-42BF-B1AF-5B03ECAF67A4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Functions.PowerShellWorker.Test", "test\Microsoft.Azure.Functions.PowerShellWorker.Test.csproj", "{535C8DA3-479D-42BF-B1AF-5B03ECAF67A4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/AssemblyInfo.cs

@@ -5,5 +5,5 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly:InternalsVisibleTo("Azure.Functions.PowerShell.Worker.Test")]
+[assembly:InternalsVisibleTo("Microsoft.Azure.Functions.PowerShellWorker.Test")]
 

src/Azure.Functions.PowerShell.Worker.Package.props renamed to src/Microsoft.Azure.Functions.PowerShellWorker.Package.props

@@ -5,7 +5,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
 <Project>
   <PropertyGroup>
     <Version>0.1.0</Version>
-    <PackageId>Azure.Functions.PowerShell.Worker</PackageId>
+    <PackageId>Microsoft.Azure.Functions.PowerShellWorker</PackageId>
     <Authors>Microsoft</Authors>
     <Owners>Microsoft</Owners>
     <Company>Microsoft Corporation</Company>

src/Azure.Functions.PowerShell.Worker.csproj renamed to src/Microsoft.Azure.Functions.PowerShellWorker.csproj

@@ -3,11 +3,12 @@ Copyright (c) Microsoft. All rights reserved.
 Licensed under the MIT license. See LICENSE file in the project root for full license information.
 -->
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="Azure.Functions.PowerShell.Worker.Package.props" />
+  <Import Project="Microsoft.Azure.Functions.PowerShellWorker.Package.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>  
     <Product>Azure Function PowerShell Language Worker</Product>
+    
     <LangVersion>Latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -26,6 +27,10 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
     <PackageReference Include="Google.Protobuf" Version="3.6.1" />
   </ItemGroup>
 
+  <!-- Copy Content files to the language worker's directory -->
+  <PropertyGroup>
+    <ContentTargetFolders>contentFiles\any\any\workers\powershell</ContentTargetFolders>
+  </PropertyGroup>
   <ItemGroup>
     <Content Include="worker.config.json" PackageCopyToOutput="true">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Modules/Azure.Functions.PowerShell.Worker.Module/Azure.Functions.PowerShell.Worker.Module.psd1 renamed to src/Modules/Microsoft.Azure.Functions.PowerShellWorker.Module/Microsoft.Azure.Functions.PowerShellWorker.Module.psd1

@@ -1,7 +1,7 @@
 @{
 
 # Script module or binary module file associated with this manifest.
-RootModule = 'Azure.Functions.PowerShell.Worker.Module.psm1'
+RootModule = 'Microsoft.Azure.Functions.PowerShellWorker.Module.psm1'
 
 # Version number of this module.
 ModuleVersion = '0.1.0'

src/Modules/Azure.Functions.PowerShell.Worker.Module/Azure.Functions.PowerShell.Worker.Module.psm1 renamed to src/Modules/Microsoft.Azure.Functions.PowerShellWorker.Module/Microsoft.Azure.Functions.PowerShellWorker.Module.psm1

@@ -56,7 +56,7 @@ internal void InitializeRunspace()
             _pwsh.AddScript($"using namespace {typeof(HttpResponseContext).Namespace}").InvokeAndClearCommands();
 
             // Set the PSModulePath
-            Environment.SetEnvironmentVariable("PSModulePath", Path.Join(AppDomain.CurrentDomain.BaseDirectory, "Modules"));
+            Environment.SetEnvironmentVariable("PSModulePath", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "workers", "powershell", "Modules"));
         }
 
         internal Hashtable InvokeFunction(
@@ -121,7 +121,7 @@ internal Hashtable InvokeFunction(
                     returnObject = pipelineItems[pipelineItems.Count - 1];
                 }
 
-                var result = _pwsh.AddCommand("Azure.Functions.PowerShell.Worker.Module\\Get-OutputBinding")
+                var result = _pwsh.AddCommand("Microsoft.Azure.Functions.PowerShellWorker.Module\\Get-OutputBinding")
                     .AddParameter("Purge")
                     .InvokeAndClearCommands<Hashtable>()[0];
 

src/PowerShell/PowerShellManager.cs

@@ -3,6 +3,6 @@
         "language":"powershell",
         "extensions":[".ps1"],
         "defaultExecutablePath":"dotnet",
-        "defaultWorkerPath":"Azure.Functions.PowerShell.Worker.dll"
+        "defaultWorkerPath":"../../Microsoft.Azure.Functions.PowerShellWorker.dll"
     }
 }

src/worker.config.json

@@ -8,7 +8,7 @@
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Xunit;
 
-namespace Azure.Functions.PowerShell.Worker.Test
+namespace Microsoft.Azure.Functions.PowerShellWorker.Test
 {
     public class FunctionLoaderTests
     {

test/Function/FunctionLoaderTests.cs

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\Azure.Functions.PowerShell.Worker.csproj" />
+    <ProjectReference Include="..\src\Microsoft.Azure.Functions.PowerShellWorker.csproj" />
   </ItemGroup>
 
 </Project>