Fix 6.0 SiteExtensions version, turn SiteExtension build on in CI (#5…

…0706) * Fix 6.0 SiteExtensions version * Update ci.yml
dotnet · Sep 14, 2023 · 6e49859 · adminspring · Oct 15, 2023 · 6e49859
1 parent 36d30fd
commit 6e49859
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -283,17 +283,15 @@ stages:
                   $(WindowsArm64LogArgs)
           displayName: Build ARM64
 
-        # Submit a manual build (in public or internal project) to validate changes to site extensions.
-        - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-          - script: .\src\SiteExtensions\build.cmd
-                    -ci
-                    -noBuildRepoTasks
-                    -pack
-                    -noBuildDeps
-                    -noBuildNative
-                    $(_BuildArgs)
-                    $(_InternalRuntimeDownloadArgs)
-            displayName: Build SiteExtension
+        - script: .\src\SiteExtensions\build.cmd
+                  -ci
+                  -noBuildRepoTasks
+                  -pack
+                  -noBuildDeps
+                  -noBuildNative
+                  $(_BuildArgs)
+                  $(_InternalRuntimeDownloadArgs)
+          displayName: Build SiteExtension
 
         # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
         # https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -275,7 +275,7 @@
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
-    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.22-servicing-23415-23</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.22-servicing-23424-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version>7.0.11-servicing-23425-2</MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version>