diff --git a/.editorconfig b/.editorconfig index 2786b81bfd7..b94ea12f8eb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -41,6 +41,10 @@ indent_size = 2 indent_size = 2 insert_final_newline = true +# Special files +[*.UTF-16LE.*] +charset = utf-16le + # C# files [*.cs] diff --git a/.gitattributes b/.gitattributes index 5896c1692ee..1a56e124d52 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,63 +1,53 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### +# Set default file-type attributes + +# All file types * text=auto -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain +# Markups +*.md text=auto diff=markdown +*.mdx text=auto diff=markdown + +# Solutions +*.sln text=auto eol=crlf +*.slnx text=auto + +# Projects +*.*proj text=auto +*.tasks text=auto +*.props text=auto +*.targets text=auto + +# Sources +*.cs text=auto diff=csharp +*.csx text=auto diff=csharp +*.resx text=auto + +# Scripts +*.in text eol=lf +*.sh text eol=lf +*.bat text eol=crlf +*.cmd text eol=crlf + +# Images +*.png binary +*.jpg binary +*.gif binary + +# Keys +*.snk binary +*.pfx binary +*.cer binary + +# Others + +# Preserve Line endings in diff and patch files +*.diff -text +*.patch -text + +# Exclude git meta files from exporting +.gitattributes export-ignore +.gitignore export-ignore +.gitkeep export-ignore + +# Ours +*.UTF-16LE.* encoding=utf-16le diff --git a/.gitignore b/.gitignore index e1269ff7fd7..8294aec4347 100644 --- a/.gitignore +++ b/.gitignore @@ -2,177 +2,197 @@ ## files generated by popular Visual Studio add-ons. # User-specific files +*.rsuser *.suo *.user *.userosscache *.sln.docstates -*.filters - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs # Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ [Bb]in/ [Oo]bj/ +[Ee]xt/ +[Ll]og/ +[Ll]ogs/ + +# TAEF Log output +WexLogFileOutput/ +*.wtl + +# MSBuild Binary and Structured Log +*.binlog -# Visual Studio 2015 cache/options directory +# MSBuild response files +!MSBuild.rsp +!Directory.Build.rsp + +# Visual Studio 14+ cache/options directory .vs/ +# Visual Studio 15+ auto generated files +Generated\ Files/ + +# Backup folder for Package Reference Convert tool in Visual Studio 15+ +MigrationBackup/ + +# Live Unit Testing for Visual Studio +.lutignore +*.lutconfig + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# Local History for Visual Studio Code +.history/ + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUNIT +# NUnit *.VisualState.xml TestResult.xml +nunit-*.xml -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c +# Benchmark Results +BenchmarkDotNet.Artifacts/ -# DNX +# .NET Core project.lock.json +project.fragment.lock.json artifacts/ +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*_i.h +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd -*.rsp *.sbr *.tlb *.tli *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc -.builds +*.builds *.pidb *.svclog *.scc -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - # Visual Studio profiler *.psess *.vsp *.vspx +*.sap -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState +# Visual Studio Trace Files +*.e2e # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# JustCode is a .NET coding add-in -.JustCode - # TeamCity is a build add-in _TeamCity* # DotCover is a Code Coverage Tool *.dotCover -# NCrunch -_NCrunch_* -.*crunch*.local.xml - -# MightyMoose -*.mm.* -AutoTest.Net/ +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json -# Web workbench (sass) -.sass-cache/ +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ +# Visual Studio code coverage results +*.coverage +*.coveragexml # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -## TODO: Comment the next line if you want to checkin your -## web deploy settings but do note that will include unencrypted -## passwords -#*.pubxml - +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml *.publishproj +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + # NuGet Packages *.nupkg +# NuGet Symbol Packages +*.snupkg # The packages folder can be ignored because of Package Restore -**/packages/* +**/[Pp]ackages/* # except build/, which is used as an MSBuild target. -!**/packages/build/ +!**/[Pp]ackages/build/ # Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Windows Azure Build Output -csx/ -*.build.csdef +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets -# Windows Store app package directory +# Windows Store app package directories and files AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload # Visual Studio cache files # files ending in .cache can be ignored *.[Cc]ache # but keep track of directories ending in .cache -!*.[Cc]ache/ +!?*.[Cc]ache/ # Others ClientBin/ -[Ss]tyle[Cc]op.* -~$* +~* *~ +*~.* *.dbmdl *.dbproj.schemaview +*.jfm *.pfx *.publishsettings -node_modules/ orleans.codegen.cs # RIA/Silverlight projects @@ -185,50 +205,14 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings +ServiceFabricBackup/ +*.rptproj.bak # Microsoft Fakes FakesAssemblies/ -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg +# CodeRush personal settings +.cr/personal -# Visual Studio 6 workspace options file -*.opt - -# LightSwitch generated files -GeneratedArtifacts/ -_Pvt_Extensions/ -ModelManifest.xml -BundleArtifacts -!/build -/build/tools/GitVersion.CommandLine -AppPackages - -# NuGet V3 artifacts -*-packages.config -*.nuget.props -*.nuget.targets -project.lock.json -msbuild.binlog -*.project.lock.json -/build/tools/** -!/build/tools/packages.config - -# Generated file from .ttinclude -**/Generated/TypeInfo.g.cs - -# TAEF Log output -WexLogFileOutput -*.wtl +# JetBrains Rider +*.sln.iml diff --git a/Windows Community Toolkit.sln b/CommunityToolkit.Windows.sln similarity index 98% rename from Windows Community Toolkit.sln rename to CommunityToolkit.Windows.sln index af1b38fc7b1..b858e40e1cd 100644 --- a/Windows Community Toolkit.sln +++ b/CommunityToolkit.Windows.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 +VisualStudioVersion = 17.0.31815.197 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9AD30620-667D-433C-9961-8D885EE7B762}" EndProject @@ -172,9 +172,7 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM @@ -187,7 +185,7 @@ Global {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.ActiveCfg = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM @@ -220,8 +218,8 @@ Global {805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x64.Build.0 = Release|Any CPU {805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.ActiveCfg = Release|Any CPU {805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.Build.0 = Release|Any CPU - {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x86 - {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x86 + {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x64 + {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x64 {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.ActiveCfg = Debug|ARM {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Build.0 = Debug|ARM {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Deploy.0 = Debug|ARM @@ -234,8 +232,8 @@ Global {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.ActiveCfg = Debug|x86 {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Build.0 = Debug|x86 {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Deploy.0 = Debug|x86 - {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x86 - {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x86 + {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x64 + {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x64 {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.ActiveCfg = Release|ARM {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Build.0 = Release|ARM {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Deploy.0 = Release|ARM @@ -328,8 +326,8 @@ Global {DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x64.Build.0 = Release|Any CPU {DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.ActiveCfg = Release|Any CPU {DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.Build.0 = Release|Any CPU - {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x86 + {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x64 + {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x64 {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.ActiveCfg = Debug|ARM {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Build.0 = Debug|ARM {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Deploy.0 = Debug|ARM @@ -342,8 +340,8 @@ Global {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.ActiveCfg = Debug|x86 {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Build.0 = Debug|x86 {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Deploy.0 = Debug|x86 - {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x86 - {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x86 + {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x64 + {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x64 {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.ActiveCfg = Release|ARM {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Build.0 = Release|ARM {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Deploy.0 = Release|ARM @@ -515,7 +513,7 @@ Global {5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU {5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU {5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86 + {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x64 {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Deploy.0 = Debug|ARM @@ -528,7 +526,7 @@ Global {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.ActiveCfg = Debug|x86 {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Build.0 = Debug|x86 {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Deploy.0 = Debug|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x86 + {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x64 {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.ActiveCfg = Release|ARM {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Build.0 = Release|ARM {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Deploy.0 = Release|ARM @@ -583,19 +581,23 @@ Global {CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.Build.0 = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.Build.0 = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.Build.0 = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.Build.0 = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.Build.0 = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86 + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x64 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Deploy.0 = Debug|ARM @@ -608,16 +610,20 @@ Global {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.ActiveCfg = Debug|x86 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Build.0 = Debug|x86 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Deploy.0 = Debug|x86 - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x86 + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x64 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.ActiveCfg = Release|ARM + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Build.0 = Release|ARM + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Deploy.0 = Release|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.ActiveCfg = Release|ARM64 + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Build.0 = Release|ARM64 + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Deploy.0 = Release|ARM64 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.ActiveCfg = Release|x64 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Build.0 = Release|x64 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Deploy.0 = Release|x64 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.ActiveCfg = Release|x86 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Build.0 = Release|x86 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Deploy.0 = Release|x86 - {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x86 + {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x64 {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.ActiveCfg = Debug|ARM {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Build.0 = Debug|ARM {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Deploy.0 = Debug|ARM @@ -630,9 +636,13 @@ Global {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.ActiveCfg = Debug|x86 {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Build.0 = Debug|x86 {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Deploy.0 = Debug|x86 - {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x86 + {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x64 {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.ActiveCfg = Release|ARM + {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Build.0 = Release|ARM + {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Deploy.0 = Release|ARM {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.ActiveCfg = Release|ARM64 + {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Build.0 = Release|ARM64 + {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Deploy.0 = Release|ARM64 {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.ActiveCfg = Release|x64 {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Build.0 = Release|x64 {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Deploy.0 = Release|x64 @@ -723,8 +733,8 @@ Global {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x86 + {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x64 + {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x64 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM @@ -737,8 +747,8 @@ Global {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86 + {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x64 + {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x64 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Build.0 = Release|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Deploy.0 = Release|ARM diff --git a/Directory.Build.targets b/Directory.Build.targets index d719a7455cd..3015e810471 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -31,4 +31,10 @@ + + + \ No newline at end of file diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index 28a650ed0be..570177c2a1f 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -1,8 +1,8 @@ - + Debug - x86 + x64 {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6} AppContainerExe Properties @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -42,7 +40,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -51,7 +48,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -63,7 +59,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -72,7 +67,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -84,7 +78,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -93,7 +86,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -155,6 +147,4 @@ 14.0 - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index c97dc653fff..f98382e8b33 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -1,57 +1,53 @@ - netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0;native - $(DefineConstants);NETFX_CORE + netstandard1.4;uap10.0.16299;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763;native Microsoft.Toolkit.Uwp.Notifications.nuspec - - 10.0.19041.0 - 10.0.16299.0 + + 10.0.$(TargetPlatformRevision).0 - - + + NETFX_CORE + + + + $(DefineConstants);WINDOWS_UWP;WIN32 - winmdobj + Full + WinMDObj + uap10.0 + UAP - - native - UAP,Version=v10.0 - uap10.0 - 10.0.19041.0 10.0.10240.0 - $(DefineConstants);WINDOWS_UWP;WINRT - false .NETCore v5.0 + + false + $(DefineConstants);WINDOWS_UWP;WINRT $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets - true - - - UAP$(TargetPlatformMinVersion.Replace('.', '_')) - true + + Native,Version=v0.0 + UAP,Version=v10.0 - - - + - - - + + @@ -61,12 +57,15 @@ - + - + buildOutput=bin\$(Configuration);version=$(Version) diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec index 22a597a87df..d32968bdf10 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec @@ -7,7 +7,7 @@ true MIT https://github.com/CommunityToolkit/WindowsCommunityToolkit - https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png + ReadMe.md Icon.png The official way to send toast notifications on Windows 10 via code rather than XML, with the help of IntelliSense. Supports all C# app types, including WPF, UWP, WinForms, and Console, even without packaging your app as MSIX. Also supports C++ UWP apps. @@ -23,9 +23,6 @@ - - - @@ -33,6 +30,16 @@ + + + + + + + + + + @@ -42,45 +49,40 @@ - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.targets b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.targets index f002060cf49..959f6122f6f 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.targets +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.targets @@ -1,4 +1,4 @@ - + diff --git a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md index bfc7d22d1ca..7c85a2ac62f 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md +++ b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md @@ -1,36 +1,38 @@ -Welcome to the Notifications section of the toolkit! This contains the Notifications library, including the object model for tile, toast, and badge XML (previously called NotificationsExtensions). +# UWP Notifications + +Welcome to the Notifications section of the toolkit! This contains the Notifications library, including the object model for tile, toast, and badge XML (previously called `NotificationsExtensions`). ## Where should I add new code? -Any code for generating notifications should be written in the Microsoft.Toolkit.Uwp.Notifications project. + +Any code for generating notifications should be written in the `Microsoft.Toolkit.Uwp.Notifications` project. If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UWP` or `WINRT`. ## What are all the projects for? -All the code is contained on the Microsoft.Toolkit.Uwp.Notifications project. - -It outputs `netstandard1.4`, `uap10.0`, `native` for WinRT, and netcoreapp for .Net Core projects. The UWP library is only for C#, while the WinRT library is a Windows Runtime Component for C++. +All the code is contained on the `Microsoft.Toolkit.Uwp.Notifications` project. -| C# | C++ | -| ---------------- | ------------------- | -| NET Standard 1.4 | UWP WinRT Component | -| UWP C# DLL | | -| .Net Core DLL | | - +It outputs `netstandard1.4`, `uap10.0`, `native` for WinRT, and `netcoreapp3.1` for .NET Core projects. The UWP library is only for C#, while the WinRT library is a Windows Runtime Component for C++. +| C# | C++ | +| --------------------- | ------------------- | +| .NET Standard Library | UWP WinRT Component | +| .NET Core Library | | +| UWP C# Library | | ## Scenarios we want to support -Imagine you add this library to a .NET Standard class library, and you also add it to your UWP app. In this case, your .NET Standard class library will receive the NETStandard dll. Your UWP project will receive the UWP dll. +Imagine you add this library to a .NET Standard class library, and you also add it to your UWP app. In this case, your .NET Standard class library will receive the .NET Standard DLL. Your UWP project will receive the UWP DLL. ## How are the test projects organized? -If you look in the UnitTests folder of the repo, you'll notice that there's three projects... - - UnitTests.Notifications.Shared - - UnitTests.Notifications.NetCore - - UnitTests.Notifications.UWP - - UnitTests.Notifications.WinRT +If you look in the `UnitTests` folder of the repo, you'll notice that there are three projects... + +- `UnitTests.Notifications.Shared` +- `UnitTests.Notifications.NetCore` +- `UnitTests.Notifications.UWP` +- `UnitTests.Notifications.WinRT` -That's because in our source code, we have some #IF defs for switching between the different types of reflection that C# uses, since it's different between a .NET Standard and WinRT code. +That's because in our source code, we have some `#ifdef` for switching between the different types of reflection that C# uses, since it's different between a .NET Standard and WinRT code. -Therefore, there are two different code paths, one path for NETFX_CORE, and another for when that isn't present. The two test projects exercise both code paths. +Therefore, there are two different code paths, one path for `NETFX_CORE`, and another for when that isn't present. The two test projects exercise both code paths. diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 2018763e733..0bc15ef7042 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1,8 +1,8 @@ - + Debug - x86 + x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3} AppContainerExe Properties @@ -24,7 +24,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -34,7 +33,6 @@ $(OutputPath)$(AssemblyName).xml - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true pdbonly @@ -49,7 +47,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -58,7 +55,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true pdbonly @@ -73,7 +69,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -82,7 +77,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true pdbonly @@ -110,7 +104,7 @@ @@ -127,7 +121,6 @@ - @@ -1493,6 +1486,7 @@ + Microsoft Engagement Framework @@ -1500,13 +1494,11 @@ Visual C++ 2015 Runtime for Universal Windows Platform Apps - 14.0 true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP true full @@ -1516,7 +1508,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true true @@ -1563,6 +1554,4 @@ - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md index 79935db11d7..939b3f50a01 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md @@ -412,11 +412,11 @@ which renders in: MarkdownTextblock supports links wrapped with Images. ->\[!\[image](https\://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png)](https\://docs.microsoft.com/windows/uwpcommunitytoolkit/) +>\[!\[image](https\://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/Icon.png)](https\://docs.microsoft.com/windows/uwpcommunitytoolkit/) will render into -[![image](https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png)](https://docs.microsoft.com/windows/uwpcommunitytoolkit/) +[![image](https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/Icon.png)](https://docs.microsoft.com/windows/uwpcommunitytoolkit/) and when clicked will go to the Linked Page. @@ -425,7 +425,7 @@ MarkdownTextBlock also supports Reference based links. ``` [![image][1]][2] -[1]:https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png +[1]:https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/Icon.png [2]:https://docs.microsoft.com/windows/uwpcommunitytoolkit/ ``` @@ -434,7 +434,7 @@ will render into [![image][1]][2] -[1]:https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png +[1]:https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/Icon.png [2]:https://docs.microsoft.com/windows/uwpcommunitytoolkit/ ***** diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml index a57d44b9576..e431a43a928 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml @@ -1,4 +1,4 @@ - + Debug @@ -23,7 +23,6 @@ true full false - bin\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 @@ -32,7 +31,6 @@ AnyCPU pdbonly true - bin\Release\ TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 @@ -40,7 +38,6 @@ x86 true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -49,7 +46,6 @@ x86 - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -60,7 +56,6 @@ ARM true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -69,7 +64,6 @@ ARM - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -80,7 +74,6 @@ x64 true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -89,7 +82,6 @@ x64 - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -120,7 +112,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -128,7 +119,6 @@ prompt - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -137,6 +127,4 @@ prompt - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs index 5f049a80149..c7fe623f199 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj index 1d1da3892d0..17794015dd0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj @@ -1,4 +1,4 @@ - + net472 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs index e15099efc90..539da38f1e6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx index 1259dd097e6..55496358de1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx @@ -1,4 +1,3 @@ - diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj index c9881ebd4c0..bdedf71aa1d 100644 --- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj +++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj @@ -50,11 +50,11 @@ - + - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj index b72dca46f0c..14242899bad 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj +++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj @@ -1,4 +1,4 @@ - + 15.0 @@ -75,7 +75,9 @@ True + + $(BaseOutputPath)$(Configuration)\ + $(OutputPath)$(Platform) + - - \ No newline at end of file diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 00000000000..764ab4183dd --- /dev/null +++ b/NuGet.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SmokeTests/nuget.config b/SmokeTests/NuGet.config similarity index 87% rename from SmokeTests/nuget.config rename to SmokeTests/NuGet.config index 14c62b9b4bb..1a943588fb8 100644 --- a/SmokeTests/nuget.config +++ b/SmokeTests/NuGet.config @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index c053fef0779..6cd5fa0496e 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ Debug - x86 + x64 {A6E4CB52-1025-4BBA-9C65-BB871D1FB53F} AppContainerExe Properties @@ -37,8 +37,8 @@ SmokeTest_$(CurrentProject) - obj\$(CurrentProject)\ - bin\$(CurrentProject)\$(Platform)\$(Configuration)\ + bin\$(CurrentProject)\ + obj\$(CurrentProject)\ true @@ -129,6 +129,4 @@ - - \ No newline at end of file diff --git a/SmokeTests/SmokeTest.sln b/SmokeTests/SmokeTest.sln index 8dbb8bcd88d..cefd667b7ef 100644 --- a/SmokeTests/SmokeTest.sln +++ b/SmokeTests/SmokeTest.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30413.136 @@ -7,8 +6,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmokeTest", "SmokeTest.cspr EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{86F3F991-6DDA-442D-A610-9309D6559522}" ProjectSection(SolutionItems) = preProject - nuget.config = nuget.config - SmokeTestAnalysis.ps1 = SmokeTestAnalysis.ps1 + NuGet.config = NuGet.config + SmokeTest_AnalyzePackages.ps1 = SmokeTest_AnalyzePackages.ps1 + SmokeTest_DownloadPackages.ps1 = SmokeTest_DownloadPackages.ps1 SmokeTests.proj = SmokeTests.proj EndProjectSection EndProject diff --git a/SmokeTests/SmokeTestAnalysis.ps1 b/SmokeTests/SmokeTest_AnalyzePackages.ps1 similarity index 98% rename from SmokeTests/SmokeTestAnalysis.ps1 rename to SmokeTests/SmokeTest_AnalyzePackages.ps1 index 5a4852e3e55..449627846ec 100644 --- a/SmokeTests/SmokeTestAnalysis.ps1 +++ b/SmokeTests/SmokeTest_AnalyzePackages.ps1 @@ -5,9 +5,9 @@ Write-Host "Running Smoke Test Package Analyis" Write-Host "----------------------------------" ##### -# This script analyzes the final packaged outputs of +# This script analyzes the final packaged outputs of # There are two things analyzed: -# - The MSIX UPLOAD package has the raw dependencies before .NET Native compilation, +# - The MSIX UPLOAD package has the raw dependencies before .NET Native compilation, # this can help determine the maximum impact of the package if everything were to be included. # - The MSIX BUNDLE package is the final .NET Native compiled app, # this can be used to help determine the minimal impact of the package if only a few things are used. @@ -96,7 +96,7 @@ function Expand-MsixBundlePackage { } if (Test-Path $PackagePath) -{ +{ Push-Location $PackagePath Write-Host "Extracting Baseline..." @@ -133,7 +133,7 @@ if (Test-Path $PackagePath) #$ProgressPreference="SilentlyContinue" Expand-MsixUploadPackage $Package.Name -Destination $TempFolder - + # Also expand the final bundle based on the namespace name within the package. Expand-MsixBundlePackage ($DirPattern -f $PackageShortName) -Destination $TempFolder2 #$ProgressPreference="Continue" @@ -184,7 +184,7 @@ if (Test-Path $PackagePath) { Write-Host (" Lib (self): {0} = {1:n0}" -f $file.Name, $file.Length) -ForegroundColor White } - else + else { Write-Host (" Additional: {0} = {1:n0}" -f $file.Name, $file.Length) -ForegroundColor Yellow } @@ -233,7 +233,7 @@ if (Test-Path $PackagePath) { Write-Host (" Lib (self): {0} = {1:n0}" -f $file.Name, $file.Length) -ForegroundColor White } - else + else { Write-Host (" Additional: {0} = {1:n0}" -f $file.Name, $file.Length) -ForegroundColor Yellow } @@ -251,7 +251,7 @@ if (Test-Path $PackagePath) Pop-Location } -else +else { - Write-Error "Path $PackagePath not found for analysis!" + Write-Error "Path $PackagePath not found for analysis!" } \ No newline at end of file diff --git a/SmokeTests/SmokeTestDownloadNuGetVersion.ps1 b/SmokeTests/SmokeTest_DownloadPackages.ps1 similarity index 99% rename from SmokeTests/SmokeTestDownloadNuGetVersion.ps1 rename to SmokeTests/SmokeTest_DownloadPackages.ps1 index 1cf1170cd3e..3a0e24c9348 100644 --- a/SmokeTests/SmokeTestDownloadNuGetVersion.ps1 +++ b/SmokeTests/SmokeTest_DownloadPackages.ps1 @@ -1,5 +1,5 @@ ##### -# This script downloads the specified version of NuGet packages for +# This script downloads the specified version of NuGet packages for # the required smoke tests from NuGet. # This is useful for performing current analysis on prior builds of the Toolkit. # diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index fe28bced3aa..3c3dba7261e 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -1,7 +1,7 @@ - + - x86 + x64 Release UWPBaseline; @@ -33,7 +33,7 @@ Condition="'$(NuGetPackageVersion)' == ''"> - + @@ -56,7 +56,6 @@ x86;x64;ARM;ARM64 - bin %(ToolkitPackage.Identity) @@ -78,12 +77,12 @@ - $(MSBuildThisFileDirectory)..\bin\nupkg + $(MSBuildThisFileDirectory)..\bin\nupkg\ - + - + \ No newline at end of file diff --git a/UITests/UITests.App/Package.appxmanifest b/UITests/UITests.App/Package.appxmanifest index 9aa617ea938..45cc14f50ff 100644 --- a/UITests/UITests.App/Package.appxmanifest +++ b/UITests/UITests.App/Package.appxmanifest @@ -1,4 +1,4 @@ - + Debug - x86 + x64 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0} AppContainerExe Properties @@ -31,7 +31,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -40,7 +39,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -52,7 +50,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -61,7 +58,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -73,7 +69,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -83,7 +78,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -95,7 +89,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -104,7 +97,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -250,6 +242,4 @@ - - \ No newline at end of file diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj index 429adb007c5..adfa0c71f50 100644 --- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj +++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj @@ -2,7 +2,7 @@ Exe - win10-x86 + win10-x64 netcoreapp3.1 diff --git a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs index f1672919788..8f9e3da30f2 100644 --- a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs @@ -25,7 +25,7 @@ public class ColorPickerButtonTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } /// diff --git a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs index 6a14ceae6d7..663e6707397 100644 --- a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs @@ -27,7 +27,7 @@ public class ConstrainedBoxTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs index 4e09ea8dbb9..32ab111ea68 100644 --- a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs @@ -33,7 +33,7 @@ public class GridSplitterTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs index 385271c42ee..3bbea6146ae 100644 --- a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs @@ -26,7 +26,7 @@ public class RangeSelectorTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs index 6d722bd945d..98679d65e5c 100644 --- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs @@ -27,7 +27,7 @@ public class RichSuggestBoxTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs index b605debea8e..0dac88cb83d 100644 --- a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs @@ -25,7 +25,7 @@ public class TextBoxMaskTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs index 6576a58bc4c..8e05b9a2d0e 100644 --- a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs +++ b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs @@ -25,7 +25,7 @@ public class SimpleTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs index e2956adde8e..944580fdf50 100644 --- a/UITests/UITests.Tests.Shared/TestAssembly.cs +++ b/UITests/UITests.Tests.Shared/TestAssembly.cs @@ -36,10 +36,10 @@ public static void AssemblyInitialize(TestContext testContext) [AssemblyCleanup] public static void AssemblyCleanup() { - TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICsUWPSampleApp); + TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICSharpUWPSampleApp); } - private static async Task InitalizeComService() + private static async Task InitializeComService() { CommunicationService = new AppServiceConnection(); @@ -84,7 +84,7 @@ internal static async Task SendCustomMessageToApp(ValueSet m { if (CommunicationService is null) { - await InitalizeComService(); + await InitializeComService(); } return await CommunicationService.SendMessageAsync(message); @@ -94,7 +94,7 @@ private static async Task SendMessageToApp(ValueSet message) { if (CommunicationService is null) { - await InitalizeComService(); + await InitializeComService(); } var response = await CommunicationService.SendMessageAsync(message); diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs index d513a7ca2e6..dc752fce6e4 100644 --- a/UITests/UITests.Tests.Shared/UITestBase.cs +++ b/UITests/UITests.Tests.Shared/UITestBase.cs @@ -23,27 +23,37 @@ namespace UITests.Tests { public abstract class UITestBase { - private TestSetupHelper helper; - - internal static TestApplicationInfo WinUICsUWPSampleApp + internal static TestApplicationInfo WinUICSharpUWPSampleApp { get { - string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App"); + string assemblyDir = Path.GetDirectoryName(typeof(TestApplicationInfo).Assembly.Location); + DirectoryInfo baseDir = Directory.GetParent(assemblyDir); + + for (int i = 0; i < 10; i++) + { + if (baseDir.EnumerateDirectories().Any(d => d.Name.Equals("bin", StringComparison.OrdinalIgnoreCase))) + { + break; + } + + baseDir = baseDir.Parent; + } + + string publishDir = Path.Combine(baseDir.FullName, "AppPackages", "UITests.App"); - Log.Comment($"Base Package Search Directory = \"{baseDirectory}\""); + Log.Comment($"Base Package Search Directory = \"{publishDir}\""); - var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" }; - var files = Directory.GetFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains)); + var excludes = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" }; + var files = Directory.EnumerateFiles(publishDir, "*.msix", SearchOption.AllDirectories).Where(f => !excludes.Any(Path.GetFileNameWithoutExtension(f).Contains)); - if (files.Count() == 0) + if (!files.Any()) { - throw new Exception(string.Format("Failed to find '*.msix' in {0}'!", baseDirectory)); + throw new Exception($"Failed to find '*.msix' in '{publishDir}'!"); } - string mostRecentlyBuiltPackage = string.Empty; - DateTime timeMostRecentlyBuilt = DateTime.MinValue; + var mostRecentlyBuiltPackage = string.Empty; + var timeMostRecentlyBuilt = DateTime.MinValue; foreach (string file in files) { @@ -64,47 +74,18 @@ internal static TestApplicationInfo WinUICsUWPSampleApp processName: "UITests.App.exe", installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty), certSerialNumber: "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d", - baseAppxDir: baseDirectory); + baseAppxDir: publishDir); } } + private TestSetupHelper helper; + private static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions => new() { AutomationIdOfSafeItemToClick = string.Empty }; - public TestContext TestContext { get; set; } - - [TestInitialize] - public async Task TestInitialize() - { - // This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs) - // We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete - // our loading. - helper = new TestSetupHelper(new string[] { }, TestSetupHelperOptions); - - var pageName = GetPageForTest(TestContext); - - var rez = await TestAssembly.OpenPage(pageName); - - if (!rez) - { - // Error case, we didn't get confirmation of test starting. - throw new InvalidOperationException("Test host didn't confirm test ready to execute page: " + pageName); - } - - Log.Comment("[Harness] Received Host Ready with Page: {0}", pageName); - Wait.ForIdle(); - Log.Comment("[Harness] Starting Test for {0}...", pageName); - } - - [TestCleanup] - public void TestCleanup() - { - helper.Dispose(); - } - private static string GetPageForTest(TestContext testContext) { #if USING_TAEF @@ -132,15 +113,45 @@ private static string GetPageForTest(TestContext testContext) Log.Comment($"Found {testMethodString}."); - var testpageAttributeString = $"\"{typeof(TestPageAttribute)}\" on {testMethodString}"; + var testPageAttributeString = $"\"{typeof(TestPageAttribute)}\" on {testMethodString}"; if (method.GetCustomAttribute(typeof(TestPageAttribute), true) is not TestPageAttribute attribute) { - throw new Exception($"Could not find {testpageAttributeString}."); + throw new Exception($"Could not find {testPageAttributeString}."); } - Log.Comment($"Found {testpageAttributeString}. {nameof(TestPageAttribute.XamlFile)}: {attribute.XamlFile}."); + Log.Comment($"Found {testPageAttributeString}. {nameof(TestPageAttribute.XamlFile)}: {attribute.XamlFile}."); return attribute.XamlFile; } + + public TestContext TestContext { get; set; } + + [TestInitialize] + public async Task TestInitialize() + { + // This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs) + // We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete our loading. + helper = new TestSetupHelper(new string[] { }, TestSetupHelperOptions); + + var pageName = GetPageForTest(TestContext); + + var rez = await TestAssembly.OpenPage(pageName); + + if (!rez) + { + // Error case, we didn't get confirmation of test starting. + throw new InvalidOperationException("Test host didn't confirm test ready to execute page: " + pageName); + } + + Log.Comment("[Harness] Received Host Ready with Page: {0}", pageName); + Wait.ForIdle(); + Log.Comment("[Harness] Starting Test for {0}...", pageName); + } + + [TestCleanup] + public void TestCleanup() + { + helper.Dispose(); + } } } \ No newline at end of file diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems index f9f9c5bb044..3f76738ff78 100644 --- a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems +++ b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj index 7a53aad9440..1bcb6fc3435 100644 --- a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj +++ b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj @@ -1,4 +1,4 @@ - + 1d8b0260-5c17-41da-9c38-1e37441b3925 14.0 diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj index 70718b662e4..fc5cdf8d50f 100644 --- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj +++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj @@ -2,28 +2,36 @@ Exe - x86 - win10-x86 + x64 + win10-x64 netcoreapp3.1 true + USING_TAEF false true - $(DefineConstants);USING_TAEF - $(PkgTAEF_Redist_Wlk)\build\Binaries\$(PlatformTarget)\CoreClr\ + + + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'UITests.App')) + $([MSBuild]::NormalizeDirectory('$(ParentProjectDirectory)', 'AppPackages')) + + $([MSBuild]::NormalizeDirectory('$(PkgMUXCustomBuildTasks)', 'tools', '$(PlatformTarget)')) + $([MSBuild]::NormalizeDirectory('$(PkgTAEF_Redist_Wlk)', 'build', 'Binaries', '$(PlatformTarget)', 'CoreClr')) + + - - - - + + + + diff --git a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems index cf2ea181b7d..ee0f9fbf189 100644 --- a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems +++ b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true diff --git a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj index f23c7e4782b..269fcc6e377 100644 --- a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj +++ b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj @@ -1,4 +1,4 @@ - + 982cc826-aacd-4855-9075-430bb6ce40a9 14.0 diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj index 6c06c8484c3..f3772633157 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -1,8 +1,8 @@ - + Debug - x86 + x64 {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD} AppContainerExe Properties @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -43,7 +41,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -52,7 +49,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -65,7 +61,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -74,7 +69,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -90,7 +84,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -99,7 +92,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -171,6 +163,4 @@ 14.0 - - \ No newline at end of file diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj index ff993c99800..b838245b2e6 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -1,8 +1,8 @@ - + Debug - x86 + x64 {EFA96B3C-857E-4659-B942-6BEF7719F4CA} AppContainerExe Properties @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;WINRT true pdbonly @@ -43,7 +41,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full ARM @@ -52,7 +49,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true pdbonly @@ -65,7 +61,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full x64 @@ -74,7 +69,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true pdbonly @@ -90,7 +84,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full ARM64 @@ -99,7 +92,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true pdbonly @@ -169,6 +161,4 @@ - - \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/lorem.txt b/UnitTests/UnitTests.UWP/Assets/Samples/LoremText.UTF-16LE.txt similarity index 100% rename from UnitTests/UnitTests.UWP/Assets/Samples/lorem.txt rename to UnitTests/UnitTests.UWP/Assets/Samples/LoremText.UTF-16LE.txt diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs index af541ba311a..f8b93ca482e 100644 --- a/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs +++ b/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs @@ -16,7 +16,7 @@ namespace UnitTests.Extensions { [TestClass] - [Ignore("Ignored until issue on .Net Native is fixed. These are working.")] + [Ignore("Ignored until issue on .NET Native is fixed. These are working.")] public class Test_DispatcherQueueExtensions { private const int TIME_OUT = 5000; diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs index 4e150af7343..180e4ac0d57 100644 --- a/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs +++ b/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs @@ -16,7 +16,7 @@ public class Test_StorageFileHelper { private const string Sampletext = "Lorem ipsum dolor sit amet"; private const string Filename = "Test_StorageFileHelper_file.txt"; - private const string PackagedFilePath = @"Assets\Samples\lorem.txt"; + private const string PackagedFilePath = @"Assets\Samples\LoremText.UTF-16LE.txt"; [TestCategory("Helpers")] [TestMethod] diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs index 53b28c65093..e6b1d9fae06 100644 --- a/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs +++ b/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs @@ -18,7 +18,7 @@ public class Test_StreamHelper { private const string SampleText = "Lorem ipsum dolor sit amet"; private const string Filename = "Test_StreamHelper_file.txt"; - private const string PackagedFilePath = @"Assets\Samples\lorem.txt"; + private const string PackagedFilePath = @"Assets\Samples\LoremText.UTF-16LE.txt"; [TestCategory("Helpers")] [TestMethod] diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 9faa59332eb..f1a818e5dd2 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -1,8 +1,8 @@ - + Debug - x86 + x64 {A139968E-AD78-4E8C-93B8-9A5523BCAC89} AppContainerExe Properties @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -44,7 +42,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -53,7 +50,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -67,7 +63,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -77,7 +72,6 @@ true - bin\ARM64\Release\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -91,7 +85,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -100,7 +93,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -280,7 +272,7 @@ - + @@ -355,7 +347,6 @@ true - bin\x86\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -366,7 +357,6 @@ true - bin\ARM\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -377,7 +367,6 @@ true - bin\x64\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -388,7 +377,6 @@ true - bin\x86\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -399,7 +387,6 @@ true - bin\ARM\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -410,7 +397,6 @@ true - bin\x64\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -420,7 +406,6 @@ true - bin\x86\Release %28Version 1511%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -432,7 +417,6 @@ true - bin\ARM\Release %28Version 1511%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -444,7 +428,6 @@ true - bin\x64\Release %28Version 1511%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -456,7 +439,6 @@ true - bin\x86\Release %28Anniversary Update%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -468,7 +450,6 @@ true - bin\ARM\Release %28Anniversary Update%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -480,7 +461,6 @@ true - bin\x64\Release %28Anniversary Update%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -493,7 +473,6 @@ true - bin\ARM64\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true full @@ -504,7 +483,6 @@ true - bin\ARM64\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true full @@ -514,7 +492,6 @@ true - bin\ARM64\Release %28Version 1511%29\ CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true true @@ -526,7 +503,6 @@ true - bin\ARM64\Release %28Anniversary Update%29\ CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true true @@ -538,6 +514,4 @@ true - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj index 6d4a34b7d6f..1eb3943531b 100644 --- a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj +++ b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj @@ -1,4 +1,4 @@ - + 15.0 @@ -83,6 +83,10 @@ true + + $(BaseOutputPath)$(Configuration)\ + $(OutputPath)$(Platform) + @@ -94,6 +98,4 @@ - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 4d28462a7bf..7707d9d53d6 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -1,8 +1,8 @@ - + Debug - x86 + x64 {804D0681-52F6-4E61-864A-699F0AB44B20} AppContainerExe Properties @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -42,7 +40,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -51,7 +48,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -63,7 +59,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -73,7 +68,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -85,7 +79,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -94,7 +87,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -212,6 +204,4 @@ 14.0 - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands/Directory.Build.props b/UnitTests/UnitTests.XamlIslands/Directory.Build.props deleted file mode 100644 index d0b03191f36..00000000000 --- a/UnitTests/UnitTests.XamlIslands/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands/Directory.Build.targets b/UnitTests/UnitTests.XamlIslands/Directory.Build.targets deleted file mode 100644 index 4de98b5c73f..00000000000 --- a/UnitTests/UnitTests.XamlIslands/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj index 9e48643d0ce..39db0bb64ea 100644 --- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj +++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj @@ -8,7 +8,7 @@ - uap10.0.19041 + uap10.0.18362 app.manifest UnitTests.XamlIslands.Program diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f204e580701..5dee4588f58 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,7 +31,7 @@ jobs: displayName: Use NuGet 5.11.x inputs: versionSpec: 5.11.x - + - task: DotNetCoreCLI@2 inputs: command: custom @@ -139,5 +139,5 @@ jobs: artifactType: container artifactName: SmokeTestBundles - - powershell: .\SmokeTests\SmokeTestAnalysis.ps1 + - powershell: .\SmokeTests\SmokeTest_AnalyzePackages.ps1 displayName: Analyze Package Sizes diff --git a/build/Icon.png b/build/Icon.png new file mode 100644 index 00000000000..36efe0e72df Binary files /dev/null and b/build/Icon.png differ diff --git a/build/Windows.Toolkit.Common.props b/build/Windows.Toolkit.Common.props index 38374bf895c..1186d7b653a 100644 --- a/build/Windows.Toolkit.Common.props +++ b/build/Windows.Toolkit.Common.props @@ -11,7 +11,6 @@ https://github.com/CommunityToolkit/WindowsCommunityToolkit https://github.com/CommunityToolkit/WindowsCommunityToolkit/releases Icon.png - https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png @@ -44,4 +43,8 @@ $(TF_BUILD) - + + bin\ + + + \ No newline at end of file diff --git a/build/Windows.Toolkit.Common.targets b/build/Windows.Toolkit.Common.targets index 61ae0c52034..2e831443194 100644 --- a/build/Windows.Toolkit.Common.targets +++ b/build/Windows.Toolkit.Common.targets @@ -1,11 +1,7 @@ - $(Product) Asset - - - $(CommonTags);.NET $(CommonTags);UWP $(CommonTags);$(PackageTags) @@ -13,9 +9,9 @@ - - - + + + diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props index 06432dfc837..0c943341a97 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.props +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -9,14 +9,13 @@ False False - True uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision) $(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.')))) - + diff --git a/build/build.cake b/build/build.cake index 585ad201e90..f0aa7ebf463 100644 --- a/build/build.cake +++ b/build/build.cake @@ -30,7 +30,7 @@ var inheritDocVersion = "2.5.2"; var baseDir = MakeAbsolute(Directory("../")).ToString(); var buildDir = baseDir + "/build"; -var Solution = baseDir + "/Windows Community Toolkit.sln"; +var Solution = baseDir + "/CommunityToolkit.Windows.sln"; var toolsDir = buildDir + "/tools"; var binDir = baseDir + "/bin"; diff --git a/build/nuget.png b/build/nuget.png index cb8172be02b..36efe0e72df 100644 Binary files a/build/nuget.png and b/build/nuget.png differ diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 1b39cb3113e..00000000000 --- a/nuget.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file