Refactor package structure for Azure Functions usage

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

package/Microsoft.Azure.Functions.PowerShellWorker.Package.csproj

@@ -0,0 +1,15 @@
+<!--
+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">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <NuspecFile>Microsoft.Azure.Functions.PowerShellWorker.nuspec</NuspecFile>
+    <NuspecProperties>configuration=$(Configuration);targetFramework=$(TargetFramework)</NuspecProperties>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>NU5100</NoWarn>
+  </PropertyGroup>
+</Project>

package/Microsoft.Azure.Functions.PowerShellWorker.nuspec

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) Microsoft. All rights reserved.
+Licensed under the MIT license. See LICENSE file in the project root for full license information.
+-->
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.Azure.Functions.PowerShellWorker</id>
+    <version>0.1.0</version>
+    <title>Azure Function PowerShell Language Worker</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://github.com/Azure/azure-functions-powershell-worker/blob/dev/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/Azure/azure-functions-powershell-worker</projectUrl>
+    <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_64.png</iconUrl>
+    <description>The Azure Function PowerShell Language Worker allows users to write Azure Function Apps using PowerShell. It leverages the PowerShell Core SDK.</description>
+    <releaseNotes># 0.1.0
+
+    Initial Release</releaseNotes>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <tags>azure,functions,powershell,worker</tags>
+    <contentFiles>
+      <files include="**/*" buildAction="None" copyToOutput="true" flatten="false"/>
+    </contentFiles>
+  </metadata>
+  <files>
+    <file src="../src/bin/$configuration$/$targetFramework$/publish/**/*" target="contentFiles/any/any/workers/powershell" />
+  </files>
+</package>

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.csproj → src/Microsoft.Azure.Functions.PowerShellWorker.csproj

@@ -3,17 +3,16 @@ 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" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>  
     <Product>Azure Function PowerShell Language Worker</Product>
+    <AssemblyName>Microsoft.Azure.Functions.PowerShellWorker</AssemblyName>
+
     <LangVersion>Latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <IncludeBuildOutput>true</IncludeBuildOutput>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <NeutralLanguage>en-US</NeutralLanguage>
   </PropertyGroup>
@@ -35,5 +34,4 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
 </Project>

src/Modules/Azure.Functions.PowerShell.Worker.Module/Azure.Functions.PowerShell.Worker.Module.psd1 → 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/PowerShell/PowerShellManager.cs

@@ -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/worker.config.json

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

test/Function/FunctionLoaderTests.cs

@@ -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/Azure.Functions.PowerShell.Worker.Test.csproj → test/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj

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

test/Requests/HandleWorkerInitRequestTests.cs

@@ -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 ProcessWorkerInitRequestTests
     {

test/Utility/TypeExtensionsTests.cs

@@ -14,7 +14,7 @@
 using Newtonsoft.Json;
 using Xunit;
 
-namespace Azure.Functions.PowerShell.Worker.Test
+namespace Microsoft.Azure.Functions.PowerShellWorker.Test
 {
     public class TypeExtensionsTests
     {