Skip to content

Commit

Permalink
Merge pull request #4369 from microsoft/dev
Browse files Browse the repository at this point in the history
Sync latest from dev
  • Loading branch information
sibille authored Jun 28, 2021
2 parents 96f1d4c + 864a6c4 commit ed71e7f
Show file tree
Hide file tree
Showing 162 changed files with 343 additions and 342 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ This project is supported by the [.NET Foundation](https://dotnetfoundation.org)
- [Rapid Xaml Toolkit](https://github.com/Microsoft/Rapid-XAML-Toolkit)
- [Windows Community Toolkit](https://github.com/Microsoft/WindowsCommunityToolkit)
- [Windows UI](https://github.com/microsoft/microsoft-ui-xaml)
- [Project Reunion](https://github.com/microsoft/ProjectReunion)
- [Windows App SDK](https://github.com/microsoft/WindowsAppSDK)
- [Fluent XAML Theme Editor](https://github.com/Microsoft/fluent-xaml-theme-editor)
- [XAML Styler](https://github.com/Xavalon/XamlStyler)

Expand Down
8 changes: 4 additions & 4 deletions code/src/Installer/Installer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -300,16 +300,16 @@
<Content Include="Packages\microsoft.windows.cppwinrt.2.0.210211.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\microsoft.projectreunion.0.8.0-preview.nupkg">
<Content Include="Packages\microsoft.projectreunion.0.8.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\microsoft.projectreunion.dwrite.0.8.0-preview.nupkg">
<Content Include="Packages\microsoft.projectreunion.dwrite.0.8.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\microsoft.projectreunion.foundation.0.8.0-preview.nupkg">
<Content Include="Packages\microsoft.projectreunion.foundation.0.8.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\microsoft.projectreunion.winui.0.8.0-preview.nupkg">
<Content Include="Packages\microsoft.projectreunion.winui.0.8.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<WizardData>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.210211.2" />
<package id="Microsoft.ProjectReunion" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0-preview" />
<package id="Microsoft.ProjectReunion" version="0.8.0" />
<package id="Microsoft.ProjectReunion.Foundation" version="0.8.0" />
<package id="Microsoft.ProjectReunion.WinUI" version="0.8.0" />
</packages>
</WizardData>
</VSTemplate>
Loading

0 comments on commit ed71e7f

Please sign in to comment.