From 155e170849f33d50b519e135636c734e8f069dde Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 10:40:38 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/sdk
build 20230616.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
From Version 7.0.400-preview.23315.52 -> To Version 7.0.400-preview.23316.1
---
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index df4029e49..359c6efc1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -98,22 +98,22 @@
<Sha>98b55256c6cdfc0ed98c52d7d39127fa55971330</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400-preview.23315.52">
+ <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400-preview.23316.1">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c7a7bf32d7c1fd49d711258f41aad4d0aadc8627</Sha>
+ <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
</Dependency>
- <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-preview.23315.52">
+ <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-preview.23316.1">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c7a7bf32d7c1fd49d711258f41aad4d0aadc8627</Sha>
+ <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-preview.23315.52">
+ <Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-preview.23316.1">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c7a7bf32d7c1fd49d711258f41aad4d0aadc8627</Sha>
+ <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-preview.23315.52">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-preview.23316.1">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c7a7bf32d7c1fd49d711258f41aad4d0aadc8627</Sha>
+ <Sha>c16c836ef5b2620420650a73b0578b18da83e336</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.7-servicing.23274.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index c16955926..72bb0f252 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.400-preview.23315.52</MicrosoftDotNetCommonItemTemplatesPackageVersion>
- <MicrosoftNETSdkPackageVersion>7.0.400-preview.23315.52</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-preview.23315.52</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.400-preview.23316.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+ <MicrosoftNETSdkPackageVersion>7.0.400-preview.23316.1</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-preview.23316.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From aed95cb1676bf20914deb1fed3a5cee5edca33f6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:45:55 +0000
Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/sdk
build 20230616.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
From Version 7.0.400-preview.23315.52 -> To Version 7.0.400-preview.23316.4
Dependency coherency updates
Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
From Version 17.7.0-preview-23315-03 -> To Version 17.7.0-preview-23316-03 (parent: Microsoft.NET.Sdk
---
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 6 +++---
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 359c6efc1..f716993a1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -98,22 +98,22 @@
<Sha>98b55256c6cdfc0ed98c52d7d39127fa55971330</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400-preview.23316.1">
+ <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.400-preview.23316.4">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
+ <Sha>8e607859d946269746f6dcb0d7deaee52d126f46</Sha>
</Dependency>
- <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-preview.23316.1">
+ <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.400-preview.23316.4">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
+ <Sha>8e607859d946269746f6dcb0d7deaee52d126f46</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-preview.23316.1">
+ <Dependency Name="Microsoft.NET.Sdk" Version="7.0.400-preview.23316.4">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
+ <Sha>8e607859d946269746f6dcb0d7deaee52d126f46</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-preview.23316.1">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.400-preview.23316.4">
<Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>c16c836ef5b2620420650a73b0578b18da83e336</Sha>
+ <Sha>8e607859d946269746f6dcb0d7deaee52d126f46</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.7-servicing.23274.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -149,13 +149,13 @@
<Sha>fcfb85983ac231b870ed737d4be669b50d627b64</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.Build" Version="17.7.0-preview-23315-03" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.Build" Version="17.7.0-preview-23316-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
- <Sha>e33c367200474b0497c2b52627c1407a8d00be0e</Sha>
+ <Sha>0fdab8fb802dbd4d75065a282a9cf8bd4f665af2</Sha>
</Dependency>
- <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23315-03" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23316-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
- <Sha>e33c367200474b0497c2b52627c1407a8d00be0e</Sha>
+ <Sha>0fdab8fb802dbd4d75065a282a9cf8bd4f665af2</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.80" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 72bb0f252..5b8a65090 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.400-preview.23316.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
- <MicrosoftNETSdkPackageVersion>7.0.400-preview.23316.1</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-preview.23316.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.400-preview.23316.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+ <MicrosoftNETSdkPackageVersion>7.0.400-preview.23316.4</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.400-preview.23316.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>