Merge release/3.0.1xx to master #3083
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
This commit ensures that we exclude files from the `Microsoft.NETCore.App` platform library on publish when the platform library is `Microsoft.AspNetCore.App`, which doesn't have an explicit dependency on `Microsoft.NETCore.App`. When publishing a 2.x ASP.NET application, the `MicrosoftNETPlatformLibrary` property gets changed by ASP.NET to `Microsoft.AspNetCore.App`. This causes the task responsible for determining what files to copy locally to treat files from `Microsoft.NETCore.App` and its dependencies as not being part of the platform. However, when publishing the application as framework-dependent, almost all the platform files get excluded thanks to conflict resolution which has the files as part of the platform manifest and preferred packages. Unfortunately, the apphost, hostpolicy, and hostfxr files are not part of these lists and as a result will be copied locally. This breaks framework-dependent apphost activation because hostfxr and hostpolicy are copied locally. Additionally, these files end up in the deps.json file which also prevents roll-forward activation if the two files are manually deleted. The fix is to treat `Microsoft.NETCore.App` as an implicit dependency of `Microsoft.AspNetCore.App` where we calculate the list of excluded packages for a framework-dependent publish. Fixes dotnet/cli#10602.
… lib names. This commit treats `Microsoft.NETCore.App` as an implicit dependency for any platform library name, allowing the fix to work for both `Microsoft.AspNet.App` and `Microsoft.AspNet.All`.
Perform a fetch before the checkout
…1-release/2.1.6xx-1 Insert NuGet Build 5.0.0-rtm.5821 into sdk
…e/2.2.2xx Merge release/2.1.6xx to release/2.2.2xx
…e/2.1.5xx Merge release/2.1.4xx to release/2.1.5xx
Ensure Microsoft.NETCore.App is an implicit dependency for publish.
…e/2.2.2xx Merge release/2.2.1xx to release/2.2.2xx
…e/2.2.1xx Merge release/2.1.5xx to release/2.2.1xx
…e/2.2.2xx Merge release/2.2.1xx to release/2.2.2xx
LOC CHECKIN | dotnet/sdk release/2.2.2xx | 20190215
…1-release/2.2.2xx-1 Insert NuGet Build 5.0.0-rtm.5856 into sdk
…1-release/2.2.2xx-1 Insert NuGet Build 5.0.0-rtm.5867 into sdk
This will get bumped to 5.1 in 3.0 anyhow.
A fix was made in 2.2 that included some tests that published a 2.2 web project and ensured the output was correct for the apphost. However, we don't install a 2.2 shared runtime for ASP.NET in our test environment and therefore one of the tests cannot activate the framework-dependent apphost. For the fix, the important thing was to ensure we didn't publish the fxr/hostpolicy libraries that interfered with the framework-dependent apphost's activation. The test still checks for the absence of these files to cover the original fix. Additionally, I'm merging the `GivenThatWeWantToPublishAWebProject` tests into the `GivenThatWeWantToPublishAWebApp`. The former was accidentally put into the "Properties" sub-directory anyway.
…e/3.0.1xx Merge release/2.2.2xx to release/3.0.1xx
ghost
merged commit
dsplaisted
pushed a commit
to dsplaisted/sdk
that referenced
this pull request
Feb 19, 2020
….8 (dotnet#3083) - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8
GangWang01
pushed a commit
to GangWang01/sdk
that referenced
this pull request
Jun 21, 2022
* Created the project structure * Create TemplateLocalizer.Core * [Localizer] Localizable string extraction (dotnet#3018) * String extraction * Adressing PR feedback * Function signature simplification + exceptions * Commenting the rules * Key creator type rename * Adressing PR feedback * Create/Update templatestrings.json file # Conflicts: # src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs * Get authoring language from template.json * Replaced string literals with resource strings * Added tests to template localizer projects (dotnet#3083) * TemplateLocalizer Core Tests * TemplateLocalizer Console Tests * Switched to XUnit * Addressing PR feedback * Use test templates instead of template strings * Fix test project flag * Revert "Fix test project flag" This reverts commit 98e9f6801eba184c9014c1cda92ff7c214f15c61. * Renamed localizer project EndToEndTests to IntegrationTests * Styling changes * Addressing PR feedback Co-authored-by: donJoseLuis <58810449+donJoseLuis@users.noreply.github.com>
GangWang01
pushed a commit
to GangWang01/sdk
that referenced
this pull request
Jul 11, 2022
* Created the project structure * Create TemplateLocalizer.Core * [Localizer] Localizable string extraction (dotnet#3018) * String extraction * Adressing PR feedback * Function signature simplification + exceptions * Commenting the rules * Key creator type rename * Adressing PR feedback * Create/Update templatestrings.json file # Conflicts: # src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs * Get authoring language from template.json * Replaced string literals with resource strings * Added tests to template localizer projects (dotnet#3083) * TemplateLocalizer Core Tests * TemplateLocalizer Console Tests * Switched to XUnit * Addressing PR feedback * Use test templates instead of template strings * Fix test project flag * Revert "Fix test project flag" This reverts commit 98e9f6801eba184c9014c1cda92ff7c214f15c61. * Renamed localizer project EndToEndTests to IntegrationTests * Styling changes * Addressing PR feedback Co-authored-by: donJoseLuis <58810449+donJoseLuis@users.noreply.github.com>
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.