Update release_4.0 from v4.x (#3720)

* Add Event Grid Blob trigger (#3647) * Add Event Grid Blob trigger * Fix short name * Update version * Remove version update for TemplateJsonVersion * Fix typo * adding core mirroring yml (#3678) * Fixed typo (#3661) Co-authored-by: Danny Furnivall <danielfurnivall@gmail.com> * Add hard-coded Node templates for EventGrid Blob trigger (#3683) * Add Event Grid Blob trigger * Fix short name * Add Event Grid Blob trigger * .NET8 in-proc support (#3680) * .NET8 Inproc support for host start action. (#3670) * Zip generation updates for Inproc8 * Handling net8 artifact generation for min versions of artifacts (used in VS feed) * Optimizing TestPreSignedArtifacts method. * Zipping _net8.0 artifacts and other cleanups * Publish --self-contained (#3673) * updating template reference for core tools (#3675) * Moved log messages behind "Verbose" logging enabled check. Minor refactoring * Adding a test for .NET8 inproc * Update Microsoft.Azure.WebJobs.Script.WebHost to 4.834.2 * Minor cleanup * Publishing net8 bits as self-contained. Reordering of some code snippets to fix failing test. * Updating tests to reflect recent text changes. * Generating "_net8.0.zip" for all artifacts (previously only for ".min" ones) * Reordered supported target framework list as per PR feedback. Added a new test for unsupported use case. * Changes based on PR feedback * Fixed a test to reflect revised exception message change * Adding `--no-build` in "DotnetPack" step * Revert "Adding `--no-build` in "DotnetPack" step" This reverts commit bb9191a. * Added back `--no-build` flag for pack. Pack only when targetFramework == net6.0 --------- Co-authored-by: Naren Soni <soninaren@users.noreply.github.com> * Adding Docker for .NET 8 on the in-process model (#3686) * Limelight forwarding URL display (#3688) * Limelight forwarding URL display * Port to placeholder and string replacement * nit ; * fix typecasting to resolve build issue --------- Co-authored-by: @arroyc * Include _net8 directories for sign steps. (#3690) * Bump Microsoft.Azure.WebJobs.Script.WebHost from 4.834.2 to 4.834.3 (#3691) * Updated packages. # Conflicts: # src/Azure.Functions.Cli/Azure.Functions.Cli.csproj * Correcting in-process model tag format (#3702) * New Pipelines (#3701) * Change ESRP connection name from hard-coded to variable. * Add official-build.yml for ado * updated official-build.yml for ado * Changed PublishPipelineArtifact to 1ES.PublishPipelineArtifact * Updated ConnectedServiceName of EsrpCodeSigning@1 * Updated ConnectedServiceName of EsrpCodeSigning@1 * Update pool * added clean in nuget.config * added clean in nuget.config * added another clean in nuget.config * added nuget.org back * added cfs.yml in variables * moved official-build.yml * fixed the template files * Changed the spacing * Fixing the spacing in linux-package.yml * Created a new job for packaging * Minor fix in build-test.yml * Added public-build.yml with subset of the tasks. * Changed the pool name * Removed the repository-engineering from public-build.yml * Removed cfs.yml. * Removing simulateReleaseBuild task. * Changed the build parameters. * Skipping deployment test for public pipeline * Skipping resrouce creating for deployment test when the test is skipped * Skip the deployment test if the resource creation fails. * Skipping upload for public build. * Adding the log in the upload step. * Skipping the test step for quick testing. Will add it back. * Updated packages. * Adding the tests back. * removed codeql changes * changed ESRP signing * removing tests for temp * remove the extra signle quote * added inline * minor cleanup * Testing a fix * Testing a fix * Added schedule * Updated the custom docker file * move the public job to public folder * moved esrp task to template * Added codeql in the public pipeline * Added the tests back. * setting the key params to empty * Removed the SBOM logic * Removed the SBOM logic * Removed the extra env variables from public * Removed the extra params in sign-files * Changed back to use khkh/fix-sign-files for eng * added the pool name back * Removing package reference of Microsoft.IdentityModel.JsonWebTokens and System.IdentityModel.Tokens.Jwt packages as they are brought by host. (#3724) * Switched to Engineering release tag (v4) (#3721) * switched to eng release tag. removed v3 reference in public build * updated the start build number * updated the start build number * increasing the timeout of node test because 'npm install' is taking longer * adding more increased timeouts --------- Co-authored-by: azfuncgh <azfuncgh@github.com> * Build number reset for new pipeline (v4) (#3728) * switched to eng release tag. removed v3 reference in public build * build number update --------- Co-authored-by: azfuncgh <azfuncgh@github.com> * Set the inproc net8 executable name based on operating system. (#3730) --------- Co-authored-by: Daniel Castro <castro.daniel@microsoft.com> Co-authored-by: Danny Furnivall <danielfurnivall@gmail.com> Co-authored-by: Shyju Krishnankutty <connectshyju@gmail.com> Co-authored-by: Naren Soni <soninaren@users.noreply.github.com> Co-authored-by: Matthew Henderson <mattchenderson@users.noreply.github.com> Co-authored-by: Varad Meru <vrdmr@users.noreply.github.com> Co-authored-by: azfuncgh <azfuncgh@github.com>
Azure · Jun 28, 2024 · 6ee8879 · 6ee8879
1 parent 807e897
commit 6ee8879
Show file tree

Hide file tree

Showing 15 changed files with 527 additions and 25 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <clear />
   <packageSources>
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="Microsoft.Azure.Functions.PowerShellWorker" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json" />
     <add key="AzureFunctions" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctions/nuget/v3/index.json" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -109,7 +109,7 @@ jobs:
   - task: EsrpCodeSigning@1
     displayName: 'Authenticode signing'
     inputs:
-      ConnectedServiceName: 'ESRP Service'
+      ConnectedServiceName: $(ESRPServiceConnectionName)
       FolderPath: '$(Build.Repository.LocalPath)\artifacts\ToSign\Authenticode\'
       Pattern: '*.dll, *.exe'
       signConfigType: 'inlineSignParams'
@@ -330,7 +330,7 @@ jobs:
   - task: EsrpCodeSigning@3
     displayName: Sign
     inputs:
-      ConnectedServiceName: 'ESRP Service'
+      ConnectedServiceName: $(ESRPServiceConnectionName)
       FolderPath: '/home/vsts/work/1/s/publish-scripts/artifact/'
       Pattern: '*.deb'
       signConfigType: 'inlineSignParams'

diff --git a/build.ps1 b/build.ps1
@@ -13,11 +13,6 @@ if (-not([bool]::TryParse($env:IsReleaseBuild, [ref] $isReleaseBuild)))
 {
     throw "IsReleaseBuild can only be set to true or false."
 }
-$isCodeqlBuild = $null
-if (-not([bool]::TryParse($env:IsCodeqlBuild, [ref] $isCodeqlBuild)))
-{
-    throw "IsCodeqlBuild can only be set to true or false."
-}
 
 if ($env:IntegrationBuildNumber)
 {
@@ -30,15 +25,6 @@ if ($env:IntegrationBuildNumber)
 
     $buildCommand = { dotnet run --integrationTests }
 }
-elseif ($isReleaseBuild)
-{
-    $buildCommand = { dotnet run --ci --generateSBOM }
-}
-elseif ($isCodeqlBuild)
-{
-    Write-Host "isCodeqlBuild is $isCodeqlBuild and isReleaseBuild is $isReleaseBuild"
-    $buildCommand = { dotnet run --ci --codeql }
-}
 else
 {
     $buildCommand = { dotnet run --ci }

diff --git a/build/BuildSteps.cs b/build/BuildSteps.cs
@@ -675,6 +675,16 @@ public static void DeleteSBOMTelemetryFolder()
 
         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);

diff --git a/build/Program.cs b/build/Program.cs
@@ -28,15 +28,12 @@ static void Main(string[] args)
                 .Then(AddGoZip)
                 .Then(TestPreSignedArtifacts, skip: !args.Contains("--ci"))
                 .Then(CopyBinariesToSign, skip: !args.Contains("--ci"))
-                .Then(Test, skip: args.Contains("--codeql"))
-                .Then(GenerateSBOMManifestForZips, skip: !args.Contains("--generateSBOM"))
+                .Then(Test)
                 .Then(Zip)
                 .Then(DotnetPublishForNupkg)
-                .Then(GenerateSBOMManifestForNupkg, skip: !args.Contains("--generateSBOM"))
                 .Then(DotnetPack)
-                .Then(DeleteSBOMTelemetryFolder, skip: !args.Contains("--generateSBOM"))
                 .Then(CreateIntegrationTestsBuildManifest, skip: !args.Contains("--integrationTests"))
-                .Then(UploadToStorage, skip: !args.Contains("--ci") || args.Contains("--codeql"))
+                .Then(UploadToStorage, skip: !args.Contains("--ci"))
                 .Run();
         }
     }

