Update 1ES CI (#3086)

* Fix version suffix logic

* Add schedules, fix public pr trigger

* Update Azure.Identity

* Fix sign glob

* Skip flaky test

* Fix package downgrade issue

NuGet.Config

@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
   </packageSources>
 </configuration>

eng/ci/official-build.yml

@@ -4,6 +4,15 @@ trigger:
     include:
     - dev
 
+schedules:
+# Ensure we build nightly to catch any new CVEs and report SDL often.
+- cron: "0 0 * * *"
+  displayName: Nightly Build
+  branches:
+    include:
+    - dev
+  always: true
+
 # CI only, does not trigger on PRs.
 pr: none
 
@@ -30,6 +39,11 @@ extends:
       image: 1es-windows-2022
       os: windows
 
+    sdl:
+      codeql:
+        # Move codeql for source languages to source analysis stage
+        runSourceLanguagesInSourceAnalysis: true
+
     stages:
     - stage: Build
       jobs:

eng/ci/public-build.yml

@@ -6,11 +6,19 @@ trigger:
     include:
     - dev
 
+schedules:
+# Ensure we build nightly to catch any new CVEs and report SDL often.
+- cron: "0 0 * * *"
+  displayName: Nightly Build
+  branches:
+    include:
+    - dev
+  always: true
+
 pr:
   branches:
     include:
-    - v3.x
-    - release/3.*
+    - dev
 
 resources:
   repositories:
@@ -30,6 +38,16 @@ extends:
       image: 1es-windows-2022
       os: windows
 
+    sdl:
+      codeql:
+        compiled:
+          enabled: true
+        runSourceLanguagesInSourceAnalysis: true
+
+    settings:
+      # PR's from forks do not have sufficient permissions to set tags.
+      skipBuildTagsForGitHubPullRequests: ${{ variables['System.PullRequest.IsFork'] }}
+
     stages:
       - stage: Build
         jobs:

eng/ci/templates/jobs/build.yml

@@ -17,10 +17,10 @@ jobs:
     value: $[ counter('constant', 12000) ]
   - ${{ if and(eq(parameters.official, true), startsWith(variables['Build.SourceBranch'], 'refs/tags')) }}:
     - name: version_suffix
-      value: --version-suffix -$(buildNumber)
+      value: ''
   - ${{ else }}:
     - name: version_suffix
-      value: ''
+      value: --version-suffix -$(buildNumber)
 
   templateContext:
     outputParentDirectory: $(Build.ArtifactStagingDirectory)
@@ -68,7 +68,7 @@ jobs:
         parameters:
           displayName: Sign assemblies
           folderPath: src
-          pattern: Microsoft.Azure.WebJobs.*.dll
+          pattern: Microsoft.Azure.WebJobs*.dll
           signType: dll-strong-name
 
     - task: DotNetCoreCLI@2

src/Microsoft.Azure.WebJobs.Logging.ApplicationInsights/WebJobs.Logging.ApplicationInsights.csproj

@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.10.2" />
+    <PackageReference Include="Azure.Identity" Version="1.11.4" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.4" />

test/Microsoft.Azure.WebJobs.Host.UnitTests/Timers/TaskSeriesTimerTests.cs

@@ -755,7 +755,7 @@ namespace Microsoft.Azure.WebJobs.Host.UnitTests.Timers
             ExceptionAssert.DoesNotThrow(() => product.Dispose());
         }
 
-        [Fact]
+        [Fact(Skip = "Flaky: https://github.com/azure/azure-webjobs-sdk/issues/3087")]
         public void Dispose_TriggersCommandCancellationToken()
         {
             // Arrange

test/Microsoft.Azure.WebJobs.Host.UnitTests/WebJobs.Host.UnitTests.csproj

@@ -37,7 +37,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />