Skip to content

[automated] Merge branch 'release/5.0.3xx' => 'main' #10581

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
wants to merge 45 commits into from
Closed

[automated] Merge branch 'release/5.0.3xx' => 'main' #10581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
3f92315
Update dependencies from https://github.com/dotnet/sdk build 20210419…
dotnet-maestro[bot] Apr 20, 2021
02c63f3
Update dependencies from https://github.com/dotnet/sdk build 20210420…
dotnet-maestro[bot] Apr 20, 2021
58aa3bf
Update dependencies from https://github.com/dotnet/sdk build 20210420…
dotnet-maestro[bot] Apr 21, 2021
df126f6
Update dependencies from https://github.com/dotnet/sdk build 20210421…
dotnet-maestro[bot] Apr 21, 2021
9777bfd
Update dependencies from https://github.com/dotnet/sdk build 20210421…
dotnet-maestro[bot] Apr 21, 2021
9d535e0
Update dependencies from https://github.com/dotnet/sdk build 20210421…
dotnet-maestro[bot] Apr 22, 2021
a8bc2ff
Update dependencies from https://github.com/dotnet/sdk build 20210422…
dotnet-maestro[bot] Apr 22, 2021
dad43e4
Update dependencies from https://github.com/dotnet/sdk build 20210422…
dotnet-maestro[bot] Apr 22, 2021
67b06e8
Update dependencies from https://github.com/dotnet/sdk build 20210422…
dotnet-maestro[bot] Apr 22, 2021
bc70607
Update dependencies from https://github.com/dotnet/sdk build 20210422…
dotnet-maestro[bot] Apr 22, 2021
5491c9e
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10311)
dotnet-maestro[bot] Apr 23, 2021
b03194f
Update sdl-tsa-vars.config
marcpopMSFT Apr 23, 2021
347d644
Update dependencies from https://github.com/dotnet/sdk build 20210423…
dotnet-maestro[bot] Apr 23, 2021
50ca602
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10319)
dotnet-maestro[bot] Apr 23, 2021
d464fd0
Update dependencies from https://github.com/dotnet/sdk build 20210424…
dotnet-maestro[bot] Apr 24, 2021
52ed897
Update dependencies from https://github.com/dotnet/sdk build 20210425…
dotnet-maestro[bot] Apr 25, 2021
16faa5d
Update dependencies from https://github.com/dotnet/sdk build 20210425…
dotnet-maestro[bot] Apr 26, 2021
80e1ce6
Update dependencies from https://github.com/dotnet/sdk build 20210427…
dotnet-maestro[bot] Apr 27, 2021
3b8864e
Update dependencies from https://github.com/dotnet/sdk build 20210427…
dotnet-maestro[bot] Apr 28, 2021
617b163
Update dependencies from https://github.com/dotnet/sdk build 20210427…
dotnet-maestro[bot] Apr 28, 2021
da8de01
Update dependencies from https://github.com/dotnet/sdk build 20210428…
dotnet-maestro[bot] Apr 29, 2021
cc8452c
Update dependencies from https://github.com/dotnet/sdk build 20210428…
dotnet-maestro[bot] Apr 29, 2021
404ef0e
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10402)
dotnet-maestro[bot] Apr 29, 2021
88e2bbc
Update dependencies from https://github.com/dotnet/sdk build 20210429…
dotnet-maestro[bot] Apr 29, 2021
5d7729e
Update dependencies from https://github.com/dotnet/sdk build 20210429…
dotnet-maestro[bot] Apr 29, 2021
db001f3
Update dependencies from https://github.com/dotnet/sdk build 20210429…
dotnet-maestro[bot] Apr 30, 2021
a350448
Update dependencies from https://github.com/dotnet/sdk build 20210429…
dotnet-maestro[bot] Apr 30, 2021
050a3e7
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10432)
dotnet-maestro[bot] May 1, 2021
bf3fac5
Update dependencies from https://github.com/dotnet/sdk build 20210503…
dotnet-maestro[bot] May 3, 2021
5729ae8
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10478)
dotnet-maestro[bot] May 4, 2021
6a4d140
Update dependencies from https://github.com/dotnet/sdk build 20210504…
dotnet-maestro[bot] May 4, 2021
5c63576
Update dependencies from https://github.com/dotnet/sdk build 20210505…
dotnet-maestro[bot] May 5, 2021
94f1383
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10518)
dotnet-maestro[bot] May 5, 2021
9dc2d38
Update dependencies from https://github.com/dotnet/sdk build 20210506…
dotnet-maestro[bot] May 6, 2021
530a266
Update dependencies from https://github.com/dotnet/sdk build 20210506.16
dotnet-maestro[bot] May 6, 2021
add921b
Update dependencies from https://github.com/dotnet/sdk build 20210507.4
dotnet-maestro[bot] May 7, 2021
15d71de
Merge pull request #10542 from dotnet/darc-release/5.0.3xx-cb6c4acd-e…
marcpopMSFT May 7, 2021
b216e38
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10556)
dotnet-maestro[bot] May 7, 2021
42789e1
Update dependencies from https://github.com/dotnet/sdk build 20210508…
dotnet-maestro[bot] May 8, 2021
e659912
Update dependencies from https://github.com/dotnet/sdk build 20210508…
dotnet-maestro[bot] May 8, 2021
fc11ed4
Update dependencies from https://github.com/dotnet/sdk build 20210510…
dotnet-maestro[bot] May 11, 2021
ced9b4d
Update dependencies from https://github.com/dotnet/sdk build 20210511…
dotnet-maestro[bot] May 11, 2021
2b29192
Update aspnet 2.1/3.1 template version (#10486)
wtgodbe May 11, 2021
4ff2792
Update dependencies from https://github.com/dotnet/sdk build 20210511…
dotnet-maestro[bot] May 12, 2021
77ccb76
Merge branch 'release/5.0.3xx' into main
May 12, 2021
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://github.com/dotnet/sdk build 20210508… 
….4 (#10565)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21256.25 to 4.0.0-2.21258.12 (parent: Microsoft.NET.Sdk)
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] authored May 8, 2021
commit e659912dfb364b0c276a5c0502f2d9a8522da4af
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>468ca46a193f9f935a42efaaebaf6c2bdea94b49</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.300-preview.21258.3">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.300-preview.21258.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9fad80a585dc9786ca4f4a9660f8da4b95d38d34</Sha>
<Sha>d87c6e88c705c85d1d737228bdd90f1b9671e191</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.300-preview.21258.3">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.300-preview.21258.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9fad80a585dc9786ca4f4a9660f8da4b95d38d34</Sha>
<Sha>d87c6e88c705c85d1d737228bdd90f1b9671e191</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="5.0.5-servicing.21167.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand All @@ -117,9 +117,9 @@
<Sha>6a15056a9d71169bf04d007301edfd558afcfa6a</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-2.21256.25" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-2.21258.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>220753bce6d25d610cecfde000a84530bde6aac5</Sha>
<Sha>089d25014f663cbe7c5c90aeea39109c5bc6d35c</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.10.0-preview-21257-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
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 @@ -55,8 +55,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.300-preview.21258.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.300-preview.21258.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>5.0.300-preview.21258.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.300-preview.21258.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down