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

Merge pull request #14062 from dotnet/darc-main-07460392-3ea9-4a78-ae51-ce692bea78b7

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

48
eng/Version.Details.xml
View file

@ -52,34 +52,34 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0402550585f54e88707af55652111ace793ef27f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.7.22330.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.7.22330.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c46fad5429fb6bf0fbfae93108e36e75a2cf929a</Sha>
<Sha>86c7e0100ab40a19fcccf6ee80550b44e8e62444</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22307.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -107,14 +107,14 @@
<Sha>0b9b0b4e7abc5d41b6308f91101981b0b21d90f2</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.7.22330.12">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.7.22330.18">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>fe14fa03cfc49f80ed4714d5bd3b59a464bb050f</Sha>
<Sha>72c873e3721273b47b7ae94123df5777ccd5dbdc</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.7.22330.12">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.7.22330.18">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>fe14fa03cfc49f80ed4714d5bd3b59a464bb050f</Sha>
<Sha>72c873e3721273b47b7ae94123df5777ccd5dbdc</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-preview.7.22329.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -125,18 +125,18 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>860c6b03899b61bdf0bfdad831c769c5807aa0d8</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22274.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22329.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha>
<Sha>702b8e77f5fbfe21e6743324c1750503e02f182d</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22274.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22329.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha>
<Sha>702b8e77f5fbfe21e6743324c1750503e02f182d</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220629-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220630-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>4f900dcf2d7e3e8d4721fdb10b0e2db2babbdc88</Sha>
<Sha>bda2fdaae5dfe28ffe7d21405377d3c429efe4eb</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22329.2" CoherentParentDependency="Microsoft.NET.Sdk">

20
eng/Versions.props
View file

@ -52,21 +52,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22330.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.7.22330.4</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.7.22330.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22330.4</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-preview.7.22330.4</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-preview.7.22330.4</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-preview.7.22330.4</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22330.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.7.22330.6</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.7.22330.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22330.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-preview.7.22330.6</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-preview.7.22330.6</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-preview.7.22330.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-preview.7.22330.12</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.7.22330.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-preview.7.22330.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.7.22330.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -168,7 +168,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.3.0-preview-20220629-02</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.3.0-preview-20220630-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>