Merge release/3.0.1xx to master #3416
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…712.5 (#3417) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19362.5 - Microsoft.DotNet.SignTool - 1.0.0-beta.19362.5
…0190712.15 (#3418) - Microsoft.NET.HostModel - 3.0.0-preview8-27912-15
…713.1 (#3419) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19363.1 - Microsoft.DotNet.SignTool - 1.0.0-beta.19363.1
…0190713.09 (#3420) - Microsoft.NET.HostModel - 3.0.0-preview8-27913-09
…714.1 (#3422) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19364.1 - Microsoft.DotNet.SignTool - 1.0.0-beta.19364.1
This commit fixes an unhandled exception that results when RuntimeList.xml contains entries that have the same destination subpath when resolving the runtime pack assets. An error is now emitted instead of the unhandled exception. Additionally, this fixes an unhandled exception that occurs when the RuntimeList.xml file is not present in the runtime pack that is caused by the exception message not having a NETSDK prefix. Also removed an unnecessary override of the `Execute` method for `GenerateDepsFile` task. This override should have been removed with a previous cleanup PR, but was overlooked. Fixes dotnet/cli#11705.
This commit changes the link in the error messages to an aka.ms link.
This commit makes the hash set that is tracking the asset sub-paths resolved from runtime packs case-insensitive.
…0190714.06 (#3423) - Microsoft.NET.HostModel - 3.0.0-preview8-27914-06
…0190715.11 (#3429) - Microsoft.NET.HostModel - 3.0.0-preview8-27915-11
…m-runtime-list-errors Fix unhandled exception when RuntimeList.xml contains duplicates.
This commit deletes the output apphost when the `CreateAppHost` task fails from an exception. Partially fixes #2989.
* Update dependencies from https://github.com/dotnet/arcade build 20190715.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19365.4 - Microsoft.DotNet.SignTool - 1.0.0-beta.19365.4 * Update dependencies from https://github.com/dotnet/arcade build 20190716.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19366.4 - Microsoft.DotNet.SignTool - 1.0.0-beta.19366.4
…0190717.01 (#3431) - Microsoft.NET.HostModel - 3.0.0-preview8-27917-01
…0190717.12 - Microsoft.NET.HostModel - 3.0.0-preview8-27917-12
This commit logs an error message if we fail to delete the AppHost upon failure.
…0190719.01 - Microsoft.NET.HostModel - 3.0.0-preview8-27919-01
* Update dependencies from https://github.com/dotnet/arcade build 20190717.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19367.8 - Microsoft.DotNet.SignTool - 1.0.0-beta.19367.8 * Update dependencies from https://github.com/dotnet/arcade build 20190718.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19368.7 - Microsoft.DotNet.SignTool - 1.0.0-beta.19368.7
Delete output apphost upon failure of the CreateAppHost task.
Both the deps.json and runtimeconfig.json files remain unchanged when an incremental build takes place that changes a property that would invalidate the assets cache. For a property like `SelfContained`, this might mean the files are no longer valid for the incremental build's output. Fixes dotnet/cli#11956.
…761-9c260fac5f14 [master] Update dependencies from dotnet/core-setup
…719.2 (#3442) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19369.2 - Microsoft.DotNet.SignTool - 1.0.0-beta.19369.2
…0190719.09 (#3443) - Microsoft.NET.HostModel - 3.0.0-preview8-27919-09
…idation Fix regeneration of files when asset cache changes.
…722.10 (#3445) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19372.10 - Microsoft.DotNet.SignTool - 1.0.0-beta.19372.10
…0190723.02 (#3446) - Microsoft.NET.HostModel - 3.0.0-preview8-19373-02
…and-page Support automatic Link metadata for Page and Resource items
Some changes in the way apphost is handled broke the case where you use an exe project as the dotnet store "manifest" project. The fix is to set UseAppHost=false when doing the store resolution.
…0190723.17 (#3454) - Microsoft.NET.HostModel - 3.0.0-preview8-28373-17
Don't reference assemblies from targeting pack with ReferencedByDefault="false"
…1-master-1 Insert NuGet Build 5.3.0-preview.2.6103 into sdk
The target to select the VB runtime DLL from ReferencePath was not being run when compiling the temporary project for a XAML build.
…elease/3.0.1xx-to-master * upstream/release/3.0.1xx: Update Microsoft.NET.HostModel version Conflicts: eng/Versions.props
ghost
merged commit
dsplaisted
pushed a commit
to dsplaisted/sdk
that referenced
this pull request
Feb 19, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20191031.14 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19531.14 * Update dependencies from https://github.com/dotnet/arcade build 20191101.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19551.3 * Update dependencies from https://github.com/dotnet/arcade build 20191102.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19552.1
dsplaisted
pushed a commit
to dsplaisted/sdk
that referenced
this pull request
Feb 19, 2020
* master: (27 commits) Add DOTNET_ROOT to tests and fix dogfood script Remove duplicated key Installation script update (dotnet#13030) Use scanelf over ldconfig on musl-libc distros (dotnet#12642) Allow list more properties (dotnet#3459) Update dependencies from https://github.com/mono/linker build 20191106.1 (dotnet#3476) [master] Update dependencies from aspnet/websdk (dotnet#3466) Update dependencies from https://github.com/aspnet/AspNetCore build 20191105.3 (dotnet#3473) Update dependencies from https://github.com/dotnet/windowsdesktop build 20191105.1 (dotnet#3469) Update dependencies from https://github.com/dotnet/arcade build 20191104.3 (dotnet#3465) Update dependencies from https://github.com/aspnet/websdk build 20191103.2 (dotnet#3454) [master] Update dependencies from dotnet/arcade (dotnet#3416) Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.3 (dotnet#3458) Update dependencies from https://github.com/dotnet/templating build 20191104.1 (dotnet#3457) [master] Update dependencies from Microsoft/msbuild (dotnet#3423) [master] Update dependencies from aspnet/AspNetCore (dotnet#3440) Update dependencies from https://github.com/dotnet/windowsdesktop build 20191104.2 (dotnet#3455) [master] Update dependencies from dotnet/core-setup (dotnet#3445) Update dependencies from https://github.com/dotnet/windowsdesktop build 20191102.6 (dotnet#3446) Update dependencies from https://github.com/aspnet/websdk build 20191102.2 (#3444) ...
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from release/3.0.1xx into master.
git fetch --all git checkout merges/release/3.0.1xx-to-master git reset --hard upstream/master git merge upstream/release/3.0.1xx # Fix merge conflicts git commit git push upstream merges/release/3.0.1xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.