Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PowerShellWorker.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<BuildNumber Condition="$(APPVEYOR) != ''">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
<BuildNumber Condition="$(APPVEYOR) == ''">$([System.DateTime]::Now.ToString(`MMdd`))</BuildNumber>
<Version>1.0.$(BuildNumber)</Version>
<Version>2.0.$(BuildNumber)</Version>
<PackageTags>PowerShell;AzureFunctions;language;Azure;</PackageTags>
<PackageLicenseUrl>https://github.com/Azure/azure-functions-powershell-worker/blob/master/LICENSE</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
Expand Down
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

|Branch|Status|
|---|---|
|master|[![master-build-status][]][master-build-site]|
|dev|[![dev-build-status][]][dev-build-site]|
|v2.x|[![v2.x-build-status][]][v2.x-build-site]|

[azure-functions-logo]: https://github.com/raw/Azure/azure-functions-cli/master/src/Azure.Functions.Cli/npm/assets/azure-functions-logo-color-raster.png
[master-build-status]: https://ci.appveyor.com/api/projects/status/github/Azure/azure-functions-powershell-worker?branch=master&svg=true
[dev-build-status]: https://ci.appveyor.com/api/projects/status/github/Azure/azure-functions-powershell-worker?branch=dev&svg=true
[master-build-site]: https://ci.appveyor.com/project/appsvc/azure-functions-powershell-worker?branch=master
[dev-build-site]: https://ci.appveyor.com/project/appsvc/azure-functions-powershell-worker?branch=dev
[v2.x-build-status]: https://ci.appveyor.com/api/projects/status/github/Azure/azure-functions-powershell-worker?branch=v2.x&svg=true
[v2.x-build-site]: https://ci.appveyor.com/project/appsvc/azure-functions-powershell-worker?branch=v2.x

# Azure Functions PowerShell Language Worker

Expand Down Expand Up @@ -49,7 +46,7 @@ with any additional questions or comments.

### Prereqs

* [.NET 2.1 SDK](https://www.microsoft.com/net/download/visual-studio-sdks)
* [.NET 2.2 SDK](https://www.microsoft.com/net/download/visual-studio-sdks)

### Build

Expand Down Expand Up @@ -118,12 +115,12 @@ of your test functions app.

Then copy the `publish` directory to `workers`:
```powershell
Copy-Item -Recurse -Force ./src/bin/Debug/netcoreapp2.1/publish/ "<Azure Functions Host Root>/src/WebJobs.Script.WebHost/bin/Debug/netcoreapp2.1/workers/powershell"
Copy-Item -Recurse -Force ./src/bin/Debug/netcoreapp2.2/publish/ "<Azure Functions Host Root>/src/WebJobs.Script.WebHost/bin/Debug/netcoreapp2.2/workers/powershell"
```

Then you can start the host but running:
```sh
dotnet ./src/WebJobs.Script.WebHost/bin/Debug/netcoreapp2.1/Microsoft.Azure.WebJobs.Script.WebHost.dll
dotnet ./src/WebJobs.Script.WebHost/bin/Debug/netcoreapp2.2/Microsoft.Azure.WebJobs.Script.WebHost.dll
```

> Note: Remember to remove `"AzureWebJobsScriptRoot"`
Expand All @@ -145,6 +142,6 @@ That will place a `Microsoft.Azure.Functions.PowerShellWorker.*.nupkg` in:

It pulls the contents of the publish folder in:

`azure-functions-powershell-worker/src/bin/Debug/netcoreapp2.1/publish`
`azure-functions-powershell-worker/src/bin/Debug/netcoreapp2.2/publish`

if you specify a different Configuration or TargetFramework that will be honored.
5 changes: 2 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
version: 1.0.{build}
version: 2.0.{build}

pull_requests:
do_not_increment_build_number: true

branches:
only:
- dev
- master
- v2.x

image:
- Ubuntu
Expand Down
2 changes: 1 addition & 1 deletion package/Microsoft.Azure.Functions.PowerShellWorker.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<projectUrl>https://github.com/Azure/azure-functions-powershell-worker</projectUrl>
<icon>images\Powershell_black_64.png</icon>
<description>The Azure Function PowerShell Language Worker allows users to write Azure Function Apps using PowerShell. It leverages the PowerShell Core SDK.</description>
<releaseNotes># 1.0.0
<releaseNotes># 2.0.0

Initial Release</releaseNotes>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/helper.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function Find-Dotnet
$env:PATH = $LocalDotnetDirPath + [IO.Path]::PathSeparator + $env:PATH
}
else {
throw "Cannot find the dotnet SDK for .NET Core 2.1. Please specify '-Bootstrap' to install build dependencies."
throw "Cannot find the dotnet SDK for .NET Core 2.2. Please specify '-Bootstrap' to install build dependencies."
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/protobuf.tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<NoBuild>true</NoBuild>
</PropertyGroup>

Expand Down