From c43b7f00f50a475d4371f3bf03c8ba018247fc82 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 22:51:03 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/sdk build
 20230314.22

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23164.4 -> To Version 7.0.300-preview.23164.22
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 16093b1d2..75c8c7f23 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -98,22 +98,22 @@
       <Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23164.4">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23164.22">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e</Sha>
+      <Sha>278bb569e3618a41a1d2ed6a4c336e55783ad4cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23164.4">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23164.22">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e</Sha>
+      <Sha>278bb569e3618a41a1d2ed6a4c336e55783ad4cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23164.4">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23164.22">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e</Sha>
+      <Sha>278bb569e3618a41a1d2ed6a4c336e55783ad4cc</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23164.4">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23164.22">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e</Sha>
+      <Sha>278bb569e3618a41a1d2ed6a4c336e55783ad4cc</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.3-servicing.23072.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 6209eb4c5..22ec40b90 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,9 +69,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23164.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.300-preview.23164.4</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23164.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23164.22</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.300-preview.23164.22</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23164.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -122,8 +122,8 @@
       We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
       Instead the indicator is that the incoming SDK version is not RTM or greater yet.
     -->
-    <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
-    <SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
+    <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
+    <SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
     <AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
     <AspNetCoreTemplateFeature60 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))</AspNetCoreTemplateFeature60>
   </PropertyGroup>