Skip to content

Commit

Permalink
Merged PR 29823: [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.23123.11 to 4.5.0-6.23127.3 (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**: 20230228.1
- **Date Produced**: February 28, 2023 10:36:52 AM UTC
- **Commit**: 288f106
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.202][6]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23123.11 to 4.5.0-6.23127.3][7]
  - **Microsoft.Build**: [from 17.5.0 to 17.5.0][8]

[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19d897b&targetVersion=GC288f106&_a=files
[7]: dotnet/roslyn@271ccd7...e2bc27d
[8]: dotnet/msbuild@8ce3029...6f08c67

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed Feb 28, 2023
1 parent 8a516d2 commit 6c74320
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<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-8ce3029" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ce3029f/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-6f08c67-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6f08c67f-1/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-19d897b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-19d897be/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-288f106" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-288f1065/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" />
Expand Down Expand Up @@ -53,7 +53,7 @@
<!-- 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-19d897b" value="true" />
<add key="darc-int-dotnet-sdk-288f106" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,20 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.202">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.202-servicing.23127.10">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.202-servicing.23128.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.202-servicing.23127.10">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.202-servicing.23128.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.202-servicing.23127.10">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.202-servicing.23128.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>19d897be95902ca23a704f58d2fa7adf5b13106c</Sha>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</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.23123.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-6.23127.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>271ccd71554f7d28d2f90551aafd0bdeb5d327aa</Sha>
<Sha>e2bc27d266040403e0c6de24f29a6bdce5cc7231</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>8ce3029f48a4169237024a8f0bb4b07727a151a7</Sha>
<Sha>6f08c67f3ed838dccfbcdab91e6bebc54a26fd94</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.5.0-preview-23066-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.202</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.202-servicing.23127.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.202-servicing.23127.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.202-servicing.23128.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.202-servicing.23128.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit 6c74320

Please sign in to comment.