Merge IISIntegration project refactoring to master from 2.2 #4962
Conversation
…otnet#4687) * Convert ServerTests to Reference and move to Server folder * Fix NU1105
Changes: * Ensure IIS managed and pkg projects build after the native projects * Update projects to build test * Update CI checks to build on macOS and Linux * Use package baselines to manage ANCM packages
|
This pull request has been updated. This PR merges commits made on release/2.2 by the following committers: |
Replaces package references the following packages with local code: Microsoft.AspNetCore.Certificates.Generation.Sources Microsoft.Extensions.CopyOnWriteDictionary.Sources Microsoft.Extensions.ClosedGenericMatcher.Sources Microsoft.Extensions.ObjectMethodExecutor.Sources Microsoft.Extensions.PropertyActivator.Sources Microsoft.Extensions.PropertyHelper.Sources Microsoft.Extensions.RazorViews.Sources Microsoft.Extensions.SecurityHelper.Sources Microsoft.Extensions.StackTrace.Sources Microsoft.Extensions.WebEncoders.Sources
|
This pull request has been updated. This PR merges commits made on release/2.2 by the following committers: |
|
I'll take care of merge conflicts. Investigating a code signing failure in 2.2 first, though... |
|
This pull request has been updated. This PR merges commits made on release/2.2 by the following committers: |
This file is not signable. The sign tool treats .mof as a potential signing candidate by default, even though most .mof files are not signable.
|
This pull request has been updated. This PR merges commits made on release/2.2 by the following committers: |
|
Looks like installer builds fail due to layout changes in the ANCM nuget packages. Investigating... |
natemcmaster
changed the title
natemcmaster
force-pushed
the
merge/release/2.2-to-master
branch
from
bf0908c to
02780ba
Compare
|
Build passes CI checks. Squashes commits and rebased on latest release/2.2 and master branches. I'll merge this once CI checks pass again. |
|
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.2, but I could not automatically push those to merge/release/2.2-to-master to update this PR. |
I detected changes in the release/2.2 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.
This PR merges commits made on release/2.2 by the following committers:
Instructions for merging
This repo does not appear to allow merge commits from the GitHub UI, so you will need to update this PR with a merge commit before closing this PR.
git fetch git checkout release/2.2 git pull --ff-only git checkout master git pull --ff-only git merge --no-ff release/2.2 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.2-to-masteror if you are using SSH
After PR checks are complete push the branch
Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.