Skip to content

Commit 279043c

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 21347: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.200 to 6.0.201 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22116.10 to 6.0.201-servicing.22120.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.201 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220221.8 - **Date Produced**: February 21, 2022 7:13:06 PM UTC - **Commit**: 2380bdf - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.201-servicing.22121.5 to 6.0.201-servicing.22121.8][1] - **Microsoft.NET.Sdk**: [from 6.0.201-servicing.22121.5 to 6.0.201-servicing.22121.8][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.200 to 6.0.201][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.200-rtm.22116.10 to 6.0.201-servicing.22120.1][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.200 to 6.0.201][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1a8eb3b&targetVersion=GC2380bdf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5a191c3&targetVersion=GCa4fcd0c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)
1 parent 8b121c8 commit 279043c

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<add key="darc-int-dotnet-runtime-10db735" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-10db7350/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-runtime -->
2121
<!-- Begin: Package sources from dotnet-templating -->
22+
<add key="darc-int-dotnet-templating-a4fcd0c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-a4fcd0cd/nuget/v3/index.json" />
2223
<!-- End: Package sources from dotnet-templating -->
2324
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2425
<add key="darc-int-dotnet-windowsdesktop-30b96c6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-30b96c6f-2/nuget/v3/index.json" />
@@ -47,6 +48,7 @@
4748
<!-- Begin: Package sources from dotnet-runtime -->
4849
<add key="darc-int-dotnet-runtime-10db735" value="true" />
4950
<!-- Begin: Package sources from dotnet-templating -->
51+
<add key="darc-int-dotnet-templating-a4fcd0c" value="true" />
5052
<!-- End: Package sources from dotnet-templating -->
5153
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5254
<add key="darc-int-dotnet-windowsdesktop-30b96c6" value="true" />

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,27 @@
9090
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
9191
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.200" CoherentParentDependency="Microsoft.NET.Sdk">
93+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.201" CoherentParentDependency="Microsoft.NET.Sdk">
9494
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
95-
<Sha>5a191c3f5cf233cd4eec14411da4ab9faeb05e50</Sha>
95+
<Sha>a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.200-rtm.22116.10" CoherentParentDependency="Microsoft.NET.Sdk">
97+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.201-servicing.22120.1" CoherentParentDependency="Microsoft.NET.Sdk">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
99-
<Sha>5a191c3f5cf233cd4eec14411da4ab9faeb05e50</Sha>
99+
<Sha>a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae</Sha>
100100
<SourceBuild RepoName="templating" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.200" CoherentParentDependency="Microsoft.NET.Sdk">
102+
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.201" CoherentParentDependency="Microsoft.NET.Sdk">
103103
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
104-
<Sha>5a191c3f5cf233cd4eec14411da4ab9faeb05e50</Sha>
104+
<Sha>a4fcd0cd5cb5a4412b0f617957b38bb9950aa6ae</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.201-servicing.22121.5">
106+
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.201-servicing.22121.8">
107107
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
108-
<Sha>1a8eb3bb727a04f0da5a4f519119f9646d18c0e2</Sha>
108+
<Sha>2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80</Sha>
109109
<SourceBuild RepoName="sdk" ManagedOnly="true" />
110110
</Dependency>
111-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.201-servicing.22121.5">
111+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.201-servicing.22121.8">
112112
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
113-
<Sha>1a8eb3bb727a04f0da5a4f519119f9646d18c0e2</Sha>
113+
<Sha>2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80</Sha>
114114
</Dependency>
115115
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
116116
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.3-servicing.22115.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</PropertyGroup>
3232
<PropertyGroup>
3333
<!-- Dependency from https://github.com/dotnet/templating -->
34-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
34+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.201</MicrosoftDotNetCommonItemTemplatesPackageVersion>
3535
</PropertyGroup>
3636
<PropertyGroup>
3737
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -56,8 +56,8 @@
5656
</PropertyGroup>
5757
<PropertyGroup>
5858
<!-- Dependencies from https://github.com/dotnet/sdk -->
59-
<MicrosoftNETSdkPackageVersion>6.0.201-servicing.22121.5</MicrosoftNETSdkPackageVersion>
60-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.201-servicing.22121.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
59+
<MicrosoftNETSdkPackageVersion>6.0.201-servicing.22121.8</MicrosoftNETSdkPackageVersion>
60+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.201-servicing.22121.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6161
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
6262
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
6363
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -113,7 +113,7 @@
113113
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
114114
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
115115
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
116-
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.200</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
116+
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.201</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
117117
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
118118
<!-- 5.0 Template versions -->
119119
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>

0 commit comments

Comments
 (0)