Merge pull request #14156 from dotnet/darc-main-1248d168-9e40-44b7-baf2-5a3e000ecb53

[main] Update dependencies from dotnet/sdk
This commit is contained in:
v-wuzhai 2022-07-18 01:09:31 -07:00 committed by GitHub
commit ba9852b82c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View file

@ -107,14 +107,14 @@
<Sha>a87219b0c6de7c07cce71ccc3b3548a2ece6960a</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22367.4">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22367.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>42c6aecfdf7127d587635e778f449903a96c653a</Sha>
<Sha>ccebfe10d50cc749523d77d9ad6db45f30e39601</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22367.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22367.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>42c6aecfdf7127d587635e778f449903a96c653a</Sha>
<Sha>ccebfe10d50cc749523d77d9ad6db45f30e39601</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.0-rc.1.22364.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -150,9 +150,9 @@
<Sha>78f70ad8b87152c2310dc91bb80d30ebf3b011b9</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22365-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22366-04" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>318a061e9967bf91fff152d0911735c6762dcc20</Sha>
<Sha>d2871ca139be8aab866ca995696a9902b6da87f9</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.4.0-preview.1.6" CoherentParentDependency="Microsoft.NET.Sdk">

View file

@ -65,8 +65,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22367.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22367.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22367.7</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22367.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>