Skip to content

updating release/in-proc branch with 4.35.1 latest commits #10324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2024
Merged

updating release/in-proc branch with 4.35.1 latest commits #10324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457601e
Fix branch naming check for suffix (#10320)
jviau Jul 24, 2024
0aff64a
Host release prep 4.35.1 (#10321)
v-imohammad Jul 24, 2024
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 build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<LangVersion>latest</LangVersion>
<MajorVersion>4</MajorVersion>
<MinorVersion>$(MinorVersionPrefix)35</MinorVersion>
<PatchVersion>0</PatchVersion>
<PatchVersion>1</PatchVersion>
<BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
<PreviewVersion></PreviewVersion>

Expand Down
2 changes: 1 addition & 1 deletion build/initialize-pipeline.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if ($buildReason -eq "PullRequest") {
$buildNumber = ""

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

if(($buildReason -eq "PullRequest") -or !$isRelease)
{
Expand Down
2 changes: 1 addition & 1 deletion eng/ci/templates/official/jobs/build-artifacts-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
os: windows

variables:
${{ 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/' ) ) ) ) }}:
${{ 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/' ) ) ) ) }}:
suffixTemp: $(buildNumber)
packSuffixSwitchTemp: --version-suffix $(buildNumber)
emgSuffixSwitchTemp: --version-suffix ci$(buildNumber)
Expand Down
3 changes: 2 additions & 1 deletion release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
- `Microsoft.Azure.WebJobs` updated to 3.0.41
- `Microsoft.Azure.WebJobs.Host.Storage` updated to 5.0.1
- `Microsoft.Extensions.Azure` updated to 1.7.1
- `Azure.Storage.Blobs` updated to 12.19.1
- `Azure.Storage.Blobs` updated to 12.19.1
- [in-proc] Updating FunctionsNetHost (dotnet isolated worker) to 1.0.9 (#10263)