Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
307 commits
Select commit Hold shift + click to select a range
0b23f7c
Updated WinUI version.
azchohfi Jun 23, 2020
a956057
Merge branch 'master' into winui
azchohfi Jun 26, 2020
38f43b5
Revert "Fixed double->single."
azchohfi Jun 26, 2020
d3d21cc
Updated to net5.0 TFM.
azchohfi Jun 29, 2020
a99c1ea
DataGrid fixes for WinUI 3 usage
RBrid Jul 1, 2020
3755b7d
Merge pull request #3374 from windows-toolkit/user/regisb/DataGridWin…
RBrid Jul 1, 2020
8695d22
Merge branch 'winui' of https://github.com/windows-toolkit/WindowsCom…
azchohfi Jul 1, 2020
eb7f1e4
Removed workarounds that are now fixed in WinUI3.
azchohfi Jul 1, 2020
c5f5026
Merge branch 'master' into winui
azchohfi Jul 1, 2020
07f4dd1
Updated to a new version of WinUI3.
azchohfi Jul 6, 2020
bf45679
Updated graph dependency.
azchohfi Jul 8, 2020
d232fae
Updated to WinUI3-preview2.
azchohfi Jul 15, 2020
2c7b325
Update WeakReferences to use WinRT.WeakReference.
azchohfi Jul 15, 2020
536d511
Merge branch 'master' into winui
azchohfi Jul 15, 2020
e4d1ec1
Updated sample app with 8.0.0-preview2 graph controls.
azchohfi Jul 15, 2020
239811e
Merge branch 'master' into winui
azchohfi Aug 3, 2020
5f80ba4
Small namespace order fix.
azchohfi Aug 4, 2020
7b0711a
Merge branch 'master' into winui
azchohfi Aug 10, 2020
1b84cfe
Merge branch 'master' into winui
azchohfi Aug 13, 2020
409321c
Merge branch 'master' into winui
azchohfi Aug 20, 2020
22fd21a
Merge branch 'master' into winui
azchohfi Aug 24, 2020
97e626c
Pinned .Net 5 Preview5 version.
azchohfi Aug 26, 2020
26a43da
Merge branch 'master' into winui
azchohfi Sep 2, 2020
552c694
Merge branch 'master' into winui
azchohfi Sep 14, 2020
ebf4c39
Merge branch 'master' into winui
azchohfi Sep 16, 2020
ef89ce8
Merge branch 'master' into winui
azchohfi Sep 22, 2020
10356f8
Merge branch 'master' into winui
azchohfi Oct 13, 2020
1cf05b6
Updated to new version of WinUI
azchohfi Oct 14, 2020
9d1d274
Switched TFM to 18362.
azchohfi Oct 15, 2020
4183027
Small fix for release.
azchohfi Oct 23, 2020
841ec61
Merge branch 'master' into winui
azchohfi Oct 23, 2020
7b9e51d
Removed compilation of some projects that are not migrated yet.
azchohfi Oct 27, 2020
3e34092
Updated to a new version of WinUI3, and fixed many issues on the samp…
azchohfi Oct 28, 2020
489104c
Merge branch 'master' into winui
azchohfi Oct 28, 2020
97fd712
Merge branch 'master' into winui
azchohfi Nov 5, 2020
e081019
Updated to a new version of WinUI.
azchohfi Nov 5, 2020
448706c
Merge branch 'master' into winui
azchohfi Nov 10, 2020
cb9e779
Merge branch 'master' into winui
azchohfi Nov 10, 2020
5474aa1
Merge branch 'master' into winui
azchohfi Nov 10, 2020
dfa0530
Fixed ColorPicker on WinUI3.
azchohfi Nov 11, 2020
7e4ea7a
Merge branch 'master' into winui
azchohfi Nov 13, 2020
227778c
Merge branch 'master' into winui
azchohfi Nov 17, 2020
3faef48
Updated to WinUI3 Preview3.
azchohfi Nov 18, 2020
aaee3cc
Updated to WinUI3 Preview3.
azchohfi Nov 18, 2020
eb7b03b
Merge branch 'master' into winui
azchohfi Dec 9, 2020
ccdcfe0
Merge branch 'master' into winui
azchohfi Dec 9, 2020
96f3a4d
Merge branch 'master' into winui
azchohfi Dec 10, 2020
260ada1
Small merge fix.
azchohfi Dec 10, 2020
2d8d53a
Merge branch 'master' into winui
azchohfi Dec 11, 2020
00de10c
Merge branch 'master' into winui
azchohfi Jan 9, 2021
eba21d3
Merge branch 'master' into winui
azchohfi Jan 26, 2021
ed7c95e
Updated to preview4.210125.1.
azchohfi Jan 26, 2021
99d58df
CoreWindow fixes.
azchohfi Jan 27, 2021
def95b9
Fixed issues with KeyBoard and Mouse Cursor.
azchohfi Feb 1, 2021
ab3b0fa
Merge branch 'master' into winui
azchohfi Feb 1, 2021
b0411ae
Merge branch 'adobeJanuary' into winui
azchohfi Feb 1, 2021
5cc6173
Merge remote-tracking branch 'internal/winui' into winui
azchohfi Feb 1, 2021
50b857b
Fixed many issues with CoreWindow. Sample app now working again.
azchohfi Feb 2, 2021
0310739
Fixed one last issues with CoreWindow.
azchohfi Feb 2, 2021
282306c
Removed old workaround.
azchohfi Feb 4, 2021
dffe917
Merge branch 'master' into winui
azchohfi Feb 5, 2021
c868ba6
No Win2D yet, so commented out Media/Geometry.
azchohfi Feb 5, 2021
44e0cdc
Fixed some wrong WinUI3 namespaces.
azchohfi Feb 5, 2021
94cf1e9
Fixed sample app.
azchohfi Feb 5, 2021
fd9139c
Updated to WinUI to 3.0.0-preview4.210210.2.
azchohfi Feb 10, 2021
1e38d3c
Merge branch 'master' into winui
azchohfi Feb 11, 2021
e55f315
Added SupportedOSPlatformVersion.
azchohfi Feb 11, 2021
933d2bb
Fixed sample app.
azchohfi Feb 11, 2021
ff0b110
Updated with stable ColorCode.
azchohfi Feb 11, 2021
26570f2
Updated sample app with all published versions.
azchohfi Feb 11, 2021
68dec3a
Added checks for Win32 execution, fixing MasterDetailsView on WinUI3 …
azchohfi Feb 16, 2021
a6f745a
Merge branch 'master' into winui_mastermerged
azchohfi Feb 17, 2021
1fabc97
Merge branch 'master' into winui_mastermerged
azchohfi Feb 17, 2021
61c4ac8
Removed unneeded checks for ApiInformation, mostly on XamlRoot, which…
azchohfi Feb 17, 2021
0b17a44
Small FocusManager updates for Win32.
azchohfi Feb 17, 2021
bb83f2e
Merge branch 'master' into winui
azchohfi Feb 17, 2021
e5041cb
Merge branch 'master' into winui
azchohfi Feb 18, 2021
e65b0b2
Merge branch 'master' into winui
azchohfi Feb 22, 2021
eff1538
Merge branch 'master' into winui
azchohfi Feb 24, 2021
3182f61
Merge branch 'master' into winui
azchohfi Mar 8, 2021
a843214
Merge branch 'master' into winui
azchohfi Mar 10, 2021
eaa1e9b
Updated to ProjectReunion 0.5.
azchohfi Mar 11, 2021
14f8592
Merge branch 'master' into winui
azchohfi Mar 11, 2021
84a6b88
Merge branch 'master' into winui
azchohfi Mar 11, 2021
b349808
Merge branch 'master' into winui
azchohfi Mar 15, 2021
603a240
Removed unneeded WinUI 2.5 reference
azchohfi Mar 15, 2021
f3f5229
Merge branch 'master' into winui
azchohfi Mar 16, 2021
27bc2fb
Merge branch 'master' into winui
azchohfi Mar 18, 2021
6fde3db
Renamed all files/folders from Microsoft.Toolkit.UWP -> CommunityTool…
azchohfi Mar 18, 2021
4e891ec
Global replace of Microsoft.Toolkit.UWP -> CommunityToolkit.WinUI and…
azchohfi Mar 18, 2021
56cc450
Fixed namespace usings.
azchohfi Mar 18, 2021
62655f4
Changed version back to 7.x
azchohfi Mar 22, 2021
c7d8529
Merge branch 'master' into winui
azchohfi Mar 22, 2021
64e7ef3
Small fix for WinUI3 issue with CompositionTarget.Rendering.
azchohfi Mar 22, 2021
010a710
Fixed small sample app issue with Colors reflection.
azchohfi Mar 23, 2021
2b41cb3
Merge branch 'master' into winui
azchohfi Mar 23, 2021
72aee79
Merge branch 'master' into winui
azchohfi Mar 26, 2021
a5df1fa
Merge branch 'master' into winui
azchohfi Mar 29, 2021
ecc5ffa
Merge branch 'master' into winui
azchohfi Mar 29, 2021
d73bd68
Merge branch 'master' into winui
azchohfi Mar 29, 2021
88c6623
More renamed files/folders.
azchohfi Mar 30, 2021
078a32a
More global replace.
azchohfi Mar 30, 2021
6f55cfd
Merge branch 'master' into winui
azchohfi Apr 1, 2021
144c962
Updated to ProjectReunion 0.5.0 GA
azchohfi Apr 1, 2021
3bd2e6b
Fixed yaml
azchohfi Apr 1, 2021
852102c
Added rel/winui/* as a valid stable release for nerdbank
azchohfi Apr 1, 2021
f164c96
Merge branch 'master' into winui
azchohfi Apr 6, 2021
85d6c37
Updated UI tests to WinUI3.
azchohfi Apr 7, 2021
e7a0e53
Updated Microsoft.Xaml.Behaviors.WinUI.Managed version to stable 2.0.3.
azchohfi Apr 14, 2021
4ecbb1d
Merge branch 'master' into winui
azchohfi Apr 15, 2021
2216723
Merge branch 'master' into winui
azchohfi Apr 16, 2021
fedf3f9
Merge branch 'master' into winui
azchohfi Apr 21, 2021
2b623bd
Merge branch 'master' into winui
azchohfi Apr 22, 2021
c608b45
Pinning .net version
azchohfi Apr 22, 2021
5788f35
Removed unused taef reference from UITests
azchohfi Apr 22, 2021
04b397a
Updated ADO .Net version
azchohfi Apr 22, 2021
e53db07
Merge branch 'master' into winui
azchohfi Apr 26, 2021
c099771
WinUI 3 - Reunion 0.5.6.
azchohfi Apr 27, 2021
481c71c
Migrated UnitTests to WinUI.
azchohfi Apr 28, 2021
9a13bb7
Merge branch 'master' into winui
azchohfi Apr 30, 2021
312fcc4
Merge branch 'main' into winui
azchohfi May 4, 2021
fd54400
Merge branch 'main' into winui
azchohfi May 7, 2021
275c33d
Updated win2d version.
azchohfi May 7, 2021
97028a4
Merge branch 'winui' into winui_unittests
azchohfi May 7, 2021
048fe04
Merge branch 'main' into winui
azchohfi May 10, 2021
1883eea
Merge branch 'winui' into winui_unittests
azchohfi May 10, 2021
1088158
Merge branch 'main' into winui
azchohfi May 12, 2021
1ca7c3a
Merge branch 'winui' into winui_unittests
azchohfi May 12, 2021
a8d1919
Merge branch 'main' into winui
azchohfi May 19, 2021
79f3fa5
Updated to CSWinRT 1.2.6 and Reunion 0.5.7
azchohfi May 19, 2021
cdc1344
Merge branch 'winui' into winui_unittests
azchohfi May 19, 2021
711b81d
Migrated GazeInputTest to WinUI3.
azchohfi May 19, 2021
5ed969e
Updated to .NET 5.0.300 SDK.
azchohfi May 25, 2021
a3fe453
Merge branch 'main' into winui
azchohfi Jun 9, 2021
78697ba
Updated to preview version
azchohfi Jun 14, 2021
c048a1d
Merge branch 'main' into winui
azchohfi Jun 17, 2021
bde10e5
Fixed compilation.
azchohfi Jun 17, 2021
e488d5a
Merge branch 'winui' into winui_unittests
azchohfi Jun 17, 2021
2eaa4b3
All UnitTests passing!
azchohfi Jun 17, 2021
28ee3ee
Updated .net sdk
azchohfi Jun 17, 2021
ce6a0df
Merge branch 'winui' into winui_unittests
azchohfi Jun 17, 2021
ab6c86c
Enabled Test Diagnostics.
azchohfi Jun 18, 2021
36e9593
Fixed bad merge
azchohfi Jun 18, 2021
55fb57f
Merge branch 'winui' into winui_unittests
azchohfi Jun 18, 2021
80e388e
Reenabled uitests
azchohfi Jun 23, 2021
5d3b648
Merge branch 'winui' into winui_unittests
azchohfi Jun 23, 2021
c3ac6bd
Re-enabled tests that were failing due to a cswinrt issue (612).
azchohfi Jun 23, 2021
bc58341
Merge branch 'main' into winui
azchohfi Jun 23, 2021
069b464
Merge branch 'winui' into winui_unittests
azchohfi Jun 23, 2021
9cc8084
Removed unused nuget feed.
azchohfi Jun 23, 2021
c4d33c2
Merge branch 'main' into winui
azchohfi Jun 23, 2021
c30f9c4
Merge branch 'winui' into winui_unittests
azchohfi Jun 23, 2021
1094b0a
Updated to WAS 0.8.0.
azchohfi Jun 24, 2021
1aa3824
Merge branch 'winui' into winui_unittests
azchohfi Jun 25, 2021
0f04ce4
Merge branch 'main' into winui
azchohfi Jun 28, 2021
14c4278
Merge branch 'winui' into winui_unittests
azchohfi Jun 28, 2021
10a50e0
Updated to stable VSTest/MSTest.
azchohfi Jun 28, 2021
758b1c0
Small fix wapproj.
azchohfi Jun 28, 2021
ff96329
Merge branch 'main' into winui
azchohfi Jun 29, 2021
3b5f849
Merge branch 'winui' into winui_unittests
azchohfi Jun 29, 2021
955d434
Small workaround for WinUI's issue 3502 on TabbedCommandBar.
azchohfi Jun 29, 2021
aff1fb0
Merge branch 'main' into winui
azchohfi Jun 29, 2021
90d3dfd
Merge branch 'main' into winui
azchohfi Jul 8, 2021
686a8dc
Updated to WAS 0.8.1.
azchohfi Jul 15, 2021
4c9177e
Updated to .Net 5.0.302.
azchohfi Jul 15, 2021
17372a4
Merge branch 'winui' into winui_unittests
azchohfi Jul 15, 2021
0b85891
Merge branch 'main' into winui
azchohfi Jul 29, 2021
a19da3c
Merge branch 'main' into winui
azchohfi Jul 29, 2021
d876ef7
Updated nuget feed.
azchohfi Jul 29, 2021
519ac7b
Merge branch 'main' into winui
azchohfi Jul 30, 2021
405b8c0
Fixed bad merge.
azchohfi Jul 30, 2021
1dac6da
Merge branch 'main' into winui
azchohfi Aug 2, 2021
867a79c
Fix bad merge on sample app
azchohfi Aug 2, 2021
34b4e6d
Merge branch 'winui' into winui_unittests
azchohfi Aug 3, 2021
f6d4952
Merge branch 'main' into winui
azchohfi Aug 4, 2021
4e4e628
Merge branch 'main' into winui
azchohfi Aug 9, 2021
5fa0f0f
Merge branch 'winui' into winui_unittests
azchohfi Aug 10, 2021
9ee95a3
Merge branch 'main' into winui
azchohfi Aug 18, 2021
c66492e
Merge branch 'winui' into winui_unittests
azchohfi Aug 18, 2021
99f5653
Merge branch 'main' into winui
azchohfi Aug 23, 2021
fb9109c
Updated DotNet SDK version
azchohfi Aug 23, 2021
0ece6c6
Merge branch 'winui' into winui_unittests
azchohfi Aug 23, 2021
905daf6
Updated to Reunion 0.8.2.
azchohfi Aug 24, 2021
1b79cac
Merge branch 'winui' into winui_unittests
azchohfi Aug 24, 2021
71a065d
Merge branch 'main' into winui
azchohfi Aug 24, 2021
e1fe726
Merge branch 'winui' into winui_unittests
azchohfi Aug 24, 2021
96521a6
Merge branch 'main' into winui
azchohfi Aug 26, 2021
48c54c4
Merge branch 'winui' into winui_unittests
azchohfi Aug 26, 2021
25f4bdc
Merge branch 'main' into winui
azchohfi Sep 3, 2021
27a7b2a
Merge branch 'winui' into winui_unittests
azchohfi Sep 7, 2021
8454c8f
Merge branch 'main' into winui
azchohfi Sep 7, 2021
3ff1159
Merge branch 'winui' into winui_unittests
azchohfi Sep 7, 2021
62a842d
Updated MSTest for debugging vstestconsole crash.
azchohfi Sep 8, 2021
4c8f61e
Merge branch 'main' into winui
azchohfi Sep 9, 2021
1f6630e
Merge branch 'main' into winui
azchohfi Sep 16, 2021
f9b784c
Merge branch 'winui' into winui_unittests
azchohfi Sep 16, 2021
23d8191
Merge winui branch
azchohfi Sep 16, 2021
02a4d2b
Fix merge conflict
azchohfi Sep 16, 2021
8cf9e37
Merge branch 'winui' into winui_unittests
azchohfi Sep 16, 2021
323e006
Fix for DefaultStyleKey not working always when assembly name differs…
azchohfi Sep 17, 2021
5c5c487
Merge branch 'main' into winui
azchohfi Sep 17, 2021
d1b2c20
Merge branch 'winui' into winui_unittests
azchohfi Sep 17, 2021
1427242
Merge branch 'main' into winui
azchohfi Sep 20, 2021
9cd787f
Merge branch 'winui' into winui_unittests
azchohfi Sep 20, 2021
ec8f8f9
Merge branch 'main' into winui
azchohfi Sep 22, 2021
71c0e02
Merge branch 'winui' into winui_unittests
azchohfi Sep 22, 2021
a66b58b
Fix merge error.
azchohfi Sep 22, 2021
b974693
Merge branch 'winui' into winui_unittests
azchohfi Sep 22, 2021
e41be65
Merge branch 'main' into winui
azchohfi Sep 23, 2021
c01a68b
Updated to WAS 0.8.4.
azchohfi Sep 23, 2021
bce527d
Updated to CsWinRT 1.3.5.
azchohfi Sep 23, 2021
52c75c8
Merge branch 'winui' into winui_unittests
azchohfi Sep 23, 2021
be7f299
Small fix on samples
azchohfi Sep 24, 2021
f3c57fa
Merge branch 'winui' into winui_unittests
azchohfi Sep 24, 2021
862b43a
Merge branch 'main' into winui
azchohfi Oct 12, 2021
83ed3a8
Updated .net sdk version
azchohfi Oct 12, 2021
96c8c05
Fixed warnings.
azchohfi Oct 12, 2021
daa592c
Merge branch 'winui' into winui_unittests
azchohfi Oct 12, 2021
fdb22f2
Updated to WAS 1.0.0-preview2.
azchohfi Oct 14, 2021
a77adc9
Not running UITests until MUXTestInfra is fixed for preview2.
azchohfi Oct 14, 2021
4099e26
Merge branch 'winui' into winui_unittests
azchohfi Oct 14, 2021
8d7ef51
Updated to preview2 based version of MSTest.
azchohfi Oct 14, 2021
8ba9ed4
Merge branch 'main' into winui
azchohfi Oct 14, 2021
ce23071
Merge branch 'winui' into winui_unittests
azchohfi Oct 14, 2021
f442322
Merge branch 'main' into winui
azchohfi Oct 14, 2021
590cc3d
Fixed pipeline
azchohfi Oct 14, 2021
c0aca28
Revert "Not running UITests until MUXTestInfra is fixed for preview2."
azchohfi Oct 14, 2021
1a7fb53
Updated to new version of MUXTestInfra.
azchohfi Oct 14, 2021
85bfe0e
Merge branch 'main' into winui
azchohfi Oct 19, 2021
c9df5b8
Updated to WAS 1.0.0-preview3.
azchohfi Oct 28, 2021
82e2bbb
Replaced ResourceLoader with ResourceManager, for better debugging ex…
azchohfi Oct 30, 2021
070562c
Removed tests for netcoreapp2.1.
azchohfi Oct 30, 2021
1d678c1
Merge branch 'main' into winui
azchohfi Nov 8, 2021
6e5e721
Updated to VS 2022.
azchohfi Nov 8, 2021
ff03a97
Readded the AttachedCardShadow sample to the sample app.
azchohfi Nov 9, 2021
edb9b1b
Removed legacy SupportsCompositionVisualSurface.
azchohfi Nov 9, 2021
6df772b
Added guard for SystemNavigationManager. Fixes #4357
azchohfi Nov 9, 2021
bb0b607
Merge branch 'main' into winui
azchohfi Nov 16, 2021
29f26d2
Updated to WAS 1.0.0 GA.
azchohfi Nov 17, 2021
118d30e
Merge branch 'main' into winui
azchohfi Nov 18, 2021
c6110b1
Updated to stable VS 2022.
azchohfi Nov 18, 2021
465b6bd
Merge branch 'winui' into winui_unittests
azchohfi Nov 18, 2021
3e58f1a
Fixed StringExtensions not picking up replaced resources.
azchohfi Nov 23, 2021
ce76dd5
Removed workaround for https://github.com/microsoft/microsoft-ui-xaml…
azchohfi Nov 23, 2021
f11d899
Fixed a Test_LoseFocusOnNoSelection and Test_LoseFocusOnSelectOther.
azchohfi Nov 23, 2021
0781a7a
Updated Microsoft.NET.Test.Sdk.
azchohfi Nov 23, 2021
e9f60ea
Fixed PrintHelper for WinUI3.
azchohfi Nov 30, 2021
4f359a2
Fixed VersionInfo.GetDeviceFormFactor for WinUI3.
azchohfi Nov 30, 2021
dbb10e9
Merge branch 'main' into winui
azchohfi Dec 2, 2021
080bdb9
Remove extra file missed from merge
michael-hawker Dec 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ msbuild.binlog
# Generated file from .ttinclude
**/Generated/TypeInfo.g.cs

