Merging release branch into main #751
Merged
Conversation
This file contains 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
* Update roadmap (unpackaged apps to 0.8) (#506) * Update roadmap (unpackaged apps to 0.8) * Include a subscribe option * Port VS changes in Microsoft.AppxPackage.targets to Microsoft.ApplicationModel.Resources.PriGen.targets: reduce messages printed to output to improve performance. (#485) * Initial checkin of Reunion VSIX, ported from WinUI3 (#496) * Initial checkin of Reunion VSIX, ported from WinUI VSIX sources * update nupkgs and fix wap appx references * added missing pubxml files * path bug, reunion tags * cruft, pubxml * remove Microsoft.WinUI.AppX.targets * remove asset dupes * PR feedback on appx manifests * replace nuget.config with RestoreSources to support pipeline, fix bad vstemplate * updated readmes * Initial checkin of Reunion VSIX, ported from WinUI3 (#496) * Initial checkin of Reunion VSIX, ported from WinUI VSIX sources * update nupkgs and fix wap appx references * added missing pubxml files * path bug, reunion tags * cruft, pubxml * remove Microsoft.WinUI.AppX.targets * remove asset dupes * PR feedback on appx manifests * replace nuget.config with RestoreSources to support pipeline, fix bad vstemplate * updated readmes Co-authored-by: Andrew Leader <aleader@microsoft.com> Co-authored-by: Rohan Palaniappan <35987549+rohanp-msft@users.noreply.github.com>
…ensure that ad hoc PackageReferences work for wapproj (#578)
…pending event (#591) * GA tweaks - VS 16.9 prereq, WinUI 3 rename, UWP templates unsupported * remove UWP templates - not supported in release * remove experimental Suspending event
…restore fails (still investigating those) (#631)
… restore and broken vsix builds (#640)
…ed file (#643) Co-authored-by: Ben Kuhn <benkuhn@ntdev.microsoft.com>
Co-authored-by: Ben Kuhn <benkuhn@ntdev.microsoft.com>
* adding VSIX version override support * formatting fix * non-empty default value * updating how versions are handled in build script * trying again * trying again * trying again * debugging * variable reference fix * simpler version Co-authored-by: Ben Kuhn <benkuhn@ntdev.microsoft.com>
…ing likewise to pick up memory leak fixes (#685)
* update to cswinrt 1.2.1 and .NET 5.0.5 * syncing with latest dotnet update changes
kythant
requested review from
DrusTheAxe,
BenJKuhn,
Scottj1s,
erik0686,
rohanp-msft and
huichen123
ghost
added
the
huichen123
reviewed
Apr 22, 2021
...ApplicationModel.Resources/projection/Microsoft.ApplicationModel.Resources.Projection.csproj
Outdated
Show resolved
Hide resolved
BenJKuhn
approved these changes
Apr 22, 2021
riverar
approved these changes
Apr 23, 2021
Scottj1s
approved these changes
Apr 23, 2021
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.
Went over all the merge conflicts and commits to see what still may need to be merge into main. Just so we don't miss anything important.
Please help me review this carefully. If you think I am missing something that should be in from release, let me know.