Skip to content

Commit

Permalink
Merged PR 36668: [internal/release/8.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**:
  - **NuGet.Build.Tasks**: from 6.9.0-rc.74 to 6.9.1-rc.3 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:45ed5354-fd82-40d3-c464-08dc11e32ec2)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 45ed5354-fd82-40d3-c464-08dc11e32ec2
- **Build**: 20240119.18
- **Date Produced**: January 19, 2024 8:41:48 PM UTC
- **Commit**: af4967de46a87229c49f6d567028791c4c4683d0
- **Branch**: refs/heads/internal/release/8.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.200 to 8.0.200][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.200-rtm.24069.6 to 8.0.200-rtm.24069.18][3]
  - **Microsoft.NET.Sdk**: [from 8.0.200-rtm.24069.6 to 8.0.200-rtm.24069.18][3]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.200-rtm.24069.6 to 8.0.200-rtm.24069.18][3]
  - **NuGet.Build.Tasks**: [from 6.9.0-rc.74 to 6.9.1-rc.3][4]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb52099fa633d4a8951144072c341cf859df36b45&targetVersion=GCaf4967de46a87229c49f6d567028791c4c4683d0&_a=files
[4]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GCe92be3915309e687044768de38933ac5fc4cb40c&targetVersion=GC623fde83a3cd73cb479ec7fa03866c6116894dbf&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:45ed5354-fd82-40d3-c464-08dc11e32ec2)
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jan 19, 2024
2 parents cb6538b + c261601 commit 438cab6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<add key="darc-int-dotnet-runtime-1381d5e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-b52099f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-b52099fa/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-af4967d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-af4967de/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!--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 @@ -47,7 +47,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-1381d5e" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-b52099f" value="true" />
<add key="darc-int-dotnet-sdk-af4967d" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-593444a" value="true" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,20 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.200">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
<Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-rtm.24069.6">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-rtm.24069.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
<Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-rtm.24069.6">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-rtm.24069.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
<Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-rtm.24069.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-rtm.24069.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
<Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand Down Expand Up @@ -159,9 +159,9 @@
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>90725d08d9825ad5897029b47f600345c29125b7</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-rc.74" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Dependency Name="NuGet.Build.Tasks" Version="6.9.1-rc.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
<Sha>623fde83a3cd73cb479ec7fa03866c6116894dbf</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.200-rtm.24069.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-rtm.24069.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.200-rtm.24069.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-rtm.24069.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down Expand Up @@ -127,7 +127,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.9.0-rc.74</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.9.1-rc.3</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
Expand Down Expand Up @@ -249,8 +249,8 @@
<XamarinMacOSWorkloadManifestVersion>13.3.8825-net8-rc1</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>16.4.8825-net8-rc1</XamarinTvOSWorkloadManifestVersion>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>
<!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
Expand Down

0 comments on commit 438cab6

Please sign in to comment.