mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #14164 from dotnet/darc-main-e8412877-cf17-41b2-8216-1c72c2205318

Browse source 
[main] Update dependencies from dotnet/sdk
This commit is contained in:
v-wuzhai 2022-07-18 22:26:49 -07:00 • committed by GitHub
commit f17470a8f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
eng/Version.Details.xml
View file

@ -52,34 +52,34 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>aafa91036e1efd3d4dcb67eeb261cb6d8f774685</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22368.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22368.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5834214ddeab320106c8e728b92b611a8c6add63</Sha>
<Sha>8537d21033f92d6521adf5ce4350d052f48f4185</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22362.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -98,23 +98,23 @@
<Sha>9c5549788cda5238a0e65466cbde9eb4ed42b695</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22368.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22368.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>b6040cc9bb0c25e33bd3f9a545eb3953860ab482</Sha>
<Sha>dd6fd984dc69ebfbe7c6f093888e310a9d92f817</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22368.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22368.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>b6040cc9bb0c25e33bd3f9a545eb3953860ab482</Sha>
<Sha>dd6fd984dc69ebfbe7c6f093888e310a9d92f817</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22368.14">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22368.25">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>eec2ba5c1b6c79c23ac36dc9c1d3ca39e74500b4</Sha>
<Sha>5f8d2d4fa2e70c11a9c2b1b0ec45f1c2658082b5</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22368.14">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22368.25">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>eec2ba5c1b6c79c23ac36dc9c1d3ca39e74500b4</Sha>
<Sha>5f8d2d4fa2e70c11a9c2b1b0ec45f1c2658082b5</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">

20
eng/Versions.props
View file

@ -38,7 +38,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22368.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22368.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -52,21 +52,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22368.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22368.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22368.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22368.2</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22368.2</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22368.2</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22368.2</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22368.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22368.6</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22368.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22368.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22368.6</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22368.6</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22368.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22368.14</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22368.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22368.25</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22368.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>