Skip to content

Commit e12b7af

Browse files
dotnet-botmarcpopMSFT
authored andcommitted
Merged PR 26953: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221021.7 - **Date Produced**: October 21, 2022 10:46:01 PM UTC - **Commit**: 882a576 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][4] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.46 to 7.0.100-rtm.22521.7][4] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.46 to 7.0.100-rtm.22521.7][4] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.46 to 7.0.100-rtm.22521.7][4] - **Microsoft.Net.Compilers.Toolset**: [from 4.4.0-4.22519.21 to 4.4.0-4.22520.11][5] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC962460f&targetVersion=GC882a576&_a=files [5]: dotnet/roslyn@df3e083...9e075f0 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [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.Net.Compilers.Toolset**: from 4.4.0-4.22519.21 to 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
2 parents 4e41c41 + 18d71e1 commit e12b7af

File tree

3 files changed

+23
-13
lines changed

3 files changed

+23
-13
lines changed

NuGet.config

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-aspnetcore -->
1010
<add key="darc-int-dotnet-aspnetcore-bb01bbf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb01bbf4/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-bb01bbf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb01bbf4-2/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-aspnetcore-bb01bbf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb01bbf4-1/nuget/v3/index.json" />
1113
<!-- End: Package sources from dotnet-aspnetcore -->
1214
<!-- Begin: Package sources from dotnet-emsdk -->
1315
<add key="darc-pub-dotnet-emsdk-6b7d1f4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-6b7d1f4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-3/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-emsdk-6b7d1f4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-2/nuget/v3/index.json" />
1418
<add key="darc-pub-dotnet-emsdk-6b7d1f4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-1/nuget/v3/index.json" />
1519
<!-- End: Package sources from dotnet-emsdk -->
1620
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
@@ -20,10 +24,12 @@
2024
<add key="darc-int-dotnet-runtime-d099f07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d099f075/nuget/v3/index.json" />
2125
<!-- End: Package sources from dotnet-runtime -->
2226
<!-- Begin: Package sources from dotnet-sdk -->
23-
<add key="darc-int-dotnet-sdk-962460f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-962460f1/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-sdk-882a576" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-882a5768/nuget/v3/index.json" />
2428
<!-- End: Package sources from dotnet-sdk -->
2529
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2630
<add key="darc-int-dotnet-windowsdesktop-417429f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-windowsdesktop-417429f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc-2/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-windowsdesktop-417429f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc-1/nuget/v3/index.json" />
2733
<!-- End: Package sources from dotnet-windowsdesktop -->
2834
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2935
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -45,14 +51,18 @@
4551
<disabledPackageSources>
4652
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4753
<!-- Begin: Package sources from dotnet-aspnetcore -->
54+
<add key="darc-int-dotnet-aspnetcore-bb01bbf-1" value="true" />
55+
<add key="darc-int-dotnet-aspnetcore-bb01bbf-2" value="true" />
4856
<add key="darc-int-dotnet-aspnetcore-bb01bbf" value="true" />
4957
<!-- End: Package sources from dotnet-aspnetcore -->
5058
<!-- Begin: Package sources from dotnet-runtime -->
5159
<add key="darc-int-dotnet-runtime-d099f07" value="true" />
5260
<!-- Begin: Package sources from dotnet-sdk -->
53-
<add key="darc-int-dotnet-sdk-962460f" value="true" />
61+
<add key="darc-int-dotnet-sdk-882a576" value="true" />
5462
<!-- End: Package sources from dotnet-sdk -->
5563
<!-- Begin: Package sources from dotnet-windowsdesktop -->
64+
<add key="darc-int-dotnet-windowsdesktop-417429f-1" value="true" />
65+
<add key="darc-int-dotnet-windowsdesktop-417429f-2" value="true" />
5666
<add key="darc-int-dotnet-windowsdesktop-417429f" value="true" />
5767
<!-- End: Package sources from dotnet-windowsdesktop -->
5868
<!-- End: Package sources from dotnet-runtime -->

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,20 @@
100100
</Dependency>
101101
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100">
102102
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
103-
<Sha>962460f12e44a2931544e5ec1c55d9ea99b99f21</Sha>
103+
<Sha>882a576873b701f79d6584e4a0cf84036fdcd83f</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rtm.22519.46">
105+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rtm.22521.7">
106106
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
107-
<Sha>962460f12e44a2931544e5ec1c55d9ea99b99f21</Sha>
107+
<Sha>882a576873b701f79d6584e4a0cf84036fdcd83f</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rtm.22519.46">
109+
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rtm.22521.7">
110110
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
111-
<Sha>962460f12e44a2931544e5ec1c55d9ea99b99f21</Sha>
111+
<Sha>882a576873b701f79d6584e4a0cf84036fdcd83f</Sha>
112112
<SourceBuild RepoName="sdk" ManagedOnly="true" />
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rtm.22519.46">
114+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rtm.22521.7">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
116-
<Sha>962460f12e44a2931544e5ec1c55d9ea99b99f21</Sha>
116+
<Sha>882a576873b701f79d6584e4a0cf84036fdcd83f</Sha>
117117
</Dependency>
118118
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
119119
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rtm.22518.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -144,9 +144,9 @@
144144
<SourceBuild RepoName="linker" ManagedOnly="true" />
145145
<RepoName>linker</RepoName>
146146
</Dependency>
147-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-4.22519.21" CoherentParentDependency="Microsoft.NET.Sdk">
147+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-4.22520.11" CoherentParentDependency="Microsoft.NET.Sdk">
148148
<Uri>https://github.com/dotnet/roslyn</Uri>
149-
<Sha>df3e083dcf4840d0b6bce1d021384f0fc606fe9f</Sha>
149+
<Sha>9e075f038a19d493244bc18997fc52a6c6eefa72</Sha>
150150
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
151151
</Dependency>
152152
<Dependency Name="Microsoft.Build" Version="17.4.0" CoherentParentDependency="Microsoft.NET.Sdk">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<PropertyGroup>
6565
<!-- Dependencies from https://github.com/dotnet/sdk -->
6666
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100</MicrosoftDotNetCommonItemTemplatesPackageVersion>
67-
<MicrosoftNETSdkPackageVersion>7.0.100-rtm.22519.46</MicrosoftNETSdkPackageVersion>
68-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rtm.22519.46</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
67+
<MicrosoftNETSdkPackageVersion>7.0.100-rtm.22521.7</MicrosoftNETSdkPackageVersion>
68+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rtm.22521.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6969
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
7070
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
7171
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

0 commit comments

Comments
 (0)