Skip to content

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #14870

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

Closed
dotnet-maestro-bot wants to merge 30 commits into from
Closed

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #14870

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6945973
[internal/release/6.0.3xx] Update dependencies from dotnet/source-bui…
dotnet-bot Aug 31, 2022
956a61e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 1, 2022
f4b36d7
Merge in 'release/6.0.3xx' changes
dotnet-bot Sep 1, 2022
1a05eb9
Merge in 'release/6.0.3xx' changes
dotnet-bot Sep 6, 2022
24a4bb5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 6, 2022
d10c9b7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
7a72362
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 8, 2022
4ba209a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2022
05ac09d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2022
b45ac4a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
952fd4a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
cdc80ef
Merge in 'release/6.0.3xx' changes
dotnet-bot Sep 14, 2022
af8afba
Merged PR 25460: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 14, 2022
62d0b8c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-bot Sep 14, 2022
95d8446
Merge in 'release/6.0.3xx' changes
dotnet-bot Sep 15, 2022
b552d81
Merged PR 25782: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 16, 2022
ba3be67
Merged PR 25512: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 20, 2022
ef06dab
Merged PR 25953: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 20, 2022
1e97ca8
Merged PR 26033: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 20, 2022
a7f3165
Merged PR 26214: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 27, 2022
ee01434
Merged PR 26230: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 27, 2022
de9a4b2
Merged PR 26244: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Sep 27, 2022
7c180f0
Merge commit 'de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c' into internal…
vseanreesermsft Oct 11, 2022
6f28e25
Merge pull request #14714 from vseanreesermsft/internal-merge-6.0.3xx…
mmitche Oct 14, 2022
fab947d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/…
marcpopMSFT Oct 14, 2022
5f500d0
Merge pull request #14772 from dotnet-maestro-bot/merge/release/6.0.3…
v-wuzhai Oct 17, 2022
5b32745
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14807)
dotnet-maestro-bot Oct 21, 2022
c7fe18c
Update branding to 6.0.404
vseanreesermsft Nov 1, 2022
45c95da
Merge pull request #14867 from vseanreesermsft/branding-6.0.404-2022-…
marcpopMSFT Nov 1, 2022
93f8515
Merge branch 'release/6.0.4xx' into release/7.0.1xx
Nov 2, 2022
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 20220913.41

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41
  • Loading branch information
@dotnet-bot
dotnet-bot committed Sep 14, 2022
commit b45ac4a743f7ff12a1a11e75e6dcb73c1926542f
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>0b3a1bf29b9888fb2ae25df25be9f5231606c66f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22463.34">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22463.41">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>0e4434b5bf3a705168fa40e9c5246e9382e5c623</Sha>
<Sha>93fa53773217a253adce7ea28a794ba7920a5919</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22463.34">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22463.41">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>0e4434b5bf3a705168fa40e9c5246e9382e5c623</Sha>
<Sha>93fa53773217a253adce7ea28a794ba7920a5919</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.9-servicing.22419.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
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.305-servicing.22463.34</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22463.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.305-servicing.22463.41</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22463.41</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down