Custom Host Mac/Linux

build/BuildSteps.cs

@@ -16,7 +16,6 @@ namespace Build
 {
     public static class BuildSteps
     {
-        private const string Net8ArtifactNameSuffix = "_net8";
         private static readonly string _wwwroot = Environment.ExpandEnvironmentVariables(@"%HOME%\site\wwwroot");
         private static IntegrationTestBuildManifest _integrationManifest;
 
@@ -102,7 +101,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");
@@ -116,17 +115,12 @@ 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");
                 if (isMinVersion)
                 {
                     RemoveLanguageWorkers(outputPath);
+                    CreateMinConfigurationFile(outputPath);
                 }
-
-                // Publish net8 version of the artifact as well.
-                var outputPathNet8 = BuildNet8ArtifactFullPath(runtime);
-                ExecuteDotnetPublish(outputPathNet8, rid, "net8.0", skipLaunchingNet8ChildProcess: true);
-                RemoveLanguageWorkers(outputPathNet8);
             }
 
             if (!string.IsNullOrEmpty(Settings.IntegrationBuildNumber) && (_integrationManifest != null))
@@ -135,18 +129,10 @@ public static void DotnetPublishForZips()
             }
         }
 
-        private static string BuildNet8ArtifactFullPath(string runtime)
-        {
-            return Path.Combine(Settings.OutputDir, BuildNet8ArtifactDirectory(runtime));
-        }
-
-        private static string BuildNet8ArtifactDirectory(string runtime) => $"{runtime}{Net8ArtifactNameSuffix}";
-
-        private static void ExecuteDotnetPublish(string outputPath, string rid, string targetFramework, bool skipLaunchingNet8ChildProcess)
+        private static void ExecuteDotnetPublish(string outputPath, string rid, string targetFramework)
         {
             Shell.Run("dotnet", $"publish {Settings.ProjectFile} " +
                                 $"/p:BuildNumber=\"{Settings.BuildNumber}\" " +
-                                $"/p:SkipInProcessHost=\"{skipLaunchingNet8ChildProcess}\" " +
                                 $"/p:CommitHash=\"{Settings.CommitId}\" " +
                                 (string.IsNullOrEmpty(Settings.IntegrationBuildNumber) ? string.Empty : $"/p:IntegrationBuildNumber=\"{Settings.IntegrationBuildNumber}\" ") +
                                 $"-o {outputPath} -c Release -f {targetFramework}  --self-contained" +
@@ -342,7 +328,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()
@@ -568,11 +554,6 @@ public static void Zip()
                 var zipPath = Path.Combine(Settings.OutputDir, $"Azure.Functions.Cli.{runtime}.{version}.zip");
                 CreateZipFromArtifact(artifactPath, zipPath);
 
-                // Zip the .net8 version as well.
-                var net8Path = BuildNet8ArtifactFullPath(runtime);
-                var net8ZipPath = Path.Combine(Settings.OutputDir, $"Azure.Functions.Cli.{runtime}{Net8ArtifactNameSuffix}.{version}.zip");
-                CreateZipFromArtifact(net8Path, net8ZipPath);
-
 
                 // We leave the folders beginning with 'win' to generate the .msi files. They will be deleted in
                 // the ./generateMsiFiles.ps1 script
@@ -581,7 +562,6 @@ public static void Zip()
                     try
                     {
                         Directory.Delete(artifactPath, recursive: true);
-                        Directory.Delete(net8Path, recursive: true);
                     }
                     catch (Exception ex)
                     {
@@ -615,7 +595,7 @@ public static void GenerateSBOMManifestForZips()
             Directory.CreateDirectory(Settings.SBOMManifestTelemetryDir);
             // Generate the SBOM manifest for each artifactDirectory
 
-            var allArtifactDirectories = Settings.TargetRuntimes.Concat(Settings.TargetRuntimes.Select(r => BuildNet8ArtifactDirectory(r)));
+            var allArtifactDirectories = Settings.TargetRuntimes.Concat(Settings.TargetRuntimes);
 
             foreach (var artifactDirectory in allArtifactDirectories)
             {
@@ -643,10 +623,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()
@@ -673,55 +653,6 @@ public static void DeleteSBOMTelemetryFolder()
             Directory.Delete(Settings.SBOMManifestTelemetryDir, recursive: true);
         }
 
-        public static void UploadToStorage()
-        {
-            // Don't upload for public build.
-            if (Settings.IsPublicBuild)
-            {
-                ColoredConsole.WriteLine($"Skipping upload for public build.");
-                return;
-            }
-
-            ColoredConsole.WriteLine($"Going to run the UploadToStorage. Setting is {Settings.IsPublicBuild}");
-
-
-            if (!string.IsNullOrEmpty(Settings.BuildArtifactsStorage))
-            {
-                var version = new Version(CurrentVersion);
-                var storageAccount = CloudStorageAccount.Parse(Settings.BuildArtifactsStorage);
-                var blobClient = storageAccount.CreateCloudBlobClient();
-                var container = blobClient.GetContainerReference("builds");
-                container.CreateIfNotExistsAsync().Wait();
-
-                container.SetPermissionsAsync(new BlobContainerPermissions
-                {
-                    PublicAccess = BlobContainerPublicAccessType.Blob
-                });
-
-                foreach (var file in Directory.GetFiles(Settings.OutputDir, "Azure.Functions.Cli.*", SearchOption.TopDirectoryOnly))
-                {
-                    var fileName = Path.GetFileName(file);
-                    ColoredConsole.Write($"Uploading {fileName}...");
-
-                    var versionedBlob = container.GetBlockBlobReference($"{version.ToString()}/{fileName}");
-                    var latestBlob = container.GetBlockBlobReference($"{version.Major}/latest/{fileName.Replace($".{version.ToString()}", string.Empty)}");
-                    versionedBlob.UploadFromFileAsync(file).Wait();
-                    latestBlob.StartCopyAsync(versionedBlob).Wait();
-
-                    ColoredConsole.WriteLine("Done");
-                }
-
-                var latestVersionBlob = container.GetBlockBlobReference($"{version.Major}/latest/version.txt");
-                latestVersionBlob.UploadTextAsync(version.ToString()).Wait();
-            }
-            else
-            {
-                var error = $"{nameof(Settings.BuildArtifactsStorage)} is null or empty. Can't run {nameof(UploadToStorage)} target";
-                ColoredConsole.Error.WriteLine(error.Red());
-                throw new Exception(error);
-            }
-        }
-
         public static void LogIntoAzure()
         {
             var directoryId = Environment.GetEnvironmentVariable("AZURE_DIRECTORY_ID");
@@ -749,17 +680,15 @@ public static void LogIntoAzure()
         private static IEnumerable<string> GetAllTargetRuntimes()
         {
             var targetRuntimes = Settings.TargetRuntimes;
-            var net8Runtimes = targetRuntimes.Select(r => BuildNet8ArtifactDirectory(r));
 
-            return targetRuntimes.Concat(net8Runtimes);
+            return targetRuntimes;
         }
 
         private static IEnumerable<string> GetAllRuntimesToSign()
         {
             var runtimeToSign = Settings.SignInfo.RuntimesToSign;
-            var net8Runtimes = runtimeToSign.Select(r => BuildNet8ArtifactDirectory(r));
 
-            return runtimeToSign.Concat(net8Runtimes);
+            return runtimeToSign;
         }
 
         public static void AddGoZip()
@@ -777,8 +706,6 @@ public static void AddGoZip()
             foreach (var runtime in combinedRuntimesToSign)
             {
                 var runtimeId = GetRuntimeId(runtime);
-                // Remove the Net8ArtifactNameSuffix suffix if present
-                runtimeId = runtimeId.Replace(Net8ArtifactNameSuffix, "");
                 if (runtimeToGoEnv.TryGetValue(runtimeId, out var goEnv))
                 {
                     Environment.SetEnvironmentVariable("CGO_ENABLED", "0");
@@ -842,6 +769,13 @@ private static void RemoveLanguageWorkers(string outputPath)
             }
         }
 
+        private static void CreateMinConfigurationFile(string outputPath)
+        {
+            var filePath = Path.Combine(outputPath, "artifactsconfig.json");
+            string artifactsJsonContent = "{\"minifiedVersion\": true}";
+            File.WriteAllTextAsync(filePath, artifactsJsonContent).GetAwaiter().GetResult();
+        }
+
         private static PackageInfo GetLatestPackageInfo(string name, string majorVersion, string source)
         {
             string includeAllVersion = !string.IsNullOrWhiteSpace(majorVersion) ? "-AllVersions" : string.Empty;

build/Program.cs

@@ -33,7 +33,6 @@ static void Main(string[] args)
                 .Then(DotnetPublishForNupkg)
                 .Then(DotnetPack)
                 .Then(CreateIntegrationTestsBuildManifest, skip: !args.Contains("--integrationTests"))
-                .Then(UploadToStorage, skip: !args.Contains("--ci"))
                 .Run();
         }
     }

build/Settings.cs

@@ -19,10 +19,10 @@ private static string config(string @default = null, [CallerMemberName] string k
                 : value;
         }
 
-        public const string DotnetIsolatedItemTemplatesVersion = "4.0.3062";
-        public const string DotnetIsolatedProjectTemplatesVersion = "4.0.3062";
-        public const string DotnetItemTemplatesVersion = "4.0.3038";
-        public const string DotnetProjectTemplatesVersion = "4.0.3038";
+        public const string DotnetIsolatedItemTemplatesVersion = "4.0.5032";
+        public const string DotnetIsolatedProjectTemplatesVersion = "4.0.5032";
+        public const string DotnetItemTemplatesVersion = "4.0.5032";
+        public const string DotnetProjectTemplatesVersion = "4.0.5032";
         public const string TemplateJsonVersion = "3.1.1648";
 
         public static readonly string SBOMManifestToolPath = Path.GetFullPath("../ManifestTool/Microsoft.ManifestTool.dll");
@@ -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")
             };
         }

code-mirror.yml

@@ -8,6 +8,7 @@ trigger:
     - release_4.0
     - release_3.0
     - release_4.0_hotfix
+    - feature/*
 
 resources:
   repositories:

eng/ci/build-core-tools-host-artifacts-windows.yml

@@ -0,0 +1,40 @@
+pr: none
+
+trigger:
+  branches:
+    include:
+    - feature/oop-host
+  paths:
+    include:
+      - /host/src/**
+
+resources:
+  repositories:
+    - repository: 1es
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+    - repository: eng
+      type: git
+      name: engineering
+      ref: refs/tags/release
+
+variables:
+  - template: /ci/variables/cfs.yml@eng
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1es
+  parameters:
+    pool:
+      name: 1es-pool-azfunc
+      image: 1es-windows-2022
+      os: windows
+    sdl:
+      codeql:
+         compiled:
+           enabled: true
+         runSourceLanguagesInSourceAnalysis: true
+    stages:
+      - stage: BuildCoreToolsHost
+        jobs:
+        - template: /eng/ci/templates/official/jobs/build-core-tools-host.yml@self

eng/ci/official-build.yml

@@ -15,6 +15,7 @@ trigger:
     include:
     - v4.x
     - release_4.0
+    - feature/*
 
 resources:
   repositories:

eng/ci/public-build.yml

@@ -13,13 +13,15 @@ pr:
     include:
     - v4.x
     - release_4.0
+    - feature/*
 
 trigger:
   batch: true
   branches:
     include:
     - v4.x
     - release_4.0
+    - feature/*
 
 resources:
   repositories: