From 6d5c0dd280b29af88030d3862594f66ed12e8d0c Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Wed, 1 Jun 2022 22:13:21 +0000
Subject: [PATCH] Integrate new user-jwts tool into installer

---
 eng/Version.Details.xml                              | 4 ++++
 eng/Versions.props                                   | 1 +
 src/SourceBuild/tarball/content/repos/installer.proj | 1 +
 src/redist/targets/BundledDotnetTools.targets        | 1 +
 4 files changed, 7 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4428bb64f38d..5cc9c34a5edf 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,6 +73,10 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890</Sha>
     </Dependency>
+    <Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.5.22273.7" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890</Sha>
+    </Dependency>
     <Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.5.22273.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>67d0c9fd4ebd0dafea4847b9637c1c86ec3b2890</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3ac4b93ec7ff..15d0e48db400 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,6 +57,7 @@
     <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.5.22273.7</MicrosoftAspNetCoreAppRefInternalPackageVersion>
     <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.5.22273.7</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
     <dotnetdevcertsPackageVersion>7.0.0-preview.5.22273.7</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>7.0.0-preview.5.22273.7</dotnetuserjwtsPackageVersion>
     <dotnetusersecretsPackageVersion>7.0.0-preview.5.22273.7</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj
index 20680dc30f32..f0f17e2a8eb3 100644
--- a/src/SourceBuild/tarball/content/repos/installer.proj
+++ b/src/SourceBuild/tarball/content/repos/installer.proj
@@ -85,6 +85,7 @@
       Unable to find package dotnet-ef.
       Unable to find package dotnet-sql-cache.
       Unable to find package dotnet-user-secrets.
+      Unable to find package dotnet-user-jwts.
       Unable to find package dotnet-watch.  -->
     <EnvironmentVariables Include="CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS=true" />
   </ItemGroup>
diff --git a/src/redist/targets/BundledDotnetTools.targets b/src/redist/targets/BundledDotnetTools.targets
index 2c816393d95f..ab3b5e34a531 100644
--- a/src/redist/targets/BundledDotnetTools.targets
+++ b/src/redist/targets/BundledDotnetTools.targets
@@ -1,6 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
     <BundledDotnetTool Include="dotnet-dev-certs" Version="$(DotnetDevCertsPackageVersion)" />
+    <BundledDotnetTool Include="dotnet-user-jwts" Version="$(DotnetUserJwtsPackageVersion)" />
     <BundledDotnetTool Include="dotnet-user-secrets" Version="$(DotnetUserSecretsPackageVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
   </ItemGroup>