Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
10bec22
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Dec 7, 2022
d721a4e
Merge in 'release/6.0.3xx' changes
dotnet-bot Dec 20, 2022
3205e03
Merge in 'release/6.0.3xx' changes
dotnet-bot Jan 4, 2023
e417a06
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 5, 2023
f58ac28
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 6, 2023
172d593
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 7, 2023
8d481cd
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 9, 2023
4a73032
Merged PR 28253: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 10, 2023
48faeab
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 10, 2023
ccb1de1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 10, 2023
0025828
Merge in 'release/6.0.3xx' changes
dotnet-bot Jan 10, 2023
60a8b19
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 10, 2023
2eb304e
Merge in 'release/6.0.3xx' changes
dotnet-bot Jan 10, 2023
e3198ac
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 11, 2023
889d5b8
Merge in 'release/6.0.3xx' changes
dotnet-bot Jan 11, 2023
e78bc12
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 11, 2023
e5ffd17
Merge in 'release/6.0.3xx' changes
dotnet-bot Jan 12, 2023
9abc035
Merged PR 28747: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 13, 2023
1802f41
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 17, 2023
493a5a8
Merged PR 28899: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 17, 2023
567e0c9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 19, 2023
cdfc1da
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 19, 2023
d460175
Merged PR 28992: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 21, 2023
8e99d20
Merged PR 29049: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 23, 2023
4520d0d
Merged PR 29134: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 24, 2023
c443277
Merged PR 29158: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 24, 2023
67ef69f
Merged PR 29180: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 24, 2023
f629b02
Merged PR 29189: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Jan 24, 2023
544611d
Merge commit 'f629b020f8d8d0a4b6870be21e76ad9c68f18151' into internal…
vseanreesermsft Feb 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merged PR 29189: [internal/release/6.0.3xx] 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.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230124.34
- **Date Produced**: January 24, 2023 8:41:08 PM UTC
- **Commit**: 54b8f37
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1]
  - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.309 to 6.0.309][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.309 to 6.0.309][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb814c7c&targetVersion=GC54b8f37&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe455bc6&targetVersion=GCffeddec&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
  • Loading branch information
dotnet-bot authored and mmitche committed Jan 24, 2023
commit f629b020f8d8d0a4b6870be21e76ad9c68f18151
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e455bc6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e455bc6f/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ffeddec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ffeddec3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-c9ab6d8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9ab6d88/nuget/v3/index.json" />
Expand Down Expand Up @@ -46,7 +46,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e455bc6" value="true" />
<add key="darc-int-dotnet-templating-ffeddec" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-c9ab6d8" value="true" />
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.309" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e455bc6fbb9d9ba5cad34f405fb2c278881f038a</Sha>
<Sha>ffeddec3efcbb43f226550c3b8bfe8d11765f723</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.309-servicing.23070.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.309-servicing.23074.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e455bc6fbb9d9ba5cad34f405fb2c278881f038a</Sha>
<Sha>ffeddec3efcbb43f226550c3b8bfe8d11765f723</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.309" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e455bc6fbb9d9ba5cad34f405fb2c278881f038a</Sha>
<Sha>ffeddec3efcbb43f226550c3b8bfe8d11765f723</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23074.27">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23074.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b814c7cbbf53a1fa23c050ab74d116693dbd58bc</Sha>
<Sha>54b8f37b145c05ddfe75705c6fd03cab42f2c532</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23074.27">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23074.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b814c7cbbf53a1fa23c050ab74d116693dbd58bc</Sha>
<Sha>54b8f37b145c05ddfe75705c6fd03cab42f2c532</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="6.0.14-servicing.23074.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23074.27</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23074.27</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23074.34</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23074.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down