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

Merge pull request #14028 from dotnet/darc-release/6.0.4xx-73e99a82-8aef-45a9-8cb0-dcb56f16b82b

Browse source 
[release/6.0.4xx] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine 2022-06-23 13:12:19 -07:00 committed by GitHub
commit 86f8daffe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -90,27 +90,27 @@
<Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha> <Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" /> <SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.400-preview.22320.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.400-preview.22323.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>4ffcc8a85649b22d710db1b5342cc2fd358431dc</Sha> <Sha>f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.400-preview.22320.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.400-preview.22323.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>4ffcc8a85649b22d710db1b5342cc2fd358431dc</Sha> <Sha>f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" /> <SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.400-preview.22320.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.400-preview.22323.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>4ffcc8a85649b22d710db1b5342cc2fd358431dc</Sha> <Sha>f12ae931a9ecc54ae5ae8ddb5b27dd356dd373d7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.400-preview.22323.1"> <Dependency Name="Microsoft.NET.Sdk" Version="6.0.400-preview.22323.8">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>fc8e5cc04f45b9b02f3bea7fab4953392430963b</Sha> <Sha>3bdf81df91c0703a9ae1892b0e46e7c6e0e669e0</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.400-preview.22323.1"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.400-preview.22323.8">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>fc8e5cc04f45b9b02f3bea7fab4953392430963b</Sha> <Sha>3bdf81df91c0703a9ae1892b0e46e7c6e0e669e0</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- 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="6.0.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

8
eng/Versions.props
View file

@ -31,7 +31,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating --> <!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.400-preview.22320.4</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.400-preview.22323.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates --> <!-- Dependency from https://github.com/dotnet/test-templates -->
@ -56,8 +56,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.400-preview.22323.1</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>6.0.400-preview.22323.8</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.400-preview.22323.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.400-preview.22323.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -113,7 +113,7 @@
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion> <MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion> <NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion> <MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.400-preview.22320.4</MicrosoftDotNetCommonProjectTemplates60PackageVersion> <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.400-preview.22323.1</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates> <AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
<!-- 5.0 Template versions --> <!-- 5.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion> <MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>