Skip to content

Merging internal commits for release/6.0.4xx #15535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcpopMSFT merged 27 commits into from
Feb 14, 2023
Merged

Merging internal commits for release/6.0.4xx #15535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
268b189
Merge in 'release/6.0.4xx' changes
dotnet-bot Dec 21, 2022
5d552d3
Merge in 'release/6.0.4xx' changes
dotnet-bot Jan 4, 2023
a0e84f9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 5, 2023
7718784
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 6, 2023
6e11cb5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 9, 2023
06cd808
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 9, 2023
c5dff01
Merged PR 28656: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 9, 2023
b1ee0c4
Merge in 'release/6.0.4xx' changes
dotnet-bot Jan 10, 2023
7803a43
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 10, 2023
02ef84f
Merge in 'release/6.0.4xx' changes
dotnet-bot Jan 10, 2023
c52f47e
Merge in 'release/6.0.4xx' changes
dotnet-bot Jan 11, 2023
47b329f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 11, 2023
28146be
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 12, 2023
9e9d205
Merged PR 28778: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 13, 2023
7d32485
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 18, 2023
cc6c2c9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 18, 2023
6985695
Merge remote-tracking branch 'upstream/release/6.0.4xx' into merge-in…
mmitche Jan 18, 2023
d57a0ea
Merged PR 28987: Merge from public
mmitche Jan 19, 2023
71832da
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 19, 2023
c43e9d3
Merged PR 28921: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 21, 2023
1c87de0
Merged PR 29033: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 22, 2023
faa22bb
Merged PR 29076: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 23, 2023
c165970
Merged PR 29135: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 24, 2023
5414ad1
Merged PR 29157: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 24, 2023
f3a869b
Merged PR 29174: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 24, 2023
2988897
Merged PR 29186: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Jan 24, 2023
6606891
Merge commit '2988897946e3c38c4c25ac28979feadc1a521a4d' 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
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d… 
…otnet-sdk build 20230119.18

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23069.18

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk
  • Loading branch information
@dotnet-bot
dotnet-bot committed Jan 19, 2023
commit 71832da9c7f5c30973707c19e3db9f1b9ac690ec
12 changes: 6 additions & 6 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<clear />
<!--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-38c1c4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-38c1c4bb/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-ed40528" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ed405288/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-b6518c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b6518c6a/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-8515e4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8515e4c5/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-3bbeb3f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-3bbeb3f3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-371ce7e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-371ce7e9/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27be4a1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27be4a15/nuget/v3/index.json" />
Expand All @@ -41,13 +41,13 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-38c1c4b" value="true" />
<add key="darc-int-dotnet-aspnetcore-ed40528" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-b6518c6" value="true" />
<add key="darc-int-dotnet-runtime-8515e4c" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-3bbeb3f" value="true" />
<add key="darc-int-dotnet-templating-371ce7e" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27be4a1" value="true" />
Expand Down
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>27be4a15f0ecfb8ac6b958b99a4cafebd2073476</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23063.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23067.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.14-servicing.23063.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.14-servicing.23067.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
Expand All @@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand All @@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.406" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a</Sha>
<Sha>371ce7e98e618aca8770fbd52dfe1d027908e357</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.406-rtm.23067.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.406-rtm.23069.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a</Sha>
<Sha>371ce7e98e618aca8770fbd52dfe1d027908e357</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.406" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a</Sha>
<Sha>371ce7e98e618aca8770fbd52dfe1d027908e357</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.406-servicing.23068.15">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.406-servicing.23069.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>fa83d8f2790b2fc329628f47c61d60032391a40f</Sha>
<Sha>3f72a022e604f6c692c9764a296efe50e52316f1</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.406-servicing.23068.15">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.406-servicing.23069.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>fa83d8f2790b2fc329628f47c61d60032391a40f</Sha>
<Sha>3f72a022e604f6c692c9764a296efe50e52316f1</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.13-servicing.22601.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.14-servicing.23062.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23062.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.14-servicing.23062.15</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.14-servicing.23062.15</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.14-servicing.23068.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23068.14</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.14-servicing.23068.14</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.14-servicing.23068.14</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.406-servicing.23068.15</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.406-servicing.23068.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.406-servicing.23069.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.406-servicing.23069.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand All @@ -68,8 +68,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23063.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.14-servicing.23063.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23067.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.14-servicing.23067.7</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.14</MicrosoftNETCoreAppRefPackageVersion>
Expand Down