Skip to content
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

[automated] Merge branch 'release/6.0.4xx' => 'main' #14288

Merged
merged 15 commits into from
Aug 9, 2022
Merged

[automated] Merge branch 'release/6.0.4xx' => 'main' #14288

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f2596c2
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Jul 20, 2022
f6d8ed6
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Jul 22, 2022
a6eb5ad
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Jul 27, 2022
d7a4d67
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Jul 28, 2022
807fbf1
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Aug 4, 2022
4514a2a
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Aug 5, 2022
005dd23
Stop app host downloads for android
marcpopMSFT Aug 5, 2022
e759aaf
Update delete files with questionable licenses logic (#14265)
MichaelSimons Aug 5, 2022
372935e
Merge pull request #14268 from dotnet-maestro-bot/merge/release/6.0.1…
marcpopMSFT Aug 5, 2022
16df0cb
Merge pull request #14182 from dotnet/darc-release/6.0.4xx-aad6e795-4…
marcpopMSFT Aug 8, 2022
063d79e
Merge pull request #14270 from dotnet-maestro-bot/merge/release/6.0.3…
marcpopMSFT Aug 8, 2022
b33d35c
Merge pull request #14266 from dotnet/marcpopMSFT-fixapphostdownload
marcpopMSFT Aug 9, 2022
d2d8560
[6.0.4xx] Update template versions from dotnet/aspnetcore (#14245)
dougbu Aug 9, 2022
eeb9ec1
Merge branch 'main' into merge/release/6.0.4xx-to-main
marcpopMSFT Aug 9, 2022
90bb556
Removing code that was removed from main
marcpopMSFT Aug 9, 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
1 change: 1 addition & 0 deletions src/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ Copyright (c) .NET Foundation. All rights reserved.
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NETCoreAppPackageVersion)"
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')"
ExcludedRuntimeIdentifiers="android"
/>

<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
Expand Down