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

Merge pull request #13951 from dotnet/darc-main-1bb2593f-9b94-4e91-8d3b-6628661dc88e

Browse source 
[main] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine 2022-06-10 21:19:41 -07:00 committed by GitHub
commit fcbddffa37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
eng/Version.Details.xml
View file

@ -52,34 +52,34 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e026f392b2bb93bc9509ac5403d3e8cd7d3eee72</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.6.22309.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.6.22310.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d94b4873c1aebc1681df4507e1f0c14f059d8bed</Sha>
<Sha>f9b5e1314977496a4c88341b09891d763a44efd1</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>aa1ee83aab36ef8ef862b1061f5cdcec39dbe0c0</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.6.22310.4">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.6.22310.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>0d72b2f3089e4e96f94d143a056b3f04fc74552a</Sha>
<Sha>64d368cfbb89a8c214f874a6559c4679f9134cdc</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.6.22310.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.6.22310.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>0d72b2f3089e4e96f94d143a056b3f04fc74552a</Sha>
<Sha>64d368cfbb89a8c214f874a6559c4679f9134cdc</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.6.22309.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -134,9 +134,9 @@
<Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220609-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220610-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>6311e6c5dcd2fd955fa9a63b27dff0dcf279e9b1</Sha>
<Sha>8cf1e4be0ecc07ba5dcd99a690fd903cd87f8813</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22308.1" 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.6.22309.19</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.6.22309.19</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.6.22309.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.6.22309.19</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-preview.6.22309.19</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-preview.6.22309.19</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-preview.6.22309.19</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.6.22310.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.6.22310.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.6.22310.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.6.22310.5</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-preview.6.22310.5</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-preview.6.22310.5</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-preview.6.22310.5</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-preview.6.22310.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.6.22310.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-preview.6.22310.13</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.6.22310.13</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-20220609-01</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.3.0-preview-20220610-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>