Skip to content

Commit

Permalink
Merged PR 29817: [internal/release/7.0.2xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…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.Net.Compilers.Toolset**: from 4.5.0-6.23109.5 to 4.5.0-6.23123.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230227.10
- **Date Produced**: February 27, 2023 7:35:58 PM UTC
- **Commit**: 19d897b
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.201 to 7.0.202][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.NET.Sdk**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23109.5 to 4.5.0-6.23123.11][4]
  - **Microsoft.Build**: [from 17.5.0 to 17.5.0][5]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ce1f1e&targetVersion=GC19d897b&_a=files
[4]: dotnet/roslyn@6a5a63b...271ccd7
[5]: dotnet/msbuild@81ac935...8ce3029

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed Feb 27, 2023
1 parent b9926d6 commit 8a516d2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 17 deletions.
11 changes: 8 additions & 3 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,24 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-81ac935-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-81ac9354-1/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-8ce3029" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ce3029f/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1ce1f1e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-1ce1f1ed/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-19d897b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-19d897be/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
Expand All @@ -44,14 +47,16 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a396ac" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1ce1f1e" value="true" />
<add key="darc-int-dotnet-sdk-19d897b" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->
Expand Down
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,22 @@
<Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.201">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.202">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1ce1f1ed71df8601a096b8a856840d22fb318bc7</Sha>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.201-rtm.23120.7">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.202-servicing.23127.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1ce1f1ed71df8601a096b8a856840d22fb318bc7</Sha>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.201-rtm.23120.7">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.202-servicing.23127.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1ce1f1ed71df8601a096b8a856840d22fb318bc7</Sha>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.201-rtm.23120.7">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.202-servicing.23127.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1ce1f1ed71df8601a096b8a856840d22fb318bc7</Sha>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</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.4-servicing.23117.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down Expand Up @@ -144,14 +144,14 @@
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-6.23109.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-6.23123.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3</Sha>
<Sha>271ccd71554f7d28d2f90551aafd0bdeb5d327aa</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>81ac93548ee1044f03d0ac363712bb778920ef8c</Sha>
<Sha>8ce3029f48a4169237024a8f0bb4b07727a151a7</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.5.0-preview-23066-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.201</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.201-rtm.23120.7</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.201-rtm.23120.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.202</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.202-servicing.23127.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.202-servicing.23127.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit 8a516d2

Please sign in to comment.