Skip to content

Commit bb24aaf

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 27866: [internal/release/7.0.1xx] 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.WindowsDesktop.App.Ref**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.1-servicing.22566.4 to 7.0.1-servicing.22568.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.1-servicing.22567.2 to 7.0.1-servicing.22569.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221129.2 - **Date Produced**: November 29, 2022 12:43:23 PM UTC - **Commit**: d297319 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.1 to 7.0.1][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.1-servicing.22566.4 to 7.0.1-servicing.22568.11][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.1-servicing.22567.2 to 7.0.1-servicing....
1 parent 2029e50 commit bb24aaf

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎NuGet.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<add key="darc-int-dotnet-runtime-97203d3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97203d38/nuget/v3/index.json" />
2121
<!-- End: Package sources from dotnet-runtime -->
2222
<!-- Begin: Package sources from dotnet-sdk -->
23-
<add key="darc-int-dotnet-sdk-9190935" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-91909352/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-sdk-d297319" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d2973199/nuget/v3/index.json" />
2424
<!-- End: Package sources from dotnet-sdk -->
2525
<!-- Begin: Package sources from dotnet-windowsdesktop -->
26-
<add key="darc-int-dotnet-windowsdesktop-0d6ee94" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0d6ee94e/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-379885d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-379885d3/nuget/v3/index.json" />
2727
<!-- End: Package sources from dotnet-windowsdesktop -->
2828
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2929
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -51,10 +51,10 @@
5151
<!-- Begin: Package sources from dotnet-runtime -->
5252
<add key="darc-int-dotnet-runtime-97203d3" value="true" />
5353
<!-- Begin: Package sources from dotnet-sdk -->
54-
<add key="darc-int-dotnet-sdk-9190935" value="true" />
54+
<add key="darc-int-dotnet-sdk-d297319" value="true" />
5555
<!-- End: Package sources from dotnet-sdk -->
5656
<!-- Begin: Package sources from dotnet-windowsdesktop -->
57-
<add key="darc-int-dotnet-windowsdesktop-0d6ee94" value="true" />
57+
<add key="darc-int-dotnet-windowsdesktop-379885d" value="true" />
5858
<!-- End: Package sources from dotnet-windowsdesktop -->
5959
<!-- End: Package sources from dotnet-runtime -->
6060
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
6-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
6+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
77
</Dependency>
8-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.1-servicing.22578.5" CoherentParentDependency="Microsoft.NET.Sdk">
8+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.1-servicing.22579.1" CoherentParentDependency="Microsoft.NET.Sdk">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
10-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
10+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
1111
</Dependency>
12-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.1-servicing.22578.5" CoherentParentDependency="Microsoft.NET.Sdk">
12+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.1-servicing.22579.1" CoherentParentDependency="Microsoft.NET.Sdk">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
14-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
14+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
18-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
18+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
1919
</Dependency>
2020
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.1-servicing.22568.4" CoherentParentDependency="Microsoft.NET.Sdk">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -100,29 +100,29 @@
100100
</Dependency>
101101
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.101">
102102
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
103-
<Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
103+
<Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.101-servicing.22578.10">
105+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.101-servicing.22579.2">
106106
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
107-
<Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
107+
<Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.101-servicing.22578.10">
109+
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.101-servicing.22579.2">
110110
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
111-
<Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
111+
<Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
112112
<SourceBuild RepoName="sdk" ManagedOnly="true" />
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.101-servicing.22578.10">
114+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.101-servicing.22579.2">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
116-
<Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
116+
<Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
117117
</Dependency>
118118
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
119-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.1-servicing.22566.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
119+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.1-servicing.22568.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
120120
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
121-
<Sha>b32a0afc982d443052bd9c6bd4ebe6177575681c</Sha>
121+
<Sha>c09becd38536311776313f64bdc8f051c59de7a3</Sha>
122122
</Dependency>
123-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.1-servicing.22567.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
123+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.1-servicing.22569.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
124124
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
125-
<Sha>a6985a3e91f88860fd72ccc712c143b0a1dbd852</Sha>
125+
<Sha>b824ea7e65424cd8b0121cc7d2dea88a4a2cb4aa</Sha>
126126
</Dependency>
127127
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22567.3" CoherentParentDependency="Microsoft.NET.Sdk">
128128
<Uri>https://github.com/dotnet/fsharp</Uri>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
</PropertyGroup>
3232
<PropertyGroup>
3333
<!-- Dependency from https://github.com/dotnet/winforms -->
34-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.1-servicing.22566.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
34+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.1-servicing.22568.11</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
3535
</PropertyGroup>
3636
<PropertyGroup>
3737
<!-- Dependency from https://github.com/dotnet/wpf -->
38-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.1-servicing.22567.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
38+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.1-servicing.22569.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -64,8 +64,8 @@
6464
<PropertyGroup>
6565
<!-- Dependencies from https://github.com/dotnet/sdk -->
6666
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.101</MicrosoftDotNetCommonItemTemplatesPackageVersion>
67-
<MicrosoftNETSdkPackageVersion>7.0.101-servicing.22578.10</MicrosoftNETSdkPackageVersion>
68-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.101-servicing.22578.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
67+
<MicrosoftNETSdkPackageVersion>7.0.101-servicing.22579.2</MicrosoftNETSdkPackageVersion>
68+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.101-servicing.22579.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6969
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
7070
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
7171
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -86,8 +86,8 @@
8686
</PropertyGroup>
8787
<PropertyGroup>
8888
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
89-
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.1-servicing.22578.5</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
90-
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.1-servicing.22578.5</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
89+
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.1-servicing.22579.1</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
90+
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.1-servicing.22579.1</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
9191
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
9292
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.1</MicrosoftWindowsDesktopAppRefPackageVersion>
9393
</PropertyGroup>

0 commit comments

Comments
 (0)