Skip to content

Commit 27cbe81

Browse files
authored
v2.x branch setup (#370)
* Change PS Worker version to 2.0 * Enable appveyor on v2.x branch * Update the build badge * Replace .NET Core 2.1 references with 2.2
1 parent a3811aa commit 27cbe81

File tree

7 files changed

+14
-18
lines changed

7 files changed

+14
-18
lines changed

PowerShellWorker.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<BuildNumber Condition="$(APPVEYOR) != ''">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
44
<BuildNumber Condition="$(APPVEYOR) == ''">$([System.DateTime]::Now.ToString(`MMdd`))</BuildNumber>
5-
<Version>1.0.$(BuildNumber)</Version>
5+
<Version>2.0.$(BuildNumber)</Version>
66
<PackageTags>PowerShell;AzureFunctions;language;Azure;</PackageTags>
77
<PackageLicenseUrl>https://github.com/Azure/azure-functions-powershell-worker/blob/master/LICENSE</PackageLicenseUrl>
88
<RepositoryType>git</RepositoryType>

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
|Branch|Status|
44
|---|---|
5-
|master|[![master-build-status][]][master-build-site]|
6-
|dev|[![dev-build-status][]][dev-build-site]|
5+
|v2.x|[![v2.x-build-status][]][v2.x-build-site]|
76

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

1411
# Azure Functions PowerShell Language Worker
1512

@@ -49,7 +46,7 @@ with any additional questions or comments.
4946

5047
### Prereqs
5148

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

5451
### Build
5552

@@ -118,12 +115,12 @@ of your test functions app.
118115

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

124121
Then you can start the host but running:
125122
```sh
126-
dotnet ./src/WebJobs.Script.WebHost/bin/Debug/netcoreapp2.1/Microsoft.Azure.WebJobs.Script.WebHost.dll
123+
dotnet ./src/WebJobs.Script.WebHost/bin/Debug/netcoreapp2.2/Microsoft.Azure.WebJobs.Script.WebHost.dll
127124
```
128125

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

146143
It pulls the contents of the publish folder in:
147144

148-
`azure-functions-powershell-worker/src/bin/Debug/netcoreapp2.1/publish`
145+
`azure-functions-powershell-worker/src/bin/Debug/netcoreapp2.2/publish`
149146

150147
if you specify a different Configuration or TargetFramework that will be honored.

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
version: 1.0.{build}
1+
version: 2.0.{build}
22

33
pull_requests:
44
do_not_increment_build_number: true
55

66
branches:
77
only:
8-
- dev
9-
- master
8+
- v2.x
109

1110
image:
1211
- Ubuntu

package/Microsoft.Azure.Functions.PowerShellWorker.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
1616
<projectUrl>https://github.com/Azure/azure-functions-powershell-worker</projectUrl>
1717
<icon>images\Powershell_black_64.png</icon>
1818
<description>The Azure Function PowerShell Language Worker allows users to write Azure Function Apps using PowerShell. It leverages the PowerShell Core SDK.</description>
19-
<releaseNotes># 1.0.0
19+
<releaseNotes># 2.0.0
2020

2121
Initial Release</releaseNotes>
2222
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

test/E2E/Azure.Functions.PowerShellWorker.E2E/Azure.Functions.PowerShellWorker.E2E/Azure.Functions.PowerShellWorker.E2E.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

tools/helper.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function Find-Dotnet
2929
$env:PATH = $LocalDotnetDirPath + [IO.Path]::PathSeparator + $env:PATH
3030
}
3131
else {
32-
throw "Cannot find the dotnet SDK for .NET Core 2.1. Please specify '-Bootstrap' to install build dependencies."
32+
throw "Cannot find the dotnet SDK for .NET Core 2.2. Please specify '-Bootstrap' to install build dependencies."
3333
}
3434
}
3535
}

tools/protobuf.tools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
66
<Project Sdk="Microsoft.NET.Sdk">
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.1</TargetFramework>
9+
<TargetFramework>netcoreapp2.2</TargetFramework>
1010
<NoBuild>true</NoBuild>
1111
</PropertyGroup>
1212

0 commit comments

Comments
 (0)