diff --git a/build/Settings.cs b/build/Settings.cs
@@ -204,6 +204,7 @@ private static Dictionary<string, string[]> GetPowerShell74Runtimes()
         public static string CommitId => config("N/A", "Build.SourceVersion");
 
         public static string TelemetryInstrumentationKey => config(null, "TELEMETRY_INSTRUMENTATION_KEY");
+        public static bool IsPublicBuild => string.Equals(config(null, "IsPublicBuild"), true.ToString(), System.StringComparison.OrdinalIgnoreCase);
 
         public static string BuildArtifactsStorage => config(null);
 

diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
@@ -0,0 +1,45 @@
+schedules:
+- cron: "0 0 * * *"
+  displayName: Nightly Build
+  branches:
+    include:
+      - v4.x
+  always: true
+
+name: $(Build.SourceBranchName)_$(Build.Reason)
+
+pr: none
+
+trigger:
+  branches:
+    include:
+    - v4.x
+    - release_4.0
+
+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
+    stages:     
+      - stage: BuildAndTest
+        jobs:
+        - template: /eng/ci/templates/official/jobs/build-test.yml@self
+        - template: /eng/ci/templates/official/jobs/linux-package.yml@self
+
diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
@@ -0,0 +1,47 @@
+schedules:
+- cron: "0 0 * * *"
+  displayName: Nightly Build
+  branches:
+    include:
+      - v4.x
+  always: true
+
+name: $(Build.SourceBranchName)_$(Build.Reason)
+
+pr:
+  branches:
+    include:
+    - v4.x
+    - release_4.0
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - v4.x
+    - release_4.0
+
+resources:
+  repositories:
+  - repository: 1es
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
+  parameters:
+    pool:
+      name: 1es-pool-azfunc-public
+      image: 1es-windows-2022
+      os: windows
+    sdl:
+      codeql:
+         compiled:
+           enabled: true
+         runSourceLanguagesInSourceAnalysis: true
+    stages:     
+      - stage: BuildAndTest
+        jobs:
+        - template: /eng/ci/templates/public/jobs/build-test-public.yml@self
+