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

Merge branch 'darc-main-004b9fc9-8a00-48dc-8968-1e96c744fb5b' of https://github.com/dotnet/installer into darc-main-004b9fc9-8a00-48dc-8968-1e96c744fb5b

Browse source
This commit is contained in:
MichaelSimons 2022-07-12 13:45:23 +00:00
commit a4f704210d
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
eng/Version.Details.xml
View file

@ -52,34 +52,34 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.7.22361.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.7.22361.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6bac4240ec435a64d92f7b6fe140b330cb7dc46f</Sha>
<Sha>3b3ba24691a33eab2dc42efd3e401a061096a529</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22357.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -107,14 +107,14 @@
<Sha>0bc8addffefdf3e521bd3bf422922fae4c28187d</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.7.22362.2">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.7.22362.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>14a527b419149545e4806ec340e50f9a97bbe3ac</Sha>
<Sha>dc71aa0196ed83886cdc86c7a433131b73089763</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.7.22362.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.7.22362.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>14a527b419149545e4806ec340e50f9a97bbe3ac</Sha>
<Sha>dc71aa0196ed83886cdc86c7a433131b73089763</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.22357.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

18
eng/Versions.props
View file

@ -52,21 +52,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22361.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.7.22361.8</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.7.22361.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22361.8</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-preview.7.22361.8</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-preview.7.22361.8</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-preview.7.22361.8</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22361.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.7.22361.9</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.7.22361.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22361.9</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-preview.7.22361.9</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-preview.7.22361.9</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-preview.7.22361.9</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-preview.7.22362.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.7.22362.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-preview.7.22362.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.7.22362.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>