Skip to content

Commit 832efff

Browse files
v-imohammadjviau
andauthored
updating release/in-proc branch with 4.35.1 latest commits (#10324)
* Fix branch naming check for suffix (#10320) * Fix branch naming check for suffix * Fix build numbering * Host release prep 4.35.1 (#10321) * Host release prep 4.35.1 * updated release notes --------- Co-authored-by: Jacob Viau <[email protected]>
1 parent 02a34e2 commit 832efff

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<LangVersion>latest</LangVersion>
55
<MajorVersion>4</MajorVersion>
66
<MinorVersion>$(MinorVersionPrefix)35</MinorVersion>
7-
<PatchVersion>0</PatchVersion>
7+
<PatchVersion>1</PatchVersion>
88
<BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
99
<PreviewVersion></PreviewVersion>
1010

build/initialize-pipeline.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if ($buildReason -eq "PullRequest") {
4646
$buildNumber = ""
4747

4848
$branch = $sourceBranch.ToLower();
49-
$isRelease = $branch.Contains("release/4") -or $branch.Contains("release/inproc6/4") -or $branch.Contains("release/inproc8/4")
49+
$isRelease = $branch.Contains("release/4") -or $branch.Contains("release/in-proc")
5050

5151
if(($buildReason -eq "PullRequest") -or !$isRelease)
5252
{

eng/ci/templates/official/jobs/build-artifacts-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
os: windows
2929

3030
variables:
31-
${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), and(not( contains( variables['Build.SourceBranch'], 'release/in-proc.' ) ), not( contains( variables['Build.SourceBranch'], 'release/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/ExtensionsMetadataGenerator/' ) ) ) ) }}:
31+
${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), and(not( contains( variables['Build.SourceBranch'], 'release/in-proc' ) ), not( contains( variables['Build.SourceBranch'], 'release/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/ExtensionsMetadataGenerator/' ) ) ) ) }}:
3232
suffixTemp: $(buildNumber)
3333
packSuffixSwitchTemp: --version-suffix $(buildNumber)
3434
emgSuffixSwitchTemp: --version-suffix ci$(buildNumber)

release_notes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
- `Microsoft.Azure.WebJobs` updated to 3.0.41
2020
- `Microsoft.Azure.WebJobs.Host.Storage` updated to 5.0.1
2121
- `Microsoft.Extensions.Azure` updated to 1.7.1
22-
- `Azure.Storage.Blobs` updated to 12.19.1
22+
- `Azure.Storage.Blobs` updated to 12.19.1
23+
- [in-proc] Updating FunctionsNetHost (dotnet isolated worker) to 1.0.9 (#10263)

0 commit comments

Comments
 (0)