Skip to content
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.

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

Core Tools OOP Host #3802

Merged
merged 70 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
704ac4e
this doesn't work
aishwaryabh Aug 27, 2024
3c2d57e
this finally works now
aishwaryabh Aug 27, 2024
8e1a8b8
default should be oop host
aishwaryabh Aug 28, 2024
dba7366
added edge cases
aishwaryabh Aug 28, 2024
e10e828
fixing formatting
aishwaryabh Aug 28, 2024
8cace5c
using determineTargetFramework
aishwaryabh Sep 4, 2024
b3edb40
Merge branch 'v4.x' of https://github.com/Azure/azure-functions-core-…
aishwaryabh Sep 4, 2024
e8513a6
saving tests
aishwaryabh Sep 5, 2024
58cec33
adding copy step for OOP
aishwaryabh Sep 5, 2024
bda722f
fixing the webhost reference
aishwaryabh Sep 5, 2024
8cb1b78
removing test
aishwaryabh Sep 5, 2024
cef04a0
setting host version in ps script
aishwaryabh Sep 6, 2024
fa7d681
update to validate worker versions script
aishwaryabh Sep 7, 2024
0a85400
update versions for worker packages
aishwaryabh Sep 9, 2024
654e34b
adding ToString
aishwaryabh Sep 9, 2024
ba31c33
validating worker version
aishwaryabh Sep 9, 2024
e420bee
validate worker versions
aishwaryabh Sep 9, 2024
9689ef4
updating csproj to compile
aishwaryabh Sep 9, 2024
f705868
addressing pr feedback
aishwaryabh Sep 9, 2024
c175762
updating build steps
aishwaryabh Sep 9, 2024
83c0a23
Merge branch 'v4.x' of https://github.com/Azure/azure-functions-core-…
aishwaryabh Sep 9, 2024
d018052
adding build step
aishwaryabh Sep 9, 2024
9e65428
fixing build step
aishwaryabh Sep 9, 2024
26d67e5
trying to get this working
aishwaryabh Sep 10, 2024
91aae46
reverrting target runtimes
aishwaryabh Sep 10, 2024
8468773
updating tests
aishwaryabh Sep 10, 2024
8f51faa
adding dotnet info step
aishwaryabh Sep 10, 2024
eb07a1f
adding changes
aishwaryabh Sep 11, 2024
06b6bd7
removing extra test
aishwaryabh Sep 11, 2024
525aa6b
trying to specify architecture
aishwaryabh Sep 11, 2024
38b3920
modifying tests to see if they work
aishwaryabh Sep 11, 2024
553cc71
narrowing down to tests that are failing
aishwaryabh Sep 11, 2024
836d939
trying to see if it works with nobuild flag
aishwaryabh Sep 12, 2024
b0d8e5c
addressing pr feedback
aishwaryabh Sep 12, 2024
68800d6
updating tests with latest logging
aishwaryabh Sep 12, 2024
d544912
addressing comments and marking flaky tests
aishwaryabh Sep 12, 2024
16dfee4
updating so that we are only using net8 framework
aishwaryabh Sep 16, 2024
55f42ad
pushing change for branch build
aishwaryabh Sep 16, 2024
ec55012
adding single quotes
aishwaryabh Sep 16, 2024
125f0be
reverting quotes
aishwaryabh Sep 16, 2024
6a5e6e0
adding code mirror fiile
aishwaryabh Sep 16, 2024
622c3fb
updating build step
aishwaryabh Sep 16, 2024
d1da564
updatinng build steps
aishwaryabh Sep 16, 2024
bfdaff0
updating build step
aishwaryabh Sep 16, 2024
2c29257
Merge branch 'v4.x' of https://github.com/Azure/azure-functions-core-…
aishwaryabh Sep 17, 2024
b832675
adding step for dotnet publish
aishwaryabh Sep 17, 2024
6726456
set inprochost compilation system to diff value and skip flaky test
aishwaryabh Sep 17, 2024
f7e520b
updating public build pipeline to trigger
aishwaryabh Sep 17, 2024
bf47a3c
adding extra changes for pipeline
aishwaryabh Sep 17, 2024
09dec2b
public build yml
aishwaryabh Sep 17, 2024
5ac6edf
updating official build
aishwaryabh Sep 17, 2024
52e9289
readd net8 build artifact step
aishwaryabh Sep 17, 2024
c2813c5
readding space back
aishwaryabh Sep 17, 2024
c9844d1
addressing initial comments
aishwaryabh Sep 18, 2024
b13a532
adding explicit openTelemetry dlls
aishwaryabh Sep 18, 2024
697847d
simplifying logic of startHostAction
aishwaryabh Sep 18, 2024
4d9681f
addressing PR feedback
aishwaryabh Sep 18, 2024
ba7caec
start tests
aishwaryabh Sep 18, 2024
4821e73
changing some of the tests back
aishwaryabh Sep 18, 2024
b656fa1
reverting test back to normal
aishwaryabh Sep 19, 2024
7545285
fixing spacing for csproj
aishwaryabh Sep 19, 2024
e21065e
addressing PR feedback
aishwaryabh Sep 19, 2024
490eaf9
adding extra variable
aishwaryabh Sep 19, 2024
456aaa7
adding logic for edge case scenarios
aishwaryabh Sep 19, 2024
da89da0
added edge cases tests
aishwaryabh Sep 19, 2024
1bbca61
Merge branch 'feature/oop-host' of https://github.com/Azure/azure-fun…
aishwaryabh Sep 19, 2024
2cdbfe8
removing extra line in node
aishwaryabh Sep 19, 2024
cc01008
addressing comments
aishwaryabh Sep 20, 2024
72af8da
moving validate host runtime to its own method
aishwaryabh Sep 20, 2024
8b31c8e
forgot to add return statement
aishwaryabh Sep 20, 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 azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trigger:
include:
- v4.x
- release_4.0