# Files generated by the VS build
**/Generated Files/**

# TAEF Log output
WexLogFileOutput
*.wtl
*.wtl.trace
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<EntryPointProjectUniqueName>..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj</EntryPointProjectUniqueName>
<EntryPointProjectUniqueName>..\CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.csproj</EntryPointProjectUniqueName>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
Expand All @@ -71,7 +71,7 @@
<Content Include="Images\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj">
<ProjectReference Include="..\CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.csproj">
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Version="1.0.0.0" />

<Properties>
<DisplayName>Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject</DisplayName>
<DisplayName>CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject</DisplayName>
<PublisherDisplayName>aleader</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>
Expand All @@ -31,8 +31,8 @@
Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$">
<uap:VisualElements
DisplayName="Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject"
Description="Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject"
DisplayName="CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject"
Description="CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject"
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">
Expand All @@ -45,7 +45,7 @@
<!--Register COM CLSID LocalServer32 registry key-->
<com:Extension Category="windows.comServer">
<com:ComServer>
<com:ExeServer Executable="Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
<com:ExeServer Executable="CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
<com:Class Id="80cc4528-e348-11ea-87d0-0242ac130003" DisplayName="Toast activator"/>
</com:ExeServer>
</com:ComServer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Application x:Class="Microsoft.Toolkit.Win32.WpfCore.SampleApp.App"
<Application x:Class="CommunityToolkit.Win32.WpfCore.SampleApp.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Microsoft.Toolkit.Win32.WpfCore.SampleApp">
xmlns:local="clr-namespace:CommunityToolkit.Win32.WpfCore.SampleApp">
<Application.Resources>

</Application.Resources>
</Application>
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.

using System.Windows;
using Microsoft.Toolkit.Uwp.Notifications;
using CommunityToolkit.WinUI.Notifications;

namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
namespace CommunityToolkit.Win32.WpfCore.SampleApp
{
/// <summary>
/// Interaction logic for App.xaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Notifications\Microsoft.Toolkit.Uwp.Notifications.csproj" />
<ProjectReference Include="..\CommunityToolkit.WinUI.Notifications\CommunityToolkit.WinUI.Notifications.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Window x:Class="Microsoft.Toolkit.Win32.WpfCore.SampleApp.MainWindow"
<Window x:Class="CommunityToolkit.Win32.WpfCore.SampleApp.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Microsoft.Toolkit.Win32.WpfCore.SampleApp"
xmlns:local="clr-namespace:CommunityToolkit.Win32.WpfCore.SampleApp"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Imaging;
using Microsoft.Toolkit.Uwp.Notifications;
using CommunityToolkit.WinUI.Notifications;
using Windows.Services.Maps;
using Windows.UI.Notifications;

namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
namespace CommunityToolkit.Win32.WpfCore.SampleApp
{
/// <summary>
/// Interaction logic for MainWindow.xaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
namespace CommunityToolkit.Win32.WpfCore.SampleApp
{
public enum MyToastActions
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.UI.Dispatching;
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.Advertisement;
using Windows.Devices.Enumeration;
using Windows.System;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Context for the entire app. This is where all app wide variables are stored
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Windows.Security.Cryptography;
using Windows.Storage.Streams;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Extension methods for Gatt Convert.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// This enum assists in finding a string representation of a BT SIG assigned value for UUIDS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Windows.Devices.Bluetooth.GenericAttributeProfile;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Helper function when working with <see cref="GattProtocolError" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using System;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Helper class used when working with UUIDs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml.Media.Imaging;
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.GenericAttributeProfile;
using Windows.Devices.Enumeration;
using Windows.System;
using Windows.UI.Xaml.Media.Imaging;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Wrapper around <see cref="BluetoothLEDevice" /> to make it bindable.
/// </summary>
/// <seealso cref="System.ComponentModel.INotifyPropertyChanged" />
/// <seealso cref="System.IEquatable{ObservableBluetoothLEDevice}" />
/// <seealso cref="global::System.ComponentModel.INotifyPropertyChanged" />
/// <seealso cref="global::System.IEquatable{ObservableBluetoothLEDevice}" />
public class ObservableBluetoothLEDevice : INotifyPropertyChanged, IEquatable<ObservableBluetoothLEDevice>
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Microsoft.UI.Dispatching;
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.GenericAttributeProfile;
using Windows.Security.Cryptography;
using Windows.Storage.Streams;
using Windows.System;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Wrapper around <see cref="GattCharacteristic"/> to make it easier to use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using Windows.Devices.Bluetooth;
using Windows.Devices.Bluetooth.GenericAttributeProfile;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Wrapper around <see cref="GattDeviceService" /> to make it easier to use
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
<TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
<ProjectReference Include="..\CommunityToolkit.WinUI\CommunityToolkit.WinUI.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Threading.Tasks;
using Windows.Networking.Connectivity;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// This class exposes information about the network connectivity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// Enumeration denoting connection type.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using Windows.Networking.Connectivity;

namespace Microsoft.Toolkit.Uwp.Connectivity
namespace CommunityToolkit.WinUI.Connectivity
{
/// <summary>
/// This class exposes functionality of NetworkInformation through a singleton.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;

namespace Microsoft.Toolkit.Uwp.DeveloperTools
namespace CommunityToolkit.WinUI.DeveloperTools
{
/// <summary>
/// AlignmentGrid is used to display a grid to help aligning controls
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
<TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Windows.System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Automation;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;

namespace Microsoft.Toolkit.Uwp.DeveloperTools
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Shapes;

namespace CommunityToolkit.WinUI.DeveloperTools
{
/// <summary>
/// FocusTracker can be used to display information about the current focused XAML element.
Expand Down Expand Up @@ -83,7 +83,7 @@ protected override void OnApplyTemplate()
private void Start()
{
// Get currently focused control once when we start
if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && XamlRoot != null)
if (XamlRoot != null)
{
FocusOnControl(FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:developerTools="using:Microsoft.Toolkit.Uwp.DeveloperTools">
xmlns:developerTools="using:CommunityToolkit.WinUI.DeveloperTools">

<Style TargetType="developerTools:FocusTracker">
<Setter Property="IsTabStop" Value="False"></Setter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.xaml" />
<ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<FileList>
<File Reference="CommunityToolkit.WinUI.DeveloperTools.dll">
<ToolboxItems UIFramework="UAP"
VSCategory="Windows Community Toolkit"
BlendCategory="Windows Community Toolkit">
<Item Type="CommunityToolkit.WinUI.DeveloperTools.AlignmentGrid" />
<Item Type="CommunityToolkit.WinUI.DeveloperTools.FocusTracker" />
</ToolboxItems>
</File>
</FileList>
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Windows.UI.Xaml;
using Windows.UI.Xaml.Automation.Peers;
using Windows.UI.Xaml.Controls;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Automation.Peers;
using Microsoft.UI.Xaml.Controls;

namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
namespace CommunityToolkit.WinUI.Input.GazeInteraction
{
internal class ComboBoxItemGazeTargetItem : GazeTargetItem
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>uap10.0.17134</TargetFrameworks>
<RootNamespace>Microsoft.Toolkit.Uwp.Input</RootNamespace>
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
<TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
<RootNamespace>CommunityToolkit.WinUI.Input</RootNamespace>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
Loading