From 2d2400f5e97970cffddd22028c83c6d6076a018a Mon Sep 17 00:00:00 2001
From: "Scott Beddall (from Dev Box)" <scbedd@microsoft.com>
Date: Mon, 8 Apr 2024 15:55:09 -0700
Subject: [PATCH] re-add release template, update reference to
 azure-sdk-build-tools to fix the publishing issue

---
 .../templates/stages/1es-redirect.yml         |  2 +-
 .../stages/archetype-sdk-tool-dotnet.yml      | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/eng/pipelines/templates/stages/1es-redirect.yml b/eng/pipelines/templates/stages/1es-redirect.yml
index 65f5e71523a..172e5e8f10b 100644
--- a/eng/pipelines/templates/stages/1es-redirect.yml
+++ b/eng/pipelines/templates/stages/1es-redirect.yml
@@ -7,7 +7,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20240320.1
+      ref: refs/heads/remove-optional-publish
 
 parameters:
 - name: stages
diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
index 8577f3b9796..cff399acc56 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
@@ -194,16 +194,16 @@ extends:
                 Publish: false
                 ImageTag: "${{ parameters.DockerTagPrefix }}$(Build.BuildNumber)"
 
-      # - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
-      #   - template: pipelines/stages/net-release-to-feed.yml@azure-sdk-build-tools
-      #     parameters:
-      #       # Publish to https://dev.azure.com/azure-sdk/public/_packaging?_a=feed&feed=azure-sdk-for-net
-      #       DevOpsFeedId: '29ec6040-b234-4e31-b139-33dc4287b756/fa8c16a3-dbe0-4de2-a297-03065ec1ba3f'
-      #       ExeMatrix: ${{ parameters.StandaloneExeMatrix }}
-      #       ShouldPublishExecutables: ${{ parameters.ReleaseBinaries }}
-      #       ShouldPublishSymbols: ${{ parameters.ShouldPublishSymbols }}
-      #       RequireStrongNames: ${{ parameters.RequireStrongNames }}
-      #       Use1ESTemplate: true
+      - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
+        - template: pipelines/stages/net-release-to-feed.yml@azure-sdk-build-tools
+          parameters:
+            # Publish to https://dev.azure.com/azure-sdk/public/_packaging?_a=feed&feed=azure-sdk-for-net
+            DevOpsFeedId: '29ec6040-b234-4e31-b139-33dc4287b756/fa8c16a3-dbe0-4de2-a297-03065ec1ba3f'
+            ExeMatrix: ${{ parameters.StandaloneExeMatrix }}
+            ShouldPublishExecutables: ${{ parameters.ReleaseBinaries }}
+            ShouldPublishSymbols: ${{ parameters.ShouldPublishSymbols }}
+            RequireStrongNames: ${{ parameters.RequireStrongNames }}
+            Use1ESTemplate: true
 
       - ${{if and(not(eq(length(parameters.DockerDeployments), 0)), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
         - stage: PublishDockerImages