Skip to content

Merging internal commits for release/6.0.1xx #15533

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 29 commits into from
Feb 14, 2023
Merged

Merging internal commits for release/6.0.1xx #15533

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
3589f8f
Merge in 'release/6.0.1xx' changes
dotnet-bot Dec 20, 2022
1c4aa23
Merge in 'release/6.0.1xx' changes
dotnet-bot Jan 4, 2023
6230481
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 5, 2023
c1450fc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 6, 2023
7f5dfff
Merged PR 28657: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 9, 2023
e03d74b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 9, 2023
84dc3b6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 9, 2023
b8bcc5a
Merged PR 28721: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 10, 2023
3cda923
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 10, 2023
56a1384
Merge in 'release/6.0.1xx' changes
dotnet-bot Jan 10, 2023
e15f01a
Merge in 'release/6.0.1xx' changes
dotnet-bot Jan 10, 2023
f1d912b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 11, 2023
45e3e97
Merge in 'release/6.0.1xx' changes
dotnet-bot Jan 11, 2023
e9891af
Merge in 'release/6.0.1xx' changes
dotnet-bot Jan 11, 2023
f9524b6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 11, 2023
cb8e7a5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 12, 2023
2b94248
Merged PR 28759: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 13, 2023
1b00343
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 14, 2023
4a2c17a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 18, 2023
546a89d
Merge remote-tracking branch 'upstream/release/6.0.1xx' into merge-in…
mmitche Jan 18, 2023
75f91df
Merged PR 28986: Merge from public
mmitche Jan 19, 2023
0220695
Disable too more tests on linux portable for the known nuget issue.
marcpopMSFT Jan 20, 2023
788cbcf
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jan 20, 2023
ee8db9e
Merged PR 28864: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 20, 2023
3a92ed4
Merged PR 29046: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 23, 2023
559aa79
Merged PR 29136: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 24, 2023
5d7b9b0
Merged PR 29155: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 24, 2023
346c006
Merged PR 29178: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Jan 24, 2023
efebabf
Merge commit '346c0065dd9540261ec07e938b808833446d2a9e' 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 20230120.9

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23070.9

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.14 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk
  • Loading branch information
@dotnet-bot
dotnet-bot committed Jan 20, 2023
commit 788cbcfdba8a243bab2641623855034e4c3f2c9a
8 changes: 4 additions & 4 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<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-a6ffdab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-a6ffdab6/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 -->
<add key="darc-pub-dotnet-emsdk-9f2e9f6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9f2e9f6e/nuget/v3/index.json" />
Expand All @@ -18,7 +18,7 @@
<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-63b2e1d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-63b2e1db/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-6b445bb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-6b445bbe/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 @@ -42,14 +42,14 @@
<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-a6ffdab" value="true" />
<add key="darc-int-dotnet-aspnetcore-ed40528" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-8515e4c" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-63b2e1d" value="true" />
<add key="darc-int-dotnet-templating-6b445bb" 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
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23067.14" 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>a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed</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>a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed</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.23067.14" 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>a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23067.14" 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>a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23067.14" 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>a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand All @@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.114" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce</Sha>
<Sha>6b445bbe8207bbdd76a49e055bb8fe4db03327db</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.114-servicing.23066.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.114-servicing.23069.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce</Sha>
<Sha>6b445bbe8207bbdd76a49e055bb8fe4db03327db</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.114" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce</Sha>
<Sha>6b445bbe8207bbdd76a49e055bb8fe4db03327db</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.114-servicing.23068.11">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.114-servicing.23070.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b4052aff9531aeb35d54ad2c6df8d17fd6acfc52</Sha>
<Sha>0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.114-servicing.23068.11">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.114-servicing.23070.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b4052aff9531aeb35d54ad2c6df8d17fd6acfc52</Sha>
<Sha>0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e</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
12 changes: 6 additions & 6 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.23067.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23067.14</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.14-servicing.23067.14</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.14-servicing.23067.14</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.114-servicing.23068.11</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.114-servicing.23068.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.114-servicing.23070.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.114-servicing.23070.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down