aishwaryabh marked this conversation as resolved.
Show resolved Hide resolved
jobs:
- job: Default
condition: eq(variables['LinuxPackageBuildTag'], '')
Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ if ($env:IntegrationBuildNumber)
throw $errorMessage
}

$buildCommand = { dotnet run --integrationTests }
$buildCommand = { dotnet run --integrationTests --skipArtifactGeneration}
}
else
{
$buildCommand = { dotnet run --ci }
$buildCommand = { dotnet run --ci --skipArtifactGeneration}
aishwaryabh marked this conversation as resolved.
Show resolved Hide resolved
}

Write-Host "Running $buildCommand"
Expand Down
11 changes: 5 additions & 6 deletions build/BuildSteps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static void DotnetPack()
Shell.Run("dotnet", $"pack {Settings.SrcProjectPath} " +
$"/p:BuildNumber=\"{Settings.BuildNumber}\" " +
$"/p:NoWorkers=\"true\" " +
$"/p:TargetFramework=net6.0 " + // without TargetFramework, the generated nuspec has incorrect path for the copy files operation.
$"/p:TargetFramework=net8.0 " + // without TargetFramework, the generated nuspec has incorrect path for the copy files operation.
$"/p:CommitHash=\"{Settings.CommitId}\" " +
(string.IsNullOrEmpty(Settings.IntegrationBuildNumber) ? string.Empty : $"/p:IntegrationBuildNumber=\"{Settings.IntegrationBuildNumber}\" ") +
$"-o {outputPath} -c Release --no-build");
Expand All @@ -116,8 +116,7 @@ public static void DotnetPublishForZips()
var outputPath = Path.Combine(Settings.OutputDir, runtime);
var rid = GetRuntimeId(runtime);

ExecuteDotnetPublish(outputPath, rid, "net6.0", skipLaunchingNet8ChildProcess: isMinVersion);

ExecuteDotnetPublish(outputPath, rid, "net8.0", skipLaunchingNet8ChildProcess: isMinVersion);
if (isMinVersion)
{
RemoveLanguageWorkers(outputPath);
Expand Down Expand Up @@ -342,7 +341,7 @@ public static void Test()

Environment.SetEnvironmentVariable("DURABLE_FUNCTION_PATH", Settings.DurableFolder);

Shell.Run("dotnet", $"test {Settings.TestProjectFile} -f net6.0 --logger trx");
Shell.Run("dotnet", $"test {Settings.TestProjectFile} -f net8.0 --logger trx");
}

public static void CopyBinariesToSign()
Expand Down Expand Up @@ -643,10 +642,10 @@ public static void DotnetPublishForNupkg()
Shell.Run("dotnet", $"publish {Settings.ProjectFile} " +
$"/p:BuildNumber=\"{Settings.BuildNumber}\" " +
$"/p:NoWorkers=\"true\" " +
$"/p:TargetFramework=net6.0 " +
$"/p:TargetFramework=net8.0 " +
$"/p:CommitHash=\"{Settings.CommitId}\" " +
(string.IsNullOrEmpty(Settings.IntegrationBuildNumber) ? string.Empty : $"/p:IntegrationBuildNumber=\"{Settings.IntegrationBuildNumber}\" ") +
$"-c Release -f net6.0");
$"-c Release -f net8.0");
}

public static void GenerateSBOMManifestForNupkg()
Expand Down
4 changes: 2 additions & 2 deletions build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ static void Main(string[] args)
.Then(TestPreSignedArtifacts, skip: !args.Contains("--ci"))
.Then(CopyBinariesToSign, skip: !args.Contains("--ci"))
.Then(Test)
.Then(Zip)
.Then(Zip, skip: args.Contains("--skipArtifactGeneration"))
.Then(DotnetPublishForNupkg)
.Then(DotnetPack)
.Then(CreateIntegrationTestsBuildManifest, skip: !args.Contains("--integrationTests"))
.Then(UploadToStorage, skip: !args.Contains("--ci"))
.Then(UploadToStorage, skip: !args.Contains("--ci") || args.Contains("--skipArtifactGeneration"))
.Run();
}
}
Expand Down
10 changes: 10 additions & 0 deletions build/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,16 @@ public class SignInfo
"Microsoft.OData.Edm.dll",
"Microsoft.Spatial.dll",
"Mono.Posix.NETStandard.dll",
"OpenTelemetry.Api.dll",
"OpenTelemetry.Api.ProviderBuilderExtensions.dll",
"OpenTelemetry.dll",
"OpenTelemetry.Exporter.Console.dll",
"OpenTelemetry.Exporter.OpenTelemetryProtocol.dll",
"OpenTelemetry.Extensions.Hosting.dll",
"OpenTelemetry.Instrumentation.AspNetCore.dll",
"OpenTelemetry.Instrumentation.Http.dll",
"OpenTelemetry.PersistentStorage.Abstractions.dll",
"OpenTelemetry.PersistentStorage.FileSystem.dll",
Path.Combine("tools", "python", "packapp", "distlib")
};
}
Expand Down
1 change: 1 addition & 0 deletions code-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ trigger:
- release_4.0
- release_3.0
- release_4.0_hotfix
- feature/*

resources:
repositories:
Expand Down
1 change: 1 addition & 0 deletions eng/ci/official-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ trigger:
include:
- v4.x
- release_4.0
- feature/*

resources:
repositories:
Expand Down
2 changes: 2 additions & 0 deletions eng/ci/public-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ pr:
include:
- v4.x
- release_4.0
- feature/*

trigger:
aishwaryabh marked this conversation as resolved.
Show resolved Hide resolved
batch: true
branches:
include:
- v4.x
- release_4.0
- feature/*

resources:
repositories:
Expand Down
3 changes: 2 additions & 1 deletion pipelineUtilities.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function Install-DotnetVersion($Version,$Channel) {
if ($IsWindows) {
& .\$installScript -InstallDir "$env:ProgramFiles/dotnet" -Channel $Channel -Version $Version
# Installing .NET into x86 directory since the E2E App runs the tests on x86 and looks for the specified framework there
& .\$installScript -InstallDir "$env:ProgramFiles (x86)/dotnet" -Channel $Channel -Version $Version
& .\$installScript -InstallDir "$env:ProgramFiles (x86)/dotnet" -Channel $Channel -Version $Version -Architecture x86
fabiocav marked this conversation as resolved.
Show resolved Hide resolved
} else {
bash ./$installScript --install-dir /usr/share/dotnet -c $Channel -v $Version
}
Expand All @@ -150,6 +150,7 @@ function Install-Dotnet {
$listRuntimesOutput = dotnet --list-runtimes
$installedDotnetRuntimes = $listRuntimesOutput | ForEach-Object { $_.Split(" ")[1] }
Write-Host "Detected dotnet Runtimes: $($installedDotnetRuntimes -join ', ')"
dotnet --info
aishwaryabh marked this conversation as resolved.
Show resolved Hide resolved
}
finally {
if (Test-Path $installScript) {
Expand Down
Loading