Skip to content

A Swiss Army knife for developers.

Merged PR 101: large refactoring of the solution

Etienne Baudouxc52c12173e38
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fef9ab54e..f3313545b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,19 +18,19 @@ You can contribute to DevToys app by:
* Make sure you have Visual Studio 2019 16.10+ installed.
* In Visual Studio Installer, install the required components by importing the `.vsconfig` file from the root of the repository.
* Run `init.ps1` in a PowerShell command prompt to restore all the dependencies.
-* Open `src/DevTools.sln` with Visual Studio and set Solution Platform to x64*.
-* Once opened, set `src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj` as startup project.
+* Open `src/DevToys.sln` with Visual Studio and set Solution Platform to x64*.
+* Once opened, set `src/dev/startup/DevToys.Startup/DevToys.Startup.wapproj` as startup project.
* Now you should be able to build and run DevToys on your machine. If it fails, try close the solution and reopen it again.
**If x64 doesn't work, use the architecture of your system*
# Internationalization and localization
-* After following `How to Build and Run DevToys from source`, open `src/DevTools.sln` with Visual Studio.
-* Copy the folder `dev/impl/DevTools.Common/Strings/en` and rename the copied folder with the language indication of your choice. For example, "fr-FR" for French (France).
+* After following `How to Build and Run DevToys from source`, open `src/DevToys.sln` with Visual Studio.
+* Copy the folder `dev/impl/DevToys.Common/Strings/en` and rename the copied folder with the language indication of your choice. For example, "fr-FR" for French (France).
* Open each `.resw` files and translate the text.
-* Open `dev/impl/DevTools.Common/LanguageManager.tt`.
-* Copy the following block and add it to the line below: https://etienne-baudoux.visualstudio.com/Side%20projects/_git/DevTools/?path=src/dev/impl/DevTools.Common/LanguageManager.tt&version=GC35fe1ba4bf76a1a4e8274f8ce3119c384325634b&lineStyle=plain&line=100&lineEnd=106&lineStartColumn=18&lineEndColumn=18
+* Open `dev/impl/DevToys.Common/LanguageManager.tt`.
+* Copy the following block and add it to the line below: https://etienne-baudoux.visualstudio.com/Side%20projects/_git/DevToys/?path=src/dev/impl/DevToys.Common/LanguageManager.tt&version=GC35fe1ba4bf76a1a4e8274f8ce3119c384325634b&lineStyle=plain&line=100&lineEnd=106&lineStartColumn=18&lineEndColumn=18
* Change the `Identifier`, `DisplayName` and `Culture` to match your language.
* Save the file. Visual Studio will ask you to confirm. Click Yes.
* Build and Run the app and test your changes.
diff --git a/README.md b/README.md
index b8079636a..fff28ed74 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<p align="center">
- <img width="128" align="center" src="/src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-200.png">
+ <img width="128" align="center" src="/src/dev/startup/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-200.png">
</p>
<h1 align="center">
DevToys
diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
index 143d54497..fe824418f 100644
--- a/THIRD-PARTY-NOTICES.md
+++ b/THIRD-PARTY-NOTICES.md
@@ -139,13 +139,13 @@ Windows Community Toolkit NOTICES AND INFORMATION BEGIN HERE
=========================================
# Windows Community Toolkit
-Copyright � .NET Foundation and Contributors
+Copyright © .NET Foundation and Contributors
All rights reserved.
## MIT License (MIT)
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the �Software�), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
diff --git a/src/DevTools.sln b/src/DevTools.sln
deleted file mode 100644
index 6d14f22fa..000000000
--- a/src/DevTools.sln
+++ /dev/null
@@ -1,245 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31624.102
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dev", "dev", "{2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8A9E843-7AC1-414A-8F27-A8F416D2D489}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "startup", "startup", "{93B72B9C-08BA-4838-9163-3ED67EC3EB9F}"
-EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DevTools.Startup", "dev\startup\DevTools.Startup\DevTools.Startup.wapproj", "{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools", "dev\startup\DevTools\DevTools.csproj", "{E3E4E200-B380-4207-9A7E-4C9421904502}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4C026E3-9BBF-434B-A14D-712C6A3731E4}"
- ProjectSection(SolutionItems) = preProject
- ..\.vsconfig = ..\.vsconfig
- ..\CONTRIBUTING.md = ..\CONTRIBUTING.md
- Directory.Build.props = Directory.Build.props
- Directory.Build.targets = Directory.Build.targets
- ..\LICENSE.md = ..\LICENSE.md
- ..\PRIVACY-POLICY.md = ..\PRIVACY-POLICY.md
- ..\README.md = ..\README.md
- ..\THIRD-PARTY-NOTICES.md = ..\THIRD-PARTY-NOTICES.md
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "def", "def", "{A2C92FF9-1D2E-47C6-8D7D-975412F7F36E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "impl", "impl", "{AC0D0928-8390-4929-801E-A9923DBB369F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{EE2227BC-954E-4053-AE38-4AE7A391AEEA}"
- ProjectSection(SolutionItems) = preProject
- dev\shared\SharedAssemblyInfo.cs = dev\shared\SharedAssemblyInfo.cs
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevTools.Core", "dev\def\DevTools.Core\DevTools.Core.csproj", "{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevTools.Providers", "dev\def\DevTools.Providers\DevTools.Providers.csproj", "{ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Core.Impl", "dev\impl\DevTools.Core.Impl\DevTools.Core.Impl.csproj", "{98274C08-4636-45EE-95AF-2C069BFBABD4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Providers.Impl", "dev\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj", "{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Common", "dev\impl\DevTools.Common\DevTools.Common.csproj", "{935D5DF8-C400-4CA6-AABE-34A06A69AF85}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Impl", "dev\impl\DevTools.Impl\DevTools.Impl.csproj", "{E2F0C303-04FC-4504-A272-7662AF9A0A80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Tests", "tests\DevTools.Tests\DevTools.Tests.csproj", "{E1C4AB49-CFFF-420E-A182-E3028BD0493C}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|ARM = Debug|ARM
- Debug|ARM64 = Debug|ARM64
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|ARM = Release|ARM
- Release|ARM64 = Release|ARM64
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.ActiveCfg = Debug|ARM
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Build.0 = Debug|ARM
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Deploy.0 = Debug|ARM
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.Build.0 = Debug|ARM64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.Deploy.0 = Debug|ARM64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.ActiveCfg = Debug|x64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.Build.0 = Debug|x64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.Deploy.0 = Debug|x64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.ActiveCfg = Debug|x86
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.Build.0 = Debug|x86
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.Deploy.0 = Debug|x86
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.ActiveCfg = Release|ARM
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Build.0 = Release|ARM
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Deploy.0 = Release|ARM
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.ActiveCfg = Release|ARM64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.Build.0 = Release|ARM64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.Deploy.0 = Release|ARM64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.ActiveCfg = Release|x64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.Build.0 = Release|x64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.Deploy.0 = Release|x64
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.ActiveCfg = Release|x86
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Build.0 = Release|x86
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Deploy.0 = Release|x86
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.ActiveCfg = Debug|ARM
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.Build.0 = Debug|ARM
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.Build.0 = Debug|ARM64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.ActiveCfg = Debug|x64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.Build.0 = Debug|x64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.ActiveCfg = Debug|x86
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.Build.0 = Debug|x86
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.ActiveCfg = Release|ARM
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.Build.0 = Release|ARM
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.ActiveCfg = Release|ARM64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.Build.0 = Release|ARM64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.ActiveCfg = Release|x64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.Build.0 = Release|x64
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.ActiveCfg = Release|x86
- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.Build.0 = Release|x86
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM.Build.0 = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|ARM64.Build.0 = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x64.Build.0 = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Debug|x86.Build.0 = Debug|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM.ActiveCfg = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM.Build.0 = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM64.ActiveCfg = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|ARM64.Build.0 = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x64.ActiveCfg = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x64.Build.0 = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x86.ActiveCfg = Release|Any CPU
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}.Release|x86.Build.0 = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM.Build.0 = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|ARM64.Build.0 = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x64.Build.0 = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Debug|x86.Build.0 = Debug|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM.ActiveCfg = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM.Build.0 = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM64.ActiveCfg = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|ARM64.Build.0 = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x64.ActiveCfg = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x64.Build.0 = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x86.ActiveCfg = Release|Any CPU
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E}.Release|x86.Build.0 = Release|Any CPU
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM.ActiveCfg = Debug|ARM
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM.Build.0 = Debug|ARM
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|ARM64.Build.0 = Debug|ARM64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x64.ActiveCfg = Debug|x64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x64.Build.0 = Debug|x64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x86.ActiveCfg = Debug|x86
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Debug|x86.Build.0 = Debug|x86
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM.ActiveCfg = Release|ARM
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM.Build.0 = Release|ARM
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM64.ActiveCfg = Release|ARM64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|ARM64.Build.0 = Release|ARM64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x64.ActiveCfg = Release|x64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x64.Build.0 = Release|x64
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x86.ActiveCfg = Release|x86
- {98274C08-4636-45EE-95AF-2C069BFBABD4}.Release|x86.Build.0 = Release|x86
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM.ActiveCfg = Debug|ARM
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM.Build.0 = Debug|ARM
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|ARM64.Build.0 = Debug|ARM64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x64.ActiveCfg = Debug|x64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x64.Build.0 = Debug|x64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x86.ActiveCfg = Debug|x86
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Debug|x86.Build.0 = Debug|x86
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM.ActiveCfg = Release|ARM
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM.Build.0 = Release|ARM
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM64.ActiveCfg = Release|ARM64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|ARM64.Build.0 = Release|ARM64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x64.ActiveCfg = Release|x64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x64.Build.0 = Release|x64
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x86.ActiveCfg = Release|x86
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F}.Release|x86.Build.0 = Release|x86
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM.ActiveCfg = Debug|ARM
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM.Build.0 = Debug|ARM
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|ARM64.Build.0 = Debug|ARM64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x64.ActiveCfg = Debug|x64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x64.Build.0 = Debug|x64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x86.ActiveCfg = Debug|x86
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Debug|x86.Build.0 = Debug|x86
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM.ActiveCfg = Release|ARM
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM.Build.0 = Release|ARM
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM64.ActiveCfg = Release|ARM64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|ARM64.Build.0 = Release|ARM64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x64.ActiveCfg = Release|x64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x64.Build.0 = Release|x64
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x86.ActiveCfg = Release|x86
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x86.Build.0 = Release|x86
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM.ActiveCfg = Debug|ARM
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM.Build.0 = Debug|ARM
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM64.Build.0 = Debug|ARM64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x64.ActiveCfg = Debug|x64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x64.Build.0 = Debug|x64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x86.ActiveCfg = Debug|x86
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x86.Build.0 = Debug|x86
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM.ActiveCfg = Release|ARM
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM.Build.0 = Release|ARM
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM64.ActiveCfg = Release|ARM64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM64.Build.0 = Release|ARM64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x64.ActiveCfg = Release|x64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x64.Build.0 = Release|x64
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x86.ActiveCfg = Release|x86
- {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x86.Build.0 = Release|x86
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.ActiveCfg = Debug|ARM
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Build.0 = Debug|ARM
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Deploy.0 = Debug|ARM
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Build.0 = Debug|ARM64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Deploy.0 = Debug|ARM64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.ActiveCfg = Debug|x64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Build.0 = Debug|x64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Deploy.0 = Debug|x64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.ActiveCfg = Debug|x86
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.Build.0 = Debug|x86
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.Deploy.0 = Debug|x86
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.ActiveCfg = Release|ARM
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Build.0 = Release|ARM
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Deploy.0 = Release|ARM
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.ActiveCfg = Release|ARM64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Build.0 = Release|ARM64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Deploy.0 = Release|ARM64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.ActiveCfg = Release|x64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Build.0 = Release|x64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Deploy.0 = Release|x64
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.ActiveCfg = Release|x86
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.Build.0 = Release|x86
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.Deploy.0 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {93B72B9C-08BA-4838-9163-3ED67EC3EB9F} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7} = {93B72B9C-08BA-4838-9163-3ED67EC3EB9F}
- {E3E4E200-B380-4207-9A7E-4C9421904502} = {93B72B9C-08BA-4838-9163-3ED67EC3EB9F}
- {A2C92FF9-1D2E-47C6-8D7D-975412F7F36E} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
- {AC0D0928-8390-4929-801E-A9923DBB369F} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
- {EE2227BC-954E-4053-AE38-4AE7A391AEEA} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
- {EF6A6707-44F2-4E76-98B8-11C9B40ADC7E} = {A2C92FF9-1D2E-47C6-8D7D-975412F7F36E}
- {ADA9988B-E19B-4EE5-9162-DAB3B12BCF9E} = {A2C92FF9-1D2E-47C6-8D7D-975412F7F36E}
- {98274C08-4636-45EE-95AF-2C069BFBABD4} = {AC0D0928-8390-4929-801E-A9923DBB369F}
- {8621ED11-E9DD-480A-BE2B-C1DB00919B6F} = {AC0D0928-8390-4929-801E-A9923DBB369F}
- {935D5DF8-C400-4CA6-AABE-34A06A69AF85} = {AC0D0928-8390-4929-801E-A9923DBB369F}
- {E2F0C303-04FC-4504-A272-7662AF9A0A80} = {AC0D0928-8390-4929-801E-A9923DBB369F}
- {E1C4AB49-CFFF-420E-A182-E3028BD0493C} = {F8A9E843-7AC1-414A-8F27-A8F416D2D489}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {78B10789-385B-4F7D-8E06-D86143CD76B5}
- EndGlobalSection
-EndGlobal
diff --git a/src/DevToys.sln b/src/DevToys.sln
new file mode 100644
index 000000000..bc6212c2c
--- /dev/null
+++ b/src/DevToys.sln
@@ -0,0 +1,128 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31624.102
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dev", "dev", "{2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8A9E843-7AC1-414A-8F27-A8F416D2D489}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "impl", "impl", "{93B72B9C-08BA-4838-9163-3ED67EC3EB9F}"
+ ProjectSection(SolutionItems) = preProject
+ dev\impl\Directory.Build.props = dev\impl\Directory.Build.props
+ dev\impl\Directory.Build.targets = dev\impl\Directory.Build.targets
+ EndProjectSection
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DevToys.Startup", "dev\DevToys.Startup\DevToys.Startup.wapproj", "{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevToys", "dev\impl\DevToys\DevToys.csproj", "{E3E4E200-B380-4207-9A7E-4C9421904502}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4C026E3-9BBF-434B-A14D-712C6A3731E4}"
+ ProjectSection(SolutionItems) = preProject
+ ..\.vsconfig = ..\.vsconfig
+ ..\CONTRIBUTING.md = ..\CONTRIBUTING.md
+ Directory.Build.props = Directory.Build.props
+ ..\LICENSE.md = ..\LICENSE.md
+ ..\PRIVACY-POLICY.md = ..\PRIVACY-POLICY.md
+ ..\README.md = ..\README.md
+ ..\THIRD-PARTY-NOTICES.md = ..\THIRD-PARTY-NOTICES.md
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{EE2227BC-954E-4053-AE38-4AE7A391AEEA}"
+ ProjectSection(SolutionItems) = preProject
+ dev\shared\SharedAssemblyInfo.cs = dev\shared\SharedAssemblyInfo.cs
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevToys.Tests", "tests\DevToys.Tests\DevToys.Tests.csproj", "{E1C4AB49-CFFF-420E-A182-E3028BD0493C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.ActiveCfg = Debug|ARM
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Build.0 = Debug|ARM
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Deploy.0 = Debug|ARM
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.Build.0 = Debug|ARM64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.ActiveCfg = Debug|x64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.Build.0 = Debug|x64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.Deploy.0 = Debug|x64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.ActiveCfg = Debug|x86
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.Build.0 = Debug|x86
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x86.Deploy.0 = Debug|x86
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.ActiveCfg = Release|ARM
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Build.0 = Release|ARM
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Deploy.0 = Release|ARM
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.ActiveCfg = Release|ARM64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.Build.0 = Release|ARM64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.Deploy.0 = Release|ARM64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.ActiveCfg = Release|x64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.Build.0 = Release|x64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.Deploy.0 = Release|x64
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.ActiveCfg = Release|x86
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Build.0 = Release|x86
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Deploy.0 = Release|x86
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.ActiveCfg = Debug|ARM
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.Build.0 = Debug|ARM
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.Build.0 = Debug|ARM64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.ActiveCfg = Debug|x64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.Build.0 = Debug|x64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.ActiveCfg = Debug|x86
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.Build.0 = Debug|x86
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.ActiveCfg = Release|ARM
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.Build.0 = Release|ARM
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.Build.0 = Release|ARM64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.ActiveCfg = Release|x64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.Build.0 = Release|x64
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.ActiveCfg = Release|x86
+ {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.Build.0 = Release|x86
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.ActiveCfg = Debug|ARM
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Build.0 = Debug|ARM
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Deploy.0 = Debug|ARM
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Build.0 = Debug|ARM64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.ActiveCfg = Debug|x64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Build.0 = Debug|x64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Deploy.0 = Debug|x64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.ActiveCfg = Debug|x86
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.Build.0 = Debug|x86
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x86.Deploy.0 = Debug|x86
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.ActiveCfg = Release|ARM
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Build.0 = Release|ARM
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Deploy.0 = Release|ARM
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Build.0 = Release|ARM64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Deploy.0 = Release|ARM64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.ActiveCfg = Release|x64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Build.0 = Release|x64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Deploy.0 = Release|x64
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.ActiveCfg = Release|x86
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.Build.0 = Release|x86
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x86.Deploy.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {93B72B9C-08BA-4838-9163-3ED67EC3EB9F} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
+ {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
+ {E3E4E200-B380-4207-9A7E-4C9421904502} = {93B72B9C-08BA-4838-9163-3ED67EC3EB9F}
+ {EE2227BC-954E-4053-AE38-4AE7A391AEEA} = {2C2B8C64-7BA1-4244-86E1-48CA7D85D7D9}
+ {E1C4AB49-CFFF-420E-A182-E3028BD0493C} = {F8A9E843-7AC1-414A-8F27-A8F416D2D489}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {78B10789-385B-4F7D-8E06-D86143CD76B5}
+ EndGlobalSection
+EndGlobal
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6f99242db..441ed855c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,15 +1,10 @@
<Project>
-
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<Windows10SDKVersion>10.0.19041.0</Windows10SDKVersion>
<Windows10MinSDKVersion>10.0.18362.0</Windows10MinSDKVersion>
- <LangVersion>latest</LangVersion>
- <Nullable>enable</Nullable>
-
- <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<!-- Defines the bin and obj folder paths -->
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))\</RepoRoot>
@@ -17,59 +12,12 @@
<BaseIntermediateOutputPath>$(RepoRoot)obj\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<OutputPath>$(BaseOutputPath)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
<PackagesConfigRestorePath>$(RepoRoot)packages\</PackagesConfigRestorePath>
-
- <!-- Enable generation of .tt files -->
- <TransformOnBuild>true</TransformOnBuild>
- <OverwriteReadOnlyOutputFiles>true</OverwriteReadOnlyOutputFiles>
- <TransformOutOfDateOnly>false</TransformOutOfDateOnly>
</PropertyGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
<VisualStudioVersion>16.0</VisualStudioVersion>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
- <!-- In Debug mode, don't generate .tt files at each build. -->
- <TransformOutOfDateOnly>true</TransformOutOfDateOnly>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <DebugType>full</DebugType>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)' == 'Release'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Platform)' == 'x86'">
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Platform)' == 'x64'">
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Platform)' == 'ARM'">
- <PlatformTarget>ARM</PlatformTarget>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
- <PlatformTarget>ARM64</PlatformTarget>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM' or '$(Configuration)|$(Platform)' == 'Release|ARM64'">
- <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ARM</DefineConstants>
- </PropertyGroup>
-
- <PropertyGroup>
- <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
- </PropertyGroup>
-
<PropertyGroup>
<Nuget_ColorCodeUwp>2.0.6</Nuget_ColorCodeUwp>
<Nuget_DiffPlex>1.7.0</Nuget_DiffPlex>
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/LargeTile.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/LargeTile.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SmallTile.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/SmallTile.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/SplashScreen.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/SplashScreen.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square150x150Logo.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square150x150Logo.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-24.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-24.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-24.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-256.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-256.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-256.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-32.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-32.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-32.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-48.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-48.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-48.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-16.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-16.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-24.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-24.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-24.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-24.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-256.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-256.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-32.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-32.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-32.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-48.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-48.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-16.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-16.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-16.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-24.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-24.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-24.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-24.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-256.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-256.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-256.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-32.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-32.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-32.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-32.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-48.png b/src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Square44x44Logo.targetsize-48.png
rename to src/dev/DevToys.Startup/Assets/Logo/Square44x44Logo.targetsize-48.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/StoreLogo.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/StoreLogo.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-100.png b/src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-100.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-100.png
rename to src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-100.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-125.png b/src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-125.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-125.png
rename to src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-125.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-150.png b/src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-150.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-150.png
rename to src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-150.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-200.png b/src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-200.png
rename to src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-200.png
diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-400.png b/src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-400.png
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Assets/Logo/Wide310x150Logo.scale-400.png
rename to src/dev/DevToys.Startup/Assets/Logo/Wide310x150Logo.scale-400.png
diff --git a/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj b/src/dev/DevToys.Startup/DevToys.Startup.wapproj
similarity index 94%
rename from src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj
rename to src/dev/DevToys.Startup/DevToys.Startup.wapproj
index f411271f6..db1250539 100644
--- a/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj
+++ b/src/dev/DevToys.Startup/DevToys.Startup.wapproj
@@ -46,12 +46,14 @@
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+ <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
+ <DisableXbfLineInfo>False</DisableXbfLineInfo>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
- <AppxPackageDir>..\..\..\..\bin\AppPackages\</AppxPackageDir>
+ <AppxPackageDir>..\..\..\bin\AppPackages\</AppxPackageDir>
<AppxBundle>Always</AppxBundle>
- <EntryPointProjectUniqueName>..\DevTools\DevTools.csproj</EntryPointProjectUniqueName>
+ <EntryPointProjectUniqueName>..\impl\DevToys\DevToys.csproj</EntryPointProjectUniqueName>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
@@ -59,11 +61,7 @@
</AppxManifest>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\DevTools\DevTools.csproj" />
- </ItemGroup>
- <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
- <ItemGroup>
- <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(NuGet_MicrosoftWindowsSDKBuildTools)" PrivateAssets="all" />
+ <ProjectReference Include="..\impl\DevToys\DevToys.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\Logo\LargeTile.scale-100.png" />
@@ -117,4 +115,5 @@
<Content Include="Assets\Logo\Wide310x150Logo.scale-200.png" />
<Content Include="Assets\Logo\Wide310x150Logo.scale-400.png" />
</ItemGroup>
+ <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
</Project>
\ No newline at end of file
diff --git a/src/dev/startup/DevTools.Startup/Package.appxmanifest b/src/dev/DevToys.Startup/Package.appxmanifest
similarity index 100%
rename from src/dev/startup/DevTools.Startup/Package.appxmanifest
rename to src/dev/DevToys.Startup/Package.appxmanifest
diff --git a/src/dev/def/DevTools.Core/DevTools.Core.csproj b/src/dev/def/DevTools.Core/DevTools.Core.csproj
deleted file mode 100644
index 5c38593f9..000000000
--- a/src/dev/def/DevTools.Core/DevTools.Core.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- </ItemGroup>
-
-</Project>
diff --git a/src/dev/def/DevTools.Core/ILogger.cs b/src/dev/def/DevTools.Core/ILogger.cs
deleted file mode 100644
index 8b7e97900..000000000
--- a/src/dev/def/DevTools.Core/ILogger.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace DevTools.Core
-{
- public interface ILogger
- {
- Task OpenLogsAsync();
-
- void LogFault(
- string featureName,
- Exception ex,
- string? message = null);
- }
-}
diff --git a/src/dev/def/DevTools.Core/Properties/AssemblyInfo.cs b/src/dev/def/DevTools.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index d328d9624..000000000
--- a/src/dev/def/DevTools.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Core")]
\ No newline at end of file
diff --git a/src/dev/def/DevTools.Core/Threading/IThread.cs b/src/dev/def/DevTools.Core/Threading/IThread.cs
deleted file mode 100644
index 3e42d389e..000000000
--- a/src/dev/def/DevTools.Core/Threading/IThread.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace DevTools.Core.Threading
-{
- /// <summary>
- /// Provides a set of methods to play around with threads.
- /// </summary>
- public interface IThread
- {
- /// <summary>
- /// Throws an exception if the current thread isn't the UI thread.
- /// </summary>
- void ThrowIfNotOnUIThread();
-
- /// <summary>
- /// Throws an exception if the current thread is the UI thread.
- /// </summary>
- void ThrowIfOnUIThread();
-
- /// <summary>
- /// Runs a given action on the UI thread and wait for its result asynchronously.
- /// </summary>
- /// <param name="action">Action to run on the UI thread.</param>
- /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
- Task RunOnUIThreadAsync(Action action);
-
- /// <summary>
- /// Runs a given action on the UI thread and wait for its result asynchronously.
- /// </summary>
- /// <param name="action">Action to run on the UI thread.</param>
- /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
- Task RunOnUIThreadAsync(ThreadPriority priority, Action action);
-
- /// <summary>
- /// Runs a given action on the UI thread and wait for its result asynchronously.
- /// </summary>
- /// <param name="action">Action to run on the UI thread.</param>
- /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
- Task RunOnUIThreadAsync(Func<Task> action);
-
- /// <summary>
- /// Runs a given action on the UI thread and wait for its result asynchronously.
- /// </summary>
- /// <param name="action">Action to run on the UI thread.</param>
- /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
- Task RunOnUIThreadAsync(ThreadPriority priority, Func<Task> action);
-
- /// <summary>
- /// Runs a given action on the UI thread and wait for its result asynchronously.
- /// </summary>
- /// <param name="action">Action to run on the UI thread.</param>
- /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
- Task<T> RunOnUIThreadAsync<T>(Func<Task<T>> action);
-
- /// <summary>
- /// Runs a given action on the UI thread and wait for its result asynchronously.
- /// </summary>
- /// <param name="action">Action to run on the UI thread.</param>
- /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
- Task<T> RunOnUIThreadAsync<T>(ThreadPriority priority, Func<Task<T>> action);
- }
-}
diff --git a/src/dev/def/DevTools.Core/Threading/ThreadPriority.cs b/src/dev/def/DevTools.Core/Threading/ThreadPriority.cs
deleted file mode 100644
index e816124f7..000000000
--- a/src/dev/def/DevTools.Core/Threading/ThreadPriority.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace DevTools.Core.Threading
-{
- public enum ThreadPriority
- {
- Low,
- Normal,
- High
- }
-}
diff --git a/src/dev/def/DevTools.Providers/DevTools.Providers.csproj b/src/dev/def/DevTools.Providers/DevTools.Providers.csproj
deleted file mode 100644
index b27943642..000000000
--- a/src/dev/def/DevTools.Providers/DevTools.Providers.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\DevTools.Core\DevTools.Core.csproj" />
- </ItemGroup>
-
-</Project>
diff --git a/src/dev/def/DevTools.Providers/Properties/AssemblyInfo.cs b/src/dev/def/DevTools.Providers/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8f703dc61..000000000
--- a/src/dev/def/DevTools.Providers/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Providers")]
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Common/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Common/Properties/AssemblyInfo.cs
deleted file mode 100644
index 58b694e91..000000000
--- a/src/dev/impl/DevTools.Common/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Common")]
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj
deleted file mode 100644
index 91639ad44..000000000
--- a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <ProjectGuid>{98274C08-4636-45EE-95AF-2C069BFBABD4}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools.Core.Impl</RootNamespace>
- <AssemblyName>DevTools.Core.Impl</AssemblyName>
- <DefaultLanguage>en</DefaultLanguage>
- <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
- <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>
- <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="Clipboard.cs" />
- <Compile Include="Injection\MefComposer.cs" />
- <Compile Include="Injection\MefProvider.cs" />
- <Compile Include="Logger.cs" />
- <Compile Include="UriActivationProtocolService.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Settings\SettingsProvider.cs" />
- <Compile Include="Theme\ThemeListener.cs" />
- <Compile Include="Threading\Thread.cs" />
- <Compile Include="TitleBar.cs" />
- <Compile Include="WindowManager.cs" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
- <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">
- <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>
- <Name>DevTools.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Core.Impl/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Core.Impl/Properties/AssemblyInfo.cs
deleted file mode 100644
index c57cfb24a..000000000
--- a/src/dev/impl/DevTools.Core.Impl/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Core.Impl")]
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
deleted file mode 100644
index c16c5382b..000000000
--- a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{E2F0C303-04FC-4504-A272-7662AF9A0A80}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools.Impl</RootNamespace>
- <AssemblyName>DevTools.Impl</AssemblyName>
- <DefaultLanguage>en</DefaultLanguage>
- <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
- <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>
- <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="Dummy.cs" />
- <Compile Include="Messages\NavigateToToolMessage.cs" />
- <Compile Include="Models\MatchedToolProviderViewData.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ViewModels\MainPageViewModel.cs" />
- <Compile Include="Views\MainPage.xaml.cs">
- <DependentUpon>MainPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Settings\MarkdownContentDialog.xaml.cs">
- <DependentUpon>MarkdownContentDialog.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Settings\SettingsToolPage.xaml.cs">
- <DependentUpon>SettingsToolPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="ViewModels\Settings\SettingsToolProvider.cs" />
- <Compile Include="ViewModels\Settings\SettingsToolViewModel.cs" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="ColorCode.Core" Version="$(Nuget_ColorCodeUwp)" />
- <PackageReference Include="ColorCode.UWP" Version="$(Nuget_ColorCodeUwp)" />
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
- <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />
- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Behaviors" Version="$(Nuget_MicrosoftToolkitUwpUIBehaviors)" />
- <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />
- <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">
- <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>
- <Name>DevTools.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">
- <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
- <Name>DevTools.Providers</Name>
- </ProjectReference>
- <ProjectReference Include="..\DevTools.Common\DevTools.Common.csproj">
- <Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>
- <Name>DevTools.Common</Name>
- </ProjectReference>
- <ProjectReference Include="..\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj">
- <Project>{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}</Project>
- <Name>DevTools.Providers.Impl</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Page Include="Views\MainPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Views\Settings\MarkdownContentDialog.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Views\Settings\SettingsToolPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- </ItemGroup>
- <ItemGroup>
- <Content Include="..\..\startup\DevTools.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png">
- <Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png</Link>
- </Content>
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Impl/Dummy.cs b/src/dev/impl/DevTools.Impl/Dummy.cs
deleted file mode 100644
index bfea93578..000000000
--- a/src/dev/impl/DevTools.Impl/Dummy.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace DevTools.Impl
-{
- public class Dummy
- {
- }
-}
diff --git a/src/dev/impl/DevTools.Impl/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Impl/Properties/AssemblyInfo.cs
deleted file mode 100644
index c8f2171f4..000000000
--- a/src/dev/impl/DevTools.Impl/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Impl")]
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Impl/Properties/DevTools.Impl.rd.xml b/src/dev/impl/DevTools.Impl/Properties/DevTools.Impl.rd.xml
deleted file mode 100644
index 285804529..000000000
--- a/src/dev/impl/DevTools.Impl/Properties/DevTools.Impl.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file contains Runtime Directives, specifications about types your application accesses
- through reflection and other dynamic code patterns. Runtime Directives are used to control the
- .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
- library does not do any reflection, then you generally do not need to edit this file. However,
- if your library reflects over types, especially types passed to it or derived from its types,
- then you should write Runtime Directives.
-
- The most common use of reflection in libraries is to discover information about types passed
- to the library. Runtime Directives have three ways to express requirements on types passed to
- your library.
-
- 1. Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
- Use these directives to reflect over types passed as a parameter.
-
- 2. SubTypes
- Use a SubTypes directive to reflect over types derived from another type.
-
- 3. AttributeImplies
- Use an AttributeImplies directive to indicate that your library needs to reflect over
- types or methods decorated with an attribute.
-
- For more information on writing Runtime Directives for libraries, please visit
- https://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
- <Library Name="DevTools.Impl">
-
- <!-- add directives for your library here -->
-
- </Library>
-</Directives>
diff --git a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj b/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
deleted file mode 100644
index 7ab19ae13..000000000
--- a/src/dev/impl/DevTools.Providers.Impl/DevTools.Providers.Impl.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <ProjectGuid>{8621ED11-E9DD-480A-BE2B-C1DB00919B6F}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools.Providers.Impl</RootNamespace>
- <AssemblyName>DevTools.Providers.Impl</AssemblyName>
- <DefaultLanguage>en</DefaultLanguage>
- <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
- <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>
- <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="Dummy.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ToolProviderFactory.cs" />
- <Compile Include="Tools\Base64EncoderDecoder\Base64EncoderDecoderToolPage.xaml.cs">
- <DependentUpon>Base64EncoderDecoderToolPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Tools\Base64EncoderDecoder\Base64EncoderDecoderToolProvider.cs" />
- <Compile Include="Tools\Base64EncoderDecoder\Base64EncoderDecoderToolViewModel.cs" />
- <Compile Include="Tools\HashGenerator\HashGeneratorToolPage.xaml.cs">
- <DependentUpon>HashGeneratorToolPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Tools\HashGenerator\HashGeneratorToolProvider.cs" />
- <Compile Include="Tools\HashGenerator\HashGeneratorToolViewModel.cs" />
- <Compile Include="Tools\JsonFormatter\JsonFormatterToolProvider.cs" />
- <Compile Include="Tools\JsonFormatter\JsonFormatterToolPage.xaml.cs">
- <DependentUpon>JsonFormatterToolPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Tools\JsonFormatter\JsonFormatterToolViewModel.cs" />
- <Compile Include="Tools\RegEx\RegExToolPage.xaml.cs">
- <DependentUpon>RegExToolPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Tools\RegEx\RegExToolProvider.cs" />
- <Compile Include="Tools\RegEx\RegExToolViewModel.cs" />
- <Compile Include="Tools\TextDiff\TextDiffToolPage.xaml.cs">
- <DependentUpon>TextDiffToolPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Tools\TextDiff\TextDiffToolProvider.cs" />
- <Compile Include="Tools\TextDiff\TextDiffToolViewModel.cs" />
- <Compile Include="Tools\ToolProviderBase.cs" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
- <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />
- <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />
- <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">
- <Project>{EF6A6707-44F2-4E76-98B8-11C9B40ADC7E}</Project>
- <Name>DevTools.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">
- <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
- <Name>DevTools.Providers</Name>
- </ProjectReference>
- <ProjectReference Include="..\DevTools.Common\DevTools.Common.csproj">
- <Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>
- <Name>DevTools.Common</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Page Include="Tools\Base64EncoderDecoder\Base64EncoderDecoderToolPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Tools\HashGenerator\HashGeneratorToolPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Tools\JsonFormatter\JsonFormatterToolPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Tools\RegEx\RegExToolPage.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </Page>
- <Page Include="Tools\TextDiff\TextDiffToolPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Providers.Impl/Dummy.cs b/src/dev/impl/DevTools.Providers.Impl/Dummy.cs
deleted file mode 100644
index 38eb877f0..000000000
--- a/src/dev/impl/DevTools.Providers.Impl/Dummy.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace DevTools.Providers.Impl
-{
- public class Dummy
- {
- }
-}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Providers.Impl/Properties/AssemblyInfo.cs
deleted file mode 100644
index cbc480c8e..000000000
--- a/src/dev/impl/DevTools.Providers.Impl/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DevTools.Providers.Impl")]
\ No newline at end of file
diff --git a/src/dev/def/DevTools.Core/IClipboard.cs b/src/dev/impl/DevToys/Api/Core/IClipboard.cs
similarity index 84%
rename from src/dev/def/DevTools.Core/IClipboard.cs
rename to src/dev/impl/DevToys/Api/Core/IClipboard.cs
index 68ed220aa..728cacf30 100644
--- a/src/dev/def/DevTools.Core/IClipboard.cs
+++ b/src/dev/impl/DevToys/Api/Core/IClipboard.cs
@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+#nullable enable
-namespace DevTools.Core
+using System.Threading.Tasks;
+
+namespace DevToys.Api.Core
{
/// <summary>
/// Provides a set of methods to interact with the clipboard.
diff --git a/src/dev/def/DevTools.Core/Injection/IMefProvider.cs b/src/dev/impl/DevToys/Api/Core/IMefProvider.cs
similarity index 81%
rename from src/dev/def/DevTools.Core/Injection/IMefProvider.cs
rename to src/dev/impl/DevToys/Api/Core/IMefProvider.cs
index c1b196e11..b242bda54 100644
--- a/src/dev/def/DevTools.Core/Injection/IMefProvider.cs
+++ b/src/dev/impl/DevToys/Api/Core/IMefProvider.cs
@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+#nullable enable
-namespace DevTools.Core.Injection
+using System.Collections.Generic;
+
+namespace DevToys.Api.Core.Injection
{
/// <summary>
/// Provides a way to import MEF components on the fly.
diff --git a/src/dev/def/DevTools.Core/ITitleBar.cs b/src/dev/impl/DevToys/Api/Core/ITitleBar.cs
similarity index 87%
rename from src/dev/def/DevTools.Core/ITitleBar.cs
rename to src/dev/impl/DevToys/Api/Core/ITitleBar.cs
index 56698809b..425e965d5 100644
--- a/src/dev/def/DevTools.Core/ITitleBar.cs
+++ b/src/dev/impl/DevToys/Api/Core/ITitleBar.cs
@@ -1,7 +1,9 @@
-using System.ComponentModel;
+#nullable enable
+
+using System.ComponentModel;
using System.Threading.Tasks;
-namespace DevTools.Core
+namespace DevToys.Api.Core
{
/// <summary>
/// Provides a service designed to manager the window title bar.
diff --git a/src/dev/def/DevTools.Core/IUriActivationProtocolService.cs b/src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs
similarity index 84%
rename from src/dev/def/DevTools.Core/IUriActivationProtocolService.cs
rename to src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs
index 223d34688..f2a99996a 100644
--- a/src/dev/def/DevTools.Core/IUriActivationProtocolService.cs
+++ b/src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs
@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+#nullable enable
-namespace DevTools.Core
+using System.Threading.Tasks;
+
+namespace DevToys.Api.Core
{
/// <summary>
/// Provides a service allowing to activate the app throught a URI protocol.
diff --git a/src/dev/def/DevTools.Core/IWindowManager.cs b/src/dev/impl/DevToys/Api/Core/Navigation/IWindowManager.cs
similarity index 91%
rename from src/dev/def/DevTools.Core/IWindowManager.cs
rename to src/dev/impl/DevToys/Api/Core/Navigation/IWindowManager.cs
index 784ca890d..964d8b452 100644
--- a/src/dev/def/DevTools.Core/IWindowManager.cs
+++ b/src/dev/impl/DevToys/Api/Core/Navigation/IWindowManager.cs
@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+#nullable enable
-namespace DevTools.Core
+using System.Threading.Tasks;
+
+namespace DevToys.Api.Core.Navigation
{
/// <summary>
/// Provides a set of methods to manager windows and dialogs.
diff --git a/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs b/src/dev/impl/DevToys/Api/Core/Navigation/NavigationParameter.cs
similarity index 91%
rename from src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs
rename to src/dev/impl/DevToys/Api/Core/Navigation/NavigationParameter.cs
index 0ae2e54a6..c9eb8b5dc 100644
--- a/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs
+++ b/src/dev/impl/DevToys/Api/Core/Navigation/NavigationParameter.cs
@@ -1,7 +1,10 @@
-using DevTools.Core.Injection;
+#nullable enable
+
+using DevToys.Api.Core.Injection;
+using DevToys.Core;
using System.ComponentModel;
-namespace DevTools.Core.Navigation
+namespace DevToys.Api.Core.Navigation
{
/// <summary>
/// Represents the arguments passed to a page or frame.
diff --git a/src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs b/src/dev/impl/DevToys/Api/Core/Settings/ISettingsProvider.cs
similarity index 95%
rename from src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs
rename to src/dev/impl/DevToys/Api/Core/Settings/ISettingsProvider.cs
index dd0e7d45e..0eb69a6c9 100644
--- a/src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs
+++ b/src/dev/impl/DevToys/Api/Core/Settings/ISettingsProvider.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
-namespace DevTools.Core.Settings
+using System;
+
+namespace DevToys.Api.Core.Settings
{
/// <summary>
/// Provides a set of methods to manage the application's settings.
diff --git a/src/dev/def/DevTools.Core/Settings/SettingChangedEventArgs.cs b/src/dev/impl/DevToys/Api/Core/Settings/SettingChangedEventArgs.cs
similarity index 82%
rename from src/dev/def/DevTools.Core/Settings/SettingChangedEventArgs.cs
rename to src/dev/impl/DevToys/Api/Core/Settings/SettingChangedEventArgs.cs
index eccf500ed..cd5f9b120 100644
--- a/src/dev/def/DevTools.Core/Settings/SettingChangedEventArgs.cs
+++ b/src/dev/impl/DevToys/Api/Core/Settings/SettingChangedEventArgs.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
-namespace DevTools.Core.Settings
+using System;
+
+namespace DevToys.Api.Core.Settings
{
public sealed class SettingChangedEventArgs : EventArgs
{
diff --git a/src/dev/def/DevTools.Core/Settings/SettingDefinition.cs b/src/dev/impl/DevToys/Api/Core/Settings/SettingDefinition.cs
similarity index 97%
rename from src/dev/def/DevTools.Core/Settings/SettingDefinition.cs
rename to src/dev/impl/DevToys/Api/Core/Settings/SettingDefinition.cs
index d6fc59b38..6222f5351 100644
--- a/src/dev/def/DevTools.Core/Settings/SettingDefinition.cs
+++ b/src/dev/impl/DevToys/Api/Core/Settings/SettingDefinition.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
-namespace DevTools.Core.Settings
+using System;
+
+namespace DevToys.Api.Core.Settings
{
/// <summary>
/// Represents the definition of a setting in the application.
diff --git a/src/dev/def/DevTools.Core/Theme/AppTheme.cs b/src/dev/impl/DevToys/Api/Core/Theme/AppTheme.cs
similarity index 90%
rename from src/dev/def/DevTools.Core/Theme/AppTheme.cs
rename to src/dev/impl/DevToys/Api/Core/Theme/AppTheme.cs
index 25690d3b9..4d2c9bdb9 100644
--- a/src/dev/def/DevTools.Core/Theme/AppTheme.cs
+++ b/src/dev/impl/DevToys/Api/Core/Theme/AppTheme.cs
@@ -1,4 +1,6 @@
-namespace DevTools.Core.Theme
+#nullable enable
+
+namespace DevToys.Api.Core.Theme
{
/// <summary>
/// Specifies a UI theme that should be used for individual UIElement parts of an app UI.
diff --git a/src/dev/def/DevTools.Core/Theme/IThemeListener.cs b/src/dev/impl/DevToys/Api/Core/Theme/IThemeListener.cs
similarity index 92%
rename from src/dev/def/DevTools.Core/Theme/IThemeListener.cs
rename to src/dev/impl/DevToys/Api/Core/Theme/IThemeListener.cs
index 7de3e4520..28b04bcfe 100644
--- a/src/dev/def/DevTools.Core/Theme/IThemeListener.cs
+++ b/src/dev/impl/DevToys/Api/Core/Theme/IThemeListener.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
-namespace DevTools.Core.Theme
+using System;
+
+namespace DevToys.Api.Core.Theme
{
public interface IThemeListener
{
diff --git a/src/dev/def/DevTools.Providers/CompactOverlaySizeAttribute.cs b/src/dev/impl/DevToys/Api/Tools/CompactOverlaySizeAttribute.cs
similarity index 91%
rename from src/dev/def/DevTools.Providers/CompactOverlaySizeAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/CompactOverlaySizeAttribute.cs
index 3ff373884..aca82f6b0 100644
--- a/src/dev/def/DevTools.Providers/CompactOverlaySizeAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/CompactOverlaySizeAttribute.cs
@@ -1,7 +1,9 @@
-using System;
+#nullable enable
+
+using System;
using System.Composition;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Indicates the size that the window should take in Compact Overlay mode when this <see cref="IToolProvider"/> is active.
diff --git a/src/dev/def/DevTools.Providers/IToolProvider.cs b/src/dev/impl/DevToys/Api/Tools/IToolProvider.cs
similarity index 93%
rename from src/dev/def/DevTools.Providers/IToolProvider.cs
rename to src/dev/impl/DevToys/Api/Tools/IToolProvider.cs
index f7ed049d5..441ab8ece 100644
--- a/src/dev/def/DevTools.Providers/IToolProvider.cs
+++ b/src/dev/impl/DevToys/Api/Tools/IToolProvider.cs
@@ -1,6 +1,8 @@
-using System.ComponentModel;
+#nullable enable
-namespace DevTools.Providers
+using System.ComponentModel;
+
+namespace DevToys.Api.Tools
{
/// <summary>
/// Provides information about a tool and create an instance of it.
diff --git a/src/dev/def/DevTools.Providers/IToolProviderFactory.cs b/src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs
similarity index 92%
rename from src/dev/def/DevTools.Providers/IToolProviderFactory.cs
rename to src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs
index bdc8b67ea..135c18458 100644
--- a/src/dev/def/DevTools.Providers/IToolProviderFactory.cs
+++ b/src/dev/impl/DevToys/Api/Tools/IToolProviderFactory.cs
@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+#nullable enable
-namespace DevTools.Providers
+using System.Collections.Generic;
+
+namespace DevToys.Api.Tools
{
/// <summary>
/// Factory allowing to get a set of <see cref="IToolProvider"/>.
diff --git a/src/dev/def/DevTools.Providers/IToolViewModel.cs b/src/dev/impl/DevToys/Api/Tools/IToolViewModel.cs
similarity index 85%
rename from src/dev/def/DevTools.Providers/IToolViewModel.cs
rename to src/dev/impl/DevToys/Api/Tools/IToolViewModel.cs
index 17b009091..dc50e5adc 100644
--- a/src/dev/def/DevTools.Providers/IToolViewModel.cs
+++ b/src/dev/impl/DevToys/Api/Tools/IToolViewModel.cs
@@ -1,7 +1,9 @@
-using System;
+#nullable enable
+
+using System;
using System.ComponentModel;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Provides a view model for a tool.
diff --git a/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs b/src/dev/impl/DevToys/Api/Tools/IsFooterItemAttribute.cs
similarity index 86%
rename from src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/IsFooterItemAttribute.cs
index bcee85426..d8cc50b0d 100644
--- a/src/dev/def/DevTools.Providers/IsFooterItemAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/IsFooterItemAttribute.cs
@@ -1,7 +1,9 @@
-using System;
+#nullable enable
+
+using System;
using System.Composition;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Indicates whether the <see cref="IToolProvider"/> should be displayed at the bottom in the navigation view or not.
diff --git a/src/dev/def/DevTools.Providers/MatchSpan.cs b/src/dev/impl/DevToys/Api/Tools/MatchSpan.cs
similarity index 84%
rename from src/dev/def/DevTools.Providers/MatchSpan.cs
rename to src/dev/impl/DevToys/Api/Tools/MatchSpan.cs
index b34197950..72294717b 100644
--- a/src/dev/def/DevTools.Providers/MatchSpan.cs
+++ b/src/dev/impl/DevToys/Api/Tools/MatchSpan.cs
@@ -1,4 +1,6 @@
-namespace DevTools.Providers
+#nullable enable
+
+namespace DevToys.Api.Tools
{
public struct MatchSpan
{
diff --git a/src/dev/def/DevTools.Providers/MatchedToolProvider.cs b/src/dev/impl/DevToys/Api/Tools/MatchedToolProvider.cs
similarity index 96%
rename from src/dev/def/DevTools.Providers/MatchedToolProvider.cs
rename to src/dev/impl/DevToys/Api/Tools/MatchedToolProvider.cs
index afebb690d..6e300566e 100644
--- a/src/dev/def/DevTools.Providers/MatchedToolProvider.cs
+++ b/src/dev/impl/DevToys/Api/Tools/MatchedToolProvider.cs
@@ -1,8 +1,10 @@
-using DevTools.Core;
+#nullable enable
+
+using DevToys.Core;
using System;
using System.ComponentModel;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Represents a tool provider that matched a certain search.
diff --git a/src/dev/def/DevTools.Providers/NameAttribute.cs b/src/dev/impl/DevToys/Api/Tools/NameAttribute.cs
similarity index 86%
rename from src/dev/def/DevTools.Providers/NameAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/NameAttribute.cs
index 96b89aaae..22bc8782d 100644
--- a/src/dev/def/DevTools.Providers/NameAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/NameAttribute.cs
@@ -1,7 +1,9 @@
-using System;
+#nullable enable
+
+using System;
using System.Composition;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Indicates an internal non-localized name.
diff --git a/src/dev/def/DevTools.Providers/NotScrollableAttribute.cs b/src/dev/impl/DevToys/Api/Tools/NotScrollableAttribute.cs
similarity index 84%
rename from src/dev/def/DevTools.Providers/NotScrollableAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/NotScrollableAttribute.cs
index cdab8e3ea..ba374b5d0 100644
--- a/src/dev/def/DevTools.Providers/NotScrollableAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/NotScrollableAttribute.cs
@@ -1,7 +1,9 @@
-using System;
+#nullable enable
+
+using System;
using System.Composition;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Indicates that the tool view can not be scrolled.
diff --git a/src/dev/def/DevTools.Providers/OrderAttribute.cs b/src/dev/impl/DevToys/Api/Tools/OrderAttribute.cs
similarity index 87%
rename from src/dev/def/DevTools.Providers/OrderAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/OrderAttribute.cs
index 43cf3ebc6..60b8f60f4 100644
--- a/src/dev/def/DevTools.Providers/OrderAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/OrderAttribute.cs
@@ -1,7 +1,9 @@
-using System;
+#nullable enable
+
+using System;
using System.Composition;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Indicates the order in which this <see cref="IToolProvider"/> should appear.
diff --git a/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs b/src/dev/impl/DevToys/Api/Tools/ProtocolNameAttribute.cs
similarity index 93%
rename from src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs
rename to src/dev/impl/DevToys/Api/Tools/ProtocolNameAttribute.cs
index bdc11b396..6c9cd4f63 100644
--- a/src/dev/def/DevTools.Providers/ProtocolNameAttribute.cs
+++ b/src/dev/impl/DevToys/Api/Tools/ProtocolNameAttribute.cs
@@ -1,8 +1,10 @@
-using System;
+#nullable enable
+
+using System;
using System.Composition;
using System.Linq;
-namespace DevTools.Providers
+namespace DevToys.Api.Tools
{
/// <summary>
/// Indicates the tool name used through URI Activation Protocol to access this <see cref="IToolProvider"/>.
diff --git a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs b/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
similarity index 95%
rename from src/dev/def/DevTools.Providers/ToolProviderMetadata.cs
rename to src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
index ae0888e2f..ebcef180c 100644
--- a/src/dev/def/DevTools.Providers/ToolProviderMetadata.cs
+++ b/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
@@ -1,6 +1,8 @@
-using System.ComponentModel;
+#nullable enable
-namespace DevTools.Providers
+using System.ComponentModel;
+
+namespace DevToys.Api.Tools
{
public sealed class ToolProviderMetadata
{
diff --git a/src/dev/startup/DevTools/App.xaml b/src/dev/impl/DevToys/App.xaml
similarity index 71%
rename from src/dev/startup/DevTools/App.xaml
rename to src/dev/impl/DevToys/App.xaml
index a7bfdbbcd..6a9ac521b 100644
--- a/src/dev/startup/DevTools/App.xaml
+++ b/src/dev/impl/DevToys/App.xaml
@@ -1,5 +1,5 @@
<Application
- x:Class="DevTools.App"
+ x:Class="DevToys.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.UI.Xaml.Controls">
@@ -8,8 +8,8 @@
<controls:XamlControlsResources.MergedDictionaries>
<!-- Other app resources here -->
- <ResourceDictionary Source="ms-appx:///DevTools.Common/Themes/Generic.xaml"/>
- <ResourceDictionary Source="ms-appx:///DevTools.Common/Themes/Custom.xaml"/>
+ <ResourceDictionary Source="ms-appx:///Themes/Generic.xaml"/>
+ <ResourceDictionary Source="ms-appx:///Themes/Custom.xaml"/>
</controls:XamlControlsResources.MergedDictionaries>
</controls:XamlControlsResources>
diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/impl/DevToys/App.xaml.cs
similarity index 90%
rename from src/dev/startup/DevTools/App.xaml.cs
rename to src/dev/impl/DevToys/App.xaml.cs
index 05355f9d1..948b91739 100644
--- a/src/dev/startup/DevTools/App.xaml.cs
+++ b/src/dev/impl/DevToys/App.xaml.cs
@@ -1,15 +1,14 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core;
-using DevTools.Core.Impl.Injection;
-using DevTools.Core.Injection;
-using DevTools.Core.Navigation;
-using DevTools.Core.Settings;
-using DevTools.Core.Theme;
-using DevTools.Core.Threading;
-using DevTools.Impl.Views;
-using DevTools.Providers;
+using DevToys.Api.Core;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Core.Navigation;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Core.Theme;
+using DevToys.Core;
+using DevToys.Core.Settings;
+using DevToys.Core.Threading;
+using DevToys.Views;
using System;
using System.Globalization;
using System.Linq;
@@ -22,7 +21,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools
+namespace DevToys
{
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
@@ -49,10 +48,7 @@ namespace DevTools
= Task.Run(() =>
{
return new MefComposer(
- typeof(MefComposer).Assembly,
- typeof(IToolProvider).Assembly,
- typeof(Providers.Impl.Dummy).Assembly,
- typeof(Impl.Dummy).Assembly);
+ typeof(MefComposer).Assembly);
});
UnhandledException += OnUnhandledException;
@@ -174,9 +170,9 @@ namespace DevTools
deferral.Complete();
}
- private async void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
+ private void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
{
- (await _mefComposer).ExportProvider.GetExport<ILogger>().LogFault("Unhandled problem", e.Exception);
+ Logger.LogFault("Unhandled problem", e.Exception);
}
private async Task<Frame> EnsureWindowIsInitializedAsync()
diff --git a/src/dev/impl/DevTools.Common/Assets/CascadiaCode.ttf b/src/dev/impl/DevToys/Assets/CascadiaCode.ttf
similarity index 100%
rename from src/dev/impl/DevTools.Common/Assets/CascadiaCode.ttf
rename to src/dev/impl/DevToys/Assets/CascadiaCode.ttf
diff --git a/src/dev/impl/DevTools.Common/Assets/CascadiaMono.ttf b/src/dev/impl/DevToys/Assets/CascadiaMono.ttf
similarity index 100%
rename from src/dev/impl/DevTools.Common/Assets/CascadiaMono.ttf
rename to src/dev/impl/DevToys/Assets/CascadiaMono.ttf
diff --git a/src/dev/impl/DevTools.Common/Assets/FluentSystemIcons-Regular.ttf b/src/dev/impl/DevToys/Assets/FluentSystemIcons-Regular.ttf
similarity index 100%
rename from src/dev/impl/DevTools.Common/Assets/FluentSystemIcons-Regular.ttf
rename to src/dev/impl/DevToys/Assets/FluentSystemIcons-Regular.ttf
diff --git a/src/dev/impl/DevTools.Common/Assets/Icons/Idea.svg b/src/dev/impl/DevToys/Assets/Icons/Idea.svg
similarity index 100%
rename from src/dev/impl/DevTools.Common/Assets/Icons/Idea.svg
rename to src/dev/impl/DevToys/Assets/Icons/Idea.svg
diff --git a/src/dev/def/DevTools.Core/Arguments.cs b/src/dev/impl/DevToys/Core/Arguments.cs
similarity index 93%
rename from src/dev/def/DevTools.Core/Arguments.cs
rename to src/dev/impl/DevToys/Core/Arguments.cs
index b1b865c58..871c96a89 100644
--- a/src/dev/def/DevTools.Core/Arguments.cs
+++ b/src/dev/impl/DevToys/Core/Arguments.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
-namespace DevTools.Core
+using System;
+
+namespace DevToys.Core
{
public static class Arguments
{
diff --git a/src/dev/impl/DevTools.Common/AssetsHelper.cs b/src/dev/impl/DevToys/Core/AssetsHelper.cs
similarity index 90%
rename from src/dev/impl/DevTools.Common/AssetsHelper.cs
rename to src/dev/impl/DevToys/Core/AssetsHelper.cs
index a4a7b7293..f2122dc5b 100644
--- a/src/dev/impl/DevTools.Common/AssetsHelper.cs
+++ b/src/dev/impl/DevToys/Core/AssetsHelper.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Core.Threading;
+using DevToys.Core.Threading;
using System;
using System.IO;
+using System.Text;
using System.Threading.Tasks;
using Windows.Storage;
-namespace DevTools.Common
+namespace DevToys.Core
{
public static class AssetsHelper
{
@@ -40,7 +41,7 @@ namespace DevTools.Common
IStorageItem file = await installationFolder.TryGetItemAsync(filePath);
if (file != null)
{
- return File.ReadAllText(file.Path);
+ return File.ReadAllText(file.Path, Encoding.UTF8);
}
return string.Empty;
diff --git a/src/dev/def/DevTools.Core/Assumes.cs b/src/dev/impl/DevToys/Core/Assumes.cs
similarity index 94%
rename from src/dev/def/DevTools.Core/Assumes.cs
rename to src/dev/impl/DevToys/Core/Assumes.cs
index ff61a0879..5d2b13f21 100644
--- a/src/dev/def/DevTools.Core/Assumes.cs
+++ b/src/dev/impl/DevToys/Core/Assumes.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
-namespace DevTools.Core
+using System;
+
+namespace DevToys.Core
{
public static class Assumes
{
diff --git a/src/dev/impl/DevTools.Core.Impl/Clipboard.cs b/src/dev/impl/DevToys/Core/Clipboard.cs
similarity index 83%
rename from src/dev/impl/DevTools.Core.Impl/Clipboard.cs
rename to src/dev/impl/DevToys/Core/Clipboard.cs
index a296dd6c0..1303ccdb3 100644
--- a/src/dev/impl/DevTools.Core.Impl/Clipboard.cs
+++ b/src/dev/impl/DevToys/Core/Clipboard.cs
@@ -1,32 +1,29 @@
#nullable enable
-using DevTools.Core.Threading;
+using DevToys.Api.Core;
+using DevToys.Core.Threading;
using System;
using System.Composition;
using System.Threading.Tasks;
using Windows.UI.Xaml;
-namespace DevTools.Core.Impl
+namespace DevToys.Core
{
[Export(typeof(IClipboard))]
[Shared]
internal sealed class Clipboard : IClipboard
{
- private readonly IThread _thread;
-
private bool _isWindowInForeground;
[ImportingConstructor]
- public Clipboard(IThread thread)
+ public Clipboard()
{
- _thread = thread;
-
Window.Current.Activated += Window_Activated;
}
public Task<string> GetClipboardContentAsTextAsync()
{
- return _thread.RunOnUIThreadAsync(async () =>
+ return ThreadHelper.RunOnUIThreadAsync(async () =>
{
if (!_isWindowInForeground)
{
diff --git a/src/dev/def/DevTools.Core/Collections/OrderedObservableCollection.cs b/src/dev/impl/DevToys/Core/Collections/OrderedObservableCollection.cs
similarity index 91%
rename from src/dev/def/DevTools.Core/Collections/OrderedObservableCollection.cs
rename to src/dev/impl/DevToys/Core/Collections/OrderedObservableCollection.cs
index b271b7d9c..87847765d 100644
--- a/src/dev/def/DevTools.Core/Collections/OrderedObservableCollection.cs
+++ b/src/dev/impl/DevToys/Core/Collections/OrderedObservableCollection.cs
@@ -1,15 +1,17 @@
-using System.Collections.Generic;
+#nullable enable
+
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
-namespace DevTools.Core.Collections
+namespace DevToys.Core.Collections
{
public class OrderedObservableCollection<T> : ObservableCollection<T>
{
/// <summary>
/// Update the difference between the current items in the collection and the <paramref name="newItems"/>.
/// </summary>
- public void Update(IEnumerable<T> newItems)
+ internal void Update(IEnumerable<T> newItems)
{
// First, remove the items that aren't part of the new list items.
List<T> oldToolsMenuItems = this.ToList();
diff --git a/src/dev/def/DevTools.Core/Constants.cs b/src/dev/impl/DevToys/Core/Constants.cs
similarity index 83%
rename from src/dev/def/DevTools.Core/Constants.cs
rename to src/dev/impl/DevToys/Core/Constants.cs
index 8eb79641f..5602e117f 100644
--- a/src/dev/def/DevTools.Core/Constants.cs
+++ b/src/dev/impl/DevToys/Core/Constants.cs
@@ -1,4 +1,6 @@
-namespace DevTools.Core
+#nullable enable
+
+namespace DevToys.Core
{
public static class Constants
{
diff --git a/src/dev/impl/DevTools.Core.Impl/Logger.cs b/src/dev/impl/DevToys/Core/Logger.cs
similarity index 72%
rename from src/dev/impl/DevTools.Core.Impl/Logger.cs
rename to src/dev/impl/DevToys/Core/Logger.cs
index 1af7792ec..ebac7f562 100644
--- a/src/dev/impl/DevTools.Core.Impl/Logger.cs
+++ b/src/dev/impl/DevToys/Core/Logger.cs
@@ -1,43 +1,37 @@
#nullable enable
-using DevTools.Core.Threading;
+using DevToys.Core.Threading;
using System;
using System.Collections.Generic;
-using System.Composition;
using System.Globalization;
using System.Threading;
using System.Threading.Tasks;
-using Windows.ApplicationModel.Core;
using Windows.Storage;
using Windows.System;
-using Windows.UI.Core;
-namespace DevTools.Core.Impl
+namespace DevToys.Core
{
- [Export(typeof(ILogger))]
- internal sealed class Logger : ILogger
+ internal static class Logger
{
private const string LogFileName = "logs.txt";
- private readonly static CoreDispatcher _uiDispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
+ private readonly static DisposableSempahore _semaphore = new DisposableSempahore();
- private readonly DisposableSempahore _semaphore = new DisposableSempahore();
-
- public async Task OpenLogsAsync()
+ internal static async Task OpenLogsAsync()
{
StorageFolder localCacheFolder = ApplicationData.Current.LocalCacheFolder;
IStorageItem file = await localCacheFolder.TryGetItemAsync(LogFileName);
if (file is not null and IStorageFile storageFile)
{
- await _uiDispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+ await ThreadHelper.RunOnUIThreadAsync(async () =>
{
await Launcher.LaunchFileAsync(storageFile);
});
}
}
- public void LogFault(string featureName, Exception ex, string? message = null)
+ internal static void LogFault(string featureName, Exception ex, string? message = null)
{
lock (_semaphore)
{
@@ -45,7 +39,7 @@ namespace DevTools.Core.Impl
}
}
- private async Task LogFaultAsync(string featureName, Exception ex, string? message)
+ private static async Task LogFaultAsync(string featureName, Exception ex, string? message)
{
await TaskScheduler.Default;
diff --git a/src/dev/impl/DevTools.Core.Impl/Injection/MefComposer.cs b/src/dev/impl/DevToys/Core/MefComposer.cs
similarity index 96%
rename from src/dev/impl/DevTools.Core.Impl/Injection/MefComposer.cs
rename to src/dev/impl/DevToys/Core/MefComposer.cs
index f180387c6..80d0ad193 100644
--- a/src/dev/impl/DevTools.Core.Impl/Injection/MefComposer.cs
+++ b/src/dev/impl/DevToys/Core/MefComposer.cs
@@ -1,12 +1,12 @@
#nullable enable
-using DevTools.Core.Injection;
+using DevToys.Api.Core.Injection;
using System;
using System.Collections.Generic;
using System.Composition.Hosting;
using System.Reflection;
-namespace DevTools.Core.Impl.Injection
+namespace DevToys.Core
{
/// <summary>
/// Provides a set of methods to initialize and manage MEF.
diff --git a/src/dev/impl/DevTools.Core.Impl/Injection/MefProvider.cs b/src/dev/impl/DevToys/Core/MefProvider.cs
similarity index 88%
rename from src/dev/impl/DevTools.Core.Impl/Injection/MefProvider.cs
rename to src/dev/impl/DevToys/Core/MefProvider.cs
index a39c4587e..bb6bf2dd1 100644
--- a/src/dev/impl/DevTools.Core.Impl/Injection/MefProvider.cs
+++ b/src/dev/impl/DevToys/Core/MefProvider.cs
@@ -1,11 +1,11 @@
#nullable enable
-using DevTools.Core.Injection;
+using DevToys.Api.Core.Injection;
using System.Collections.Generic;
using System.Composition;
using System.Composition.Hosting;
-namespace DevTools.Core.Impl.Injection
+namespace DevToys.Core
{
[Export(typeof(IMefProvider))]
[Shared]
diff --git a/src/dev/impl/DevTools.Core.Impl/WindowManager.cs b/src/dev/impl/DevToys/Core/Navigation/WindowManager.cs
similarity index 78%
rename from src/dev/impl/DevTools.Core.Impl/WindowManager.cs
rename to src/dev/impl/DevToys/Core/Navigation/WindowManager.cs
index 99206a2dc..9a150f5a8 100644
--- a/src/dev/impl/DevTools.Core.Impl/WindowManager.cs
+++ b/src/dev/impl/DevToys/Core/Navigation/WindowManager.cs
@@ -1,28 +1,21 @@
#nullable enable
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core.Threading;
using System;
using System.Composition;
using System.Threading.Tasks;
using Windows.ApplicationModel;
using Windows.UI.Xaml.Controls;
-namespace DevTools.Core.Impl
+namespace DevToys.Core.Navigation
{
[Export(typeof(IWindowManager))]
internal sealed class WindowManager : IWindowManager
{
- private readonly IThread _thread;
-
- [ImportingConstructor]
- public WindowManager(IThread thread)
- {
- _thread = thread;
- }
-
public Task<bool> ShowContentDialogAsync(object content, string primaryButtonText, string? secondaryButtonText = null, string? title = null)
{
- return _thread.RunOnUIThreadAsync(async () =>
+ return ThreadHelper.RunOnUIThreadAsync(async () =>
{
var confirmationDialog = new ContentDialog
{
diff --git a/src/dev/def/DevTools.Core/Settings/PredefinedSettings.cs b/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
similarity index 95%
rename from src/dev/def/DevTools.Core/Settings/PredefinedSettings.cs
rename to src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
index c5de56bf5..93a49c129 100644
--- a/src/dev/def/DevTools.Core/Settings/PredefinedSettings.cs
+++ b/src/dev/impl/DevToys/Core/Settings/PredefinedSettings.cs
@@ -1,6 +1,9 @@
-using DevTools.Core.Theme;
+#nullable enable
-namespace DevTools.Core.Settings
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Core.Theme;
+
+namespace DevToys.Core.Settings
{
public static class PredefinedSettings
{
diff --git a/src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs b/src/dev/impl/DevToys/Core/Settings/SettingsProvider.cs
similarity index 97%
rename from src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs
rename to src/dev/impl/DevToys/Core/Settings/SettingsProvider.cs
index e39f326e4..d3410666b 100644
--- a/src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs
+++ b/src/dev/impl/DevToys/Core/Settings/SettingsProvider.cs
@@ -1,6 +1,6 @@
#nullable enable
-using DevTools.Core.Settings;
+using DevToys.Api.Core.Settings;
using Newtonsoft.Json;
using System;
using System.Collections;
@@ -8,7 +8,7 @@ using System.Composition;
using System.Globalization;
using Windows.Storage;
-namespace DevTools.Core.Impl.Settings
+namespace DevToys.Core.Settings
{
[Export(typeof(ISettingsProvider))]
[Shared]
diff --git a/src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs b/src/dev/impl/DevToys/Core/Theme/ThemeListener.cs
similarity index 91%
rename from src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs
rename to src/dev/impl/DevToys/Core/Theme/ThemeListener.cs
index d8c61444b..55ee10e8e 100644
--- a/src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs
+++ b/src/dev/impl/DevToys/Core/Theme/ThemeListener.cs
@@ -1,14 +1,15 @@
#nullable enable
-using DevTools.Core.Settings;
-using DevTools.Core.Theme;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Core.Theme;
+using DevToys.Core.Settings;
+using DevToys.Core.Threading;
using System;
using System.Composition;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
-namespace DevTools.Core.Impl.Theme
+namespace DevToys.Core.Theme
{
[Export(typeof(IThemeListener))]
[Shared]
@@ -16,7 +17,6 @@ namespace DevTools.Core.Impl.Theme
{
private readonly AccessibilitySettings _accessible = new();
private readonly UISettings _uiSettings = new();
- private readonly IThread _thread;
private readonly ISettingsProvider _settingsProvider;
public AppTheme CurrentSystemTheme { get; private set; }
@@ -28,9 +28,8 @@ namespace DevTools.Core.Impl.Theme
public event EventHandler? ThemeChanged;
[ImportingConstructor]
- public ThemeListener(IThread thread, ISettingsProvider settingsProvider)
+ public ThemeListener(ISettingsProvider settingsProvider)
{
- _thread = thread;
_settingsProvider = settingsProvider;
_settingsProvider.SettingChanged += SettingsProvider_SettingChanged;
@@ -65,13 +64,13 @@ namespace DevTools.Core.Impl.Theme
private void Accessible_HighContrastChanged(AccessibilitySettings sender, object args)
{
- _thread.RunOnUIThreadAsync(UpdateProperties).Forget();
+ ThreadHelper.RunOnUIThreadAsync(UpdateProperties).Forget();
}
private void UiSettings_ColorValuesChanged(UISettings sender, object args)
{
// Note: This can get called multiple times during HighContrast switch, do we care?
- _thread.RunOnUIThreadAsync(
+ ThreadHelper.RunOnUIThreadAsync(
() =>
{
// TODO: This doesn't stop the multiple calls if we're in our faked 'White' HighContrast Mode below.
@@ -105,7 +104,7 @@ namespace DevTools.Core.Impl.Theme
/// </summary>
private void UpdateProperties()
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
// TODO: Not sure if HighContrastScheme names are localized?
if (_accessible.HighContrast && _accessible.HighContrastScheme.IndexOf("white", StringComparison.OrdinalIgnoreCase) != -1)
diff --git a/src/dev/def/DevTools.Core/Threading/DisposableSempahore.cs b/src/dev/impl/DevToys/Core/Threading/DisposableSempahore.cs
similarity index 72%
rename from src/dev/def/DevTools.Core/Threading/DisposableSempahore.cs
rename to src/dev/impl/DevToys/Core/Threading/DisposableSempahore.cs
index 4327ef545..a8f8de7cd 100644
--- a/src/dev/def/DevTools.Core/Threading/DisposableSempahore.cs
+++ b/src/dev/impl/DevToys/Core/Threading/DisposableSempahore.cs
@@ -1,22 +1,24 @@
-using System;
+#nullable enable
+
+using System;
using System.Threading;
using System.Threading.Tasks;
-namespace DevTools.Core.Threading
+namespace DevToys.Core.Threading
{
/// <summary>
/// Represents a semaphore that free other threads when disposing the result of the <see cref="WaitAsync(CancellationToken)"/> method..
/// </summary>
- public sealed class DisposableSempahore : IDisposable
+ internal sealed class DisposableSempahore : IDisposable
{
private readonly object _lockObject = new();
private readonly SemaphoreSlim _semaphore;
- public bool Disposed { get; private set; }
+ internal bool Disposed { get; private set; }
- public bool IsBusy => _semaphore.CurrentCount == 0;
+ internal bool IsBusy => _semaphore.CurrentCount == 0;
- public DisposableSempahore(int maxTasksCount = 1)
+ internal DisposableSempahore(int maxTasksCount = 1)
{
_semaphore = new SemaphoreSlim(maxTasksCount, maxTasksCount);
}
@@ -33,7 +35,7 @@ namespace DevTools.Core.Threading
}
}
- public async Task<IDisposable> WaitAsync(CancellationToken cancellationToken)
+ internal async Task<IDisposable> WaitAsync(CancellationToken cancellationToken)
{
await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
@@ -44,7 +46,7 @@ namespace DevTools.Core.Threading
{
private readonly SemaphoreSlim _semaphore;
- public DummyDisposable(SemaphoreSlim semaphore)
+ internal DummyDisposable(SemaphoreSlim semaphore)
{
_semaphore = semaphore;
}
diff --git a/src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.cs b/src/dev/impl/DevToys/Core/Threading/TaskCompletionNotifier.cs
similarity index 92%
rename from src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.cs
rename to src/dev/impl/DevToys/Core/Threading/TaskCompletionNotifier.cs
index c3c9f476d..0b14b6294 100644
--- a/src/dev/def/DevTools.Core/Threading/TaskCompletionNotifier.cs
+++ b/src/dev/impl/DevToys/Core/Threading/TaskCompletionNotifier.cs
@@ -1,14 +1,16 @@
-using System.ComponentModel;
+#nullable enable
+
+using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
-namespace DevTools.Core.Threading
+namespace DevToys.Core.Threading
{
/// <summary>
/// Watches a task and raises property-changed notifications when the task completes.
/// </summary>
/// <typeparam name="TResult">The type of the result of the task.</typeparam>
- public sealed class TaskCompletionNotifier<TResult> : INotifyPropertyChanged
+ internal sealed class TaskCompletionNotifier<TResult> : INotifyPropertyChanged
{
/// <summary>
/// Gets the task being watched. This property never changes and is never <c>null</c>.
@@ -49,7 +51,7 @@ namespace DevTools.Core.Threading
/// Initialize a new instance of the <see cref="TaskCompletionNotifier{TResult}"/> class.
/// </summary>
/// <param name="task">The <see cref="Task"/> to run.</param>
- public TaskCompletionNotifier(IThread thread, Task<TResult>? task)
+ internal TaskCompletionNotifier(Task<TResult>? task)
{
try
{
@@ -65,7 +67,7 @@ namespace DevTools.Core.Threading
var propertyChanged = PropertyChanged;
if (propertyChanged != null)
{
- await thread.RunOnUIThreadAsync(() =>
+ await ThreadHelper.RunOnUIThreadAsync(() =>
{
propertyChanged.Invoke(this, new PropertyChangedEventArgs(nameof(IsCompleted)));
if (t.IsCanceled)
diff --git a/src/dev/def/DevTools.Core/Threading/TaskExtension.cs b/src/dev/impl/DevToys/Core/Threading/TaskExtension.cs
similarity index 77%
rename from src/dev/def/DevTools.Core/Threading/TaskExtension.cs
rename to src/dev/impl/DevToys/Core/Threading/TaskExtension.cs
index d6ba7b2c4..ca2e6c8f2 100644
--- a/src/dev/def/DevTools.Core/Threading/TaskExtension.cs
+++ b/src/dev/impl/DevToys/Core/Threading/TaskExtension.cs
@@ -1,25 +1,27 @@
-using System;
+#nullable enable
+
+using System;
using System.Diagnostics;
using System.Threading.Tasks;
-namespace DevTools.Core.Threading
+namespace DevToys.Core.Threading
{
/// <summary>
/// Provides a set of helper method to play around with threads.
/// </summary>
- public static class TaskExtension
+ internal static class TaskExtension
{
/// <summary>
/// Runs a task without waiting for its result.
/// </summary>
- public static void Forget(this Task _)
+ internal static void Forget(this Task _)
{
}
/// <summary>
/// Runs a task without waiting for its result.
/// </summary>
- public static void Forget<T>(this Task<T> _)
+ internal static void Forget<T>(this Task<T> _)
{
}
@@ -27,7 +29,7 @@ namespace DevTools.Core.Threading
/// Runs a task without waiting for its result. Swallows or handle any exception caused by the task.
/// </summary>
/// <param name="errorHandler">The action to run when an exception is caught.</param>
- public static async void ForgetSafely(this Task task, Action<Exception>? errorHandler = null)
+ internal static async void ForgetSafely(this Task task, Action<Exception>? errorHandler = null)
{
try
{
@@ -47,7 +49,7 @@ namespace DevTools.Core.Threading
/// </summary>
/// <param name="scheduler">The task scheduler used to execute continuations.</param>
/// <returns>An awaitable.</returns>
- public static TaskSchedulerAwaiter GetAwaiter(this TaskScheduler scheduler)
+ internal static TaskSchedulerAwaiter GetAwaiter(this TaskScheduler scheduler)
{
Arguments.NotNull(scheduler, nameof(scheduler));
return new TaskSchedulerAwaiter(scheduler);
diff --git a/src/dev/def/DevTools.Core/Threading/TaskSchedulerAwaiter.cs b/src/dev/impl/DevToys/Core/Threading/TaskSchedulerAwaiter.cs
similarity index 92%
rename from src/dev/def/DevTools.Core/Threading/TaskSchedulerAwaiter.cs
rename to src/dev/impl/DevToys/Core/Threading/TaskSchedulerAwaiter.cs
index ecd98f085..9ab66027f 100644
--- a/src/dev/def/DevTools.Core/Threading/TaskSchedulerAwaiter.cs
+++ b/src/dev/impl/DevToys/Core/Threading/TaskSchedulerAwaiter.cs
@@ -1,14 +1,16 @@
-using System;
+#nullable enable
+
+using System;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
-namespace DevTools.Core.Threading
+namespace DevToys.Core.Threading
{
/// <summary>
/// An awaiter returned from <see cref="GetAwaiter(TaskScheduler)"/>.
/// </summary>
- public readonly struct TaskSchedulerAwaiter : ICriticalNotifyCompletion
+ internal readonly struct TaskSchedulerAwaiter : ICriticalNotifyCompletion
{
/// <summary>
/// The scheduler for continuations.
@@ -27,7 +29,7 @@ namespace DevTools.Core.Threading
/// <param name="scheduler">The scheduler for continuations.</param>
/// <param name="alwaysYield">A value indicating whether the caller should yield even if
/// already executing on the desired task scheduler.</param>
- public TaskSchedulerAwaiter(TaskScheduler scheduler, bool alwaysYield = false)
+ internal TaskSchedulerAwaiter(TaskScheduler scheduler, bool alwaysYield = false)
{
_scheduler = scheduler;
_alwaysYield = alwaysYield;
@@ -37,7 +39,7 @@ namespace DevTools.Core.Threading
/// Gets a value indicating whether no yield is necessary.
/// </summary>
/// <value><c>true</c> if the caller is already running on that TaskScheduler.</value>
- public bool IsCompleted
+ internal bool IsCompleted
{
get
{
@@ -93,7 +95,7 @@ namespace DevTools.Core.Threading
/// <summary>
/// Does nothing.
/// </summary>
- public void GetResult()
+ internal void GetResult()
{
}
}
diff --git a/src/dev/impl/DevTools.Core.Impl/Threading/Thread.cs b/src/dev/impl/DevToys/Core/Threading/ThreadHelper.cs
similarity index 84%
rename from src/dev/impl/DevTools.Core.Impl/Threading/Thread.cs
rename to src/dev/impl/DevToys/Core/Threading/ThreadHelper.cs
index 065628885..be9ed0305 100644
--- a/src/dev/impl/DevTools.Core.Impl/Threading/Thread.cs
+++ b/src/dev/impl/DevToys/Core/Threading/ThreadHelper.cs
@@ -1,21 +1,17 @@
#nullable enable
-using DevTools.Core.Threading;
using System;
-using System.Composition;
using System.Threading.Tasks;
using Windows.ApplicationModel.Core;
using Windows.UI.Core;
-namespace DevTools.Core.Impl.Threading
+namespace DevToys.Core.Threading
{
- [Export(typeof(IThread))]
- [Shared]
- internal sealed class Thread : IThread
+ internal static class ThreadHelper
{
private readonly static CoreDispatcher _uiDispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
- public void ThrowIfNotOnUIThread()
+ internal static void ThrowIfNotOnUIThread()
{
if (!_uiDispatcher.HasThreadAccess)
{
@@ -23,7 +19,7 @@ namespace DevTools.Core.Impl.Threading
}
}
- public void ThrowIfOnUIThread()
+ internal static void ThrowIfOnUIThread()
{
if (_uiDispatcher.HasThreadAccess)
{
@@ -31,12 +27,12 @@ namespace DevTools.Core.Impl.Threading
}
}
- public Task RunOnUIThreadAsync(Action action)
+ internal static Task RunOnUIThreadAsync(Action action)
{
return RunOnUIThreadAsync(ThreadPriority.Normal, action);
}
- public Task RunOnUIThreadAsync(ThreadPriority priority, Action action)
+ internal static Task RunOnUIThreadAsync(ThreadPriority priority, Action action)
{
if (action is null)
{
@@ -54,12 +50,12 @@ namespace DevTools.Core.Impl.Threading
}
}
- public Task RunOnUIThreadAsync(Func<Task> action)
+ internal static Task RunOnUIThreadAsync(Func<Task> action)
{
return RunOnUIThreadAsync(ThreadPriority.Normal, action);
}
- public async Task RunOnUIThreadAsync(ThreadPriority priority, Func<Task> action)
+ internal static async Task RunOnUIThreadAsync(ThreadPriority priority, Func<Task> action)
{
if (action is null)
{
@@ -98,12 +94,12 @@ namespace DevTools.Core.Impl.Threading
}
}
- public Task<T> RunOnUIThreadAsync<T>(Func<Task<T>> action)
+ internal static Task<T> RunOnUIThreadAsync<T>(Func<Task<T>> action)
{
return RunOnUIThreadAsync(ThreadPriority.Normal, action);
}
- public async Task<T> RunOnUIThreadAsync<T>(ThreadPriority priority, Func<Task<T>> action)
+ internal static async Task<T> RunOnUIThreadAsync<T>(ThreadPriority priority, Func<Task<T>> action)
{
Arguments.NotNull(action, nameof(action));
@@ -140,7 +136,7 @@ namespace DevTools.Core.Impl.Threading
}
}
- private CoreDispatcherPriority GetDispatcherPriority(ThreadPriority priority)
+ private static CoreDispatcherPriority GetDispatcherPriority(ThreadPriority priority)
{
switch (priority)
{
diff --git a/src/dev/impl/DevToys/Core/Threading/ThreadPriority.cs b/src/dev/impl/DevToys/Core/Threading/ThreadPriority.cs
new file mode 100644
index 000000000..fc9258755
--- /dev/null
+++ b/src/dev/impl/DevToys/Core/Threading/ThreadPriority.cs
@@ -0,0 +1,11 @@
+#nullable enable
+
+namespace DevToys.Core.Threading
+{
+ internal enum ThreadPriority
+ {
+ Low,
+ Normal,
+ High
+ }
+}
diff --git a/src/dev/impl/DevTools.Core.Impl/TitleBar.cs b/src/dev/impl/DevToys/Core/TitleBar.cs
similarity index 91%
rename from src/dev/impl/DevTools.Core.Impl/TitleBar.cs
rename to src/dev/impl/DevToys/Core/TitleBar.cs
index dd7791258..efc1d228b 100644
--- a/src/dev/impl/DevTools.Core.Impl/TitleBar.cs
+++ b/src/dev/impl/DevToys/Core/TitleBar.cs
@@ -1,8 +1,11 @@
#nullable enable
-using DevTools.Core.Settings;
-using DevTools.Core.Theme;
-using DevTools.Core.Threading;
+using DevToys.Api.Core;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Core.Theme;
+using DevToys.Core.Settings;
+using DevToys.Core.Theme;
+using DevToys.Core.Threading;
using System.ComponentModel;
using System.Composition;
using System.Threading.Tasks;
@@ -12,13 +15,12 @@ using Windows.UI.Core;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
-namespace DevTools.Core.Impl
+namespace DevToys.Core
{
[Export(typeof(ITitleBar))]
[Shared]
internal sealed class TitleBar : ITitleBar
{
- private readonly IThread _thread;
private readonly ISettingsProvider _settingsProvider;
private readonly IThemeListener _themeListener;
@@ -30,7 +32,7 @@ namespace DevTools.Core.Impl
private set
{
_systemOverlayRightInset = value;
- _thread.RunOnUIThreadAsync(() =>
+ ThreadHelper.RunOnUIThreadAsync(() =>
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SystemOverlayRightInset)));
});
@@ -40,16 +42,15 @@ namespace DevTools.Core.Impl
public event PropertyChangedEventHandler? PropertyChanged;
[ImportingConstructor]
- public TitleBar(IThread thread, ISettingsProvider settingsProvider, IThemeListener themeListener)
+ public TitleBar(ISettingsProvider settingsProvider, IThemeListener themeListener)
{
- _thread = thread;
_settingsProvider = settingsProvider;
_themeListener = themeListener;
}
public Task SetupTitleBarAsync()
{
- return _thread.RunOnUIThreadAsync(() =>
+ return ThreadHelper.RunOnUIThreadAsync(() =>
{
SetupTitleBar(CoreApplication.GetCurrentView().TitleBar);
});
@@ -57,7 +58,7 @@ namespace DevTools.Core.Impl
private void SetupTitleBar(CoreApplicationViewTitleBar coreTitleBar)
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
Arguments.NotNull(coreTitleBar, nameof(coreTitleBar));
Window.Current.SizeChanged += CurrentWindow_SizeChanged;
diff --git a/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs b/src/dev/impl/DevToys/Core/ToolProviderFactory.cs
similarity index 98%
rename from src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs
rename to src/dev/impl/DevToys/Core/ToolProviderFactory.cs
index 54bf784a4..8e8604997 100644
--- a/src/dev/impl/DevTools.Providers.Impl/ToolProviderFactory.cs
+++ b/src/dev/impl/DevToys/Core/ToolProviderFactory.cs
@@ -1,11 +1,12 @@
#nullable enable
+using DevToys.Api.Tools;
using System;
using System.Collections.Generic;
using System.Composition;
using System.Linq;
-namespace DevTools.Providers.Impl
+namespace DevToys.Providers.Impl
{
[Export(typeof(IToolProviderFactory))]
internal sealed class ToolProviderFactory : IToolProviderFactory
diff --git a/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs b/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
similarity index 73%
rename from src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs
rename to src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
index 3a876d56e..2f32716c3 100644
--- a/src/dev/impl/DevTools.Core.Impl/UriActivationProtocolService.cs
+++ b/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
@@ -1,6 +1,7 @@
#nullable enable
-using DevTools.Core.Threading;
+using DevToys.Api.Core;
+using DevToys.Core.Threading;
using System;
using System.Composition;
using System.Globalization;
@@ -8,25 +9,15 @@ using System.Threading.Tasks;
using Windows.ApplicationModel;
using Windows.System;
-namespace DevTools.Core.Impl
+namespace DevToys.Core
{
[Export(typeof(IUriActivationProtocolService))]
[Shared]
internal sealed class UriActivationProtocolService : IUriActivationProtocolService
{
- private readonly ILogger _logger;
- private readonly IThread _thread;
-
- [ImportingConstructor]
- public UriActivationProtocolService(ILogger logger, IThread thread)
- {
- _logger = logger;
- _thread = thread;
- }
-
public async Task<bool> LaunchNewAppInstance(string? arguments = null)
{
- return await _thread.RunOnUIThreadAsync(async () =>
+ return await ThreadHelper.RunOnUIThreadAsync(async () =>
{
string uriToLaunch = Constants.UriActivationProtocolName;
@@ -51,7 +42,7 @@ namespace DevTools.Core.Impl
}
catch (Exception ex)
{
- _logger.LogFault("Launch new app instance", ex, $"Launch URI: {uriToLaunch}");
+ Logger.LogFault("Launch new app instance", ex, $"Launch URI: {uriToLaunch}");
}
return false;
diff --git a/src/dev/impl/DevTools.Common/DevTools.Common.csproj b/src/dev/impl/DevToys/DevToys.csproj
similarity index 51%
rename from src/dev/impl/DevTools.Common/DevTools.Common.csproj
rename to src/dev/impl/DevToys/DevToys.csproj
index 5bc4d82af..9227d9b5f 100644
--- a/src/dev/impl/DevTools.Common/DevTools.Common.csproj
+++ b/src/dev/impl/DevToys/DevToys.csproj
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{935D5DF8-C400-4CA6-AABE-34A06A69AF85}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <ProjectGuid>{E3E4E200-B380-4207-9A7E-4C9421904502}</ProjectGuid>
+ <OutputType>AppContainerExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools.Common</RootNamespace>
- <AssemblyName>DevTools.Common</AssemblyName>
+ <RootNamespace>DevToys</RootNamespace>
+ <AssemblyName>DevToys</AssemblyName>
<DefaultLanguage>en</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
@@ -16,22 +14,86 @@
<MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
+ <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
- <Compile Include="AssetsHelper.cs" />
+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png">
+ <Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png</Link>
+ </Content>
+ <Content Include="Properties\Default.rd.rd.xml" />
+ <Compile Include="Api\Core\IClipboard.cs" />
+ <Compile Include="Api\Core\IMefProvider.cs" />
+ <Compile Include="Api\Core\ITitleBar.cs" />
+ <Compile Include="Api\Core\IUriActivationProtocolService.cs" />
+ <Compile Include="Api\Core\Navigation\IWindowManager.cs" />
+ <Compile Include="Api\Core\Navigation\NavigationParameter.cs" />
+ <Compile Include="Api\Core\Settings\ISettingsProvider.cs" />
+ <Compile Include="Api\Core\Settings\SettingChangedEventArgs.cs" />
+ <Compile Include="Api\Core\Settings\SettingDefinition.cs" />
+ <Compile Include="Api\Core\Theme\AppTheme.cs" />
+ <Compile Include="Api\Core\Theme\IThemeListener.cs" />
+ <Compile Include="Api\Tools\CompactOverlaySizeAttribute.cs" />
+ <Compile Include="Api\Tools\IsFooterItemAttribute.cs" />
+ <Compile Include="Api\Tools\IToolProvider.cs" />
+ <Compile Include="Api\Tools\IToolProviderFactory.cs" />
+ <Compile Include="Api\Tools\IToolViewModel.cs" />
+ <Compile Include="Api\Tools\MatchedToolProvider.cs" />
+ <Compile Include="Api\Tools\MatchSpan.cs" />
+ <Compile Include="Api\Tools\NameAttribute.cs" />
+ <Compile Include="Api\Tools\NotScrollableAttribute.cs" />
+ <Compile Include="Api\Tools\OrderAttribute.cs" />
+ <Compile Include="Api\Tools\ProtocolNameAttribute.cs" />
+ <Compile Include="Api\Tools\ToolProviderMetadata.cs" />
+ <Compile Include="Core\AssetsHelper.cs" />
+ <Compile Include="Core\Arguments.cs" />
+ <Compile Include="Core\Assumes.cs" />
+ <Compile Include="Core\Clipboard.cs" />
+ <Compile Include="Core\Collections\OrderedObservableCollection.cs" />
+ <Compile Include="Core\Constants.cs" />
+ <Compile Include="Core\Logger.cs" />
+ <Compile Include="Core\MefComposer.cs" />
+ <Compile Include="Core\MefProvider.cs" />
+ <Compile Include="Core\Navigation\WindowManager.cs" />
+ <Compile Include="Core\Settings\PredefinedSettings.cs" />
+ <Compile Include="Core\Settings\SettingsProvider.cs" />
+ <Compile Include="Core\Theme\ThemeListener.cs" />
+ <Compile Include="Core\Threading\DisposableSempahore.cs" />
+ <Compile Include="Core\Threading\TaskCompletionNotifier.cs" />
+ <Compile Include="Core\Threading\TaskExtension.cs" />
+ <Compile Include="Core\Threading\TaskSchedulerAwaiter.cs" />
+ <Compile Include="Core\Threading\ThreadHelper.cs" />
+ <Compile Include="Core\Threading\ThreadPriority.cs" />
+ <Compile Include="Core\TitleBar.cs" />
+ <Compile Include="Core\ToolProviderFactory.cs" />
+ <Compile Include="ViewModels\Tools\ToolProviderBase.cs" />
+ <Compile Include="Core\UriActivationProtocolService.cs" />
<Compile Include="LanguageDefinition.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="LanguageManager.cs">
<DependentUpon>LanguageManager.tt</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
+ <Compile Include="Messages\NavigateToToolMessage.cs" />
+ <Compile Include="Models\MatchedToolProviderViewData.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="App.xaml.cs">
+ <DependentUpon>App.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Tools\ToolProviderBase.cs" />
+ <Compile Include="UI\Controls\CustomPathIcon.cs" />
<Compile Include="UI\Controls\CustomTextBox.xaml.cs">
<DependentUpon>CustomTextBox.xaml</DependentUpon>
</Compile>
+ <Compile Include="UI\Controls\ExpandableSettingControl.xaml.cs">
+ <DependentUpon>ExpandableSettingControl.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="UI\Controls\ExpandableSettingHeaderControl.xaml.cs">
+ <DependentUpon>ExpandableSettingHeaderControl.xaml</DependentUpon>
+ </Compile>
<Compile Include="UI\Controls\FormattedTextBlock\CustomDelimiterChunker.cs" />
<Compile Include="UI\Controls\FormattedTextBlock\CustomWordChunker.cs" />
<Compile Include="UI\Controls\FormattedTextBlock\FormattedTextBlock.xaml.cs">
@@ -50,140 +112,181 @@
<Compile Include="UI\Controls\TextEditor\TextEditor.xaml.cs">
<DependentUpon>TextEditor.xaml</DependentUpon>
</Compile>
+ <Compile Include="UI\Controls\TextEditor\TextEditorCore.cs" />
<Compile Include="UI\Controls\TextEditor\TextFormatter.cs" />
- <Compile Include="UI\Converters\BooleanToTextWrappingConverter.cs" />
+ <Compile Include="UI\Converters\BooleanToGridLengthConverter.cs" />
<Compile Include="UI\Converters\BooleanToScrollBarVisibilityConverter.cs" />
<Compile Include="UI\Converters\BooleanToScrollModeConverter.cs" />
- <Compile Include="UI\Converters\BooleanToGridLengthConverter.cs" />
- <Compile Include="UI\Controls\CustomPathIcon.cs" />
- <Compile Include="UI\Controls\ExpandableSettingControl.xaml.cs">
- <DependentUpon>ExpandableSettingControl.xaml</DependentUpon>
- </Compile>
- <Compile Include="UI\Controls\ExpandableSettingHeaderControl.xaml.cs">
- <DependentUpon>ExpandableSettingHeaderControl.xaml</DependentUpon>
- </Compile>
- <Compile Include="UI\Controls\TextEditor\TextEditorCore.cs" />
- <Compile Include="UI\Converters\EnumToBooleanConverter.cs" />
- <Compile Include="UI\Converters\EnumToThicknessConverter.cs" />
+ <Compile Include="UI\Converters\BooleanToTextWrappingConverter.cs" />
<Compile Include="UI\Converters\BooleanToVisibilityConverter.cs" />
<Compile Include="UI\Converters\DoubleToGridLengthConverter.cs" />
+ <Compile Include="UI\Converters\EnumToBooleanConverter.cs" />
+ <Compile Include="UI\Converters\EnumToThicknessConverter.cs" />
<Compile Include="UI\Converters\InvertedBooleanConverter.cs" />
<Compile Include="UI\Converters\NullToBooleanConverter.cs" />
<Compile Include="UI\Extensions\Axis.cs" />
<Compile Include="UI\Extensions\HighlighterExtension.cs" />
<Compile Include="UI\Extensions\IsCompactOverlayModeTrigger.cs" />
<Compile Include="UI\Extensions\ScrollViewerExtensions.cs" />
- <Content Include="Assets\Icons\Idea.svg" />
- <Content Include="LanguageManager.tt">
- <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>LanguageManager.cs</LastGenOutput>
- </Content>
- <PRIResource Include="Strings\en\MainPage.resw" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="ColorCode.UWP" Version="$(Nuget_ColorCodeUwp)" />
- <PackageReference Include="DiffPlex" Version="$(Nuget_DiffPlex)" />
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
- <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />
- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="$(Nuget_MicrosoftToolkitUwpUIControls)" />
- <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />
+ <Compile Include="ViewModels\MainPageViewModel.cs" />
+ <Compile Include="ViewModels\Tools\Settings\SettingsToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\Settings\SettingsToolViewModel.cs" />
+ <Compile Include="ViewModels\Tools\Base64EncoderDecoder\Base64EncoderDecoderToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\Base64EncoderDecoder\Base64EncoderDecoderToolViewModel.cs" />
+ <Compile Include="ViewModels\Tools\HashGenerator\HashGeneratorToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\HashGenerator\HashGeneratorToolViewModel.cs" />
+ <Compile Include="ViewModels\Tools\JsonFormatter\JsonFormatterToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\JsonFormatter\JsonFormatterToolViewModel.cs" />
+ <Compile Include="ViewModels\Tools\RegEx\RegExToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\RegEx\RegExToolViewModel.cs" />
+ <Compile Include="ViewModels\Tools\TextDiff\TextDiffToolProvider.cs" />
+ <Compile Include="ViewModels\Tools\TextDiff\TextDiffToolViewModel.cs" />
+ <Compile Include="Views\MainPage.xaml.cs">
+ <DependentUpon>MainPage.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\Base64EncoderDecoder\Base64EncoderDecoderToolPage.xaml.cs">
+ <DependentUpon>Base64EncoderDecoderToolPage.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\HashGenerator\HashGeneratorToolPage.xaml.cs">
+ <DependentUpon>HashGeneratorToolPage.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\JsonFormatter\JsonFormatterToolPage.xaml.cs">
+ <DependentUpon>JsonFormatterToolPage.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\RegEx\RegExToolPage.xaml.cs">
+ <DependentUpon>RegExToolPage.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\Settings\MarkdownContentDialog.xaml.cs">
+ <DependentUpon>MarkdownContentDialog.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\Settings\SettingsToolPage.xaml.cs">
+ <DependentUpon>SettingsToolPage.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Tools\TextDiff\TextDiffToolPage.xaml.cs">
+ <DependentUpon>TextDiffToolPage.xaml</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
- <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+ <AppxManifest Include="Package.appxmanifest">
+ <SubType>Designer</SubType>
+ </AppxManifest>
</ItemGroup>
<ItemGroup>
+ <Content Include="Assets\Icons\Idea.svg" />
+ <Content Include="Assets\CascadiaCode.ttf" />
+ <Content Include="Assets\CascadiaMono.ttf" />
<Content Include="Assets\FluentSystemIcons-Regular.ttf" />
- </ItemGroup>
- <ItemGroup>
- <Page Include="Themes\Custom.xaml">
+ <None Include="..\..\..\..\LICENSE.md">
+ <Link>Assets\LICENSE.md</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="..\..\..\..\PRIVACY-POLICY.md">
+ <Link>Assets\PRIVACY-POLICY.md</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="..\..\..\..\THIRD-PARTY-NOTICES.md">
+ <Link>Assets\THIRD-PARTY-NOTICES.md</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <Content Include="LanguageManager.tt">
+ <Generator>TextTemplatingFileGenerator</Generator>
+ <LastGenOutput>LanguageManager.cs</LastGenOutput>
+ </Content>
+ <ApplicationDefinition Include="App.xaml">
+ <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
+ </ApplicationDefinition>
+ <Page Include="Themes\Custom.xaml">
<Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\Controls\CustomTextBox.xaml">
- <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="UI\Controls\ExpandableSettingControl.xaml">
- <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="UI\Controls\ExpandableSettingHeaderControl.xaml">
- <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="UI\Controls\FormattedTextBlock\FormattedTextBlock.xaml">
- <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="UI\Controls\TextEditor\TextEditor.xaml">
+ <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\MainPage.xaml">
<Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\Base64EncoderDecoder\Base64EncoderDecoderToolPage.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\HashGenerator\HashGeneratorToolPage.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\JsonFormatter\JsonFormatterToolPage.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\RegEx\RegExToolPage.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\Settings\MarkdownContentDialog.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\Settings\SettingsToolPage.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Tools\TextDiff\TextDiffToolPage.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
- </ItemGroup>
- <ItemGroup>
<PRIResource Include="Strings\en\Base64EncoderDecoder.resw" />
- </ItemGroup>
- <ItemGroup>
- <PRIResource Include="Strings\en\Settings.resw" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">
- <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>
- <Name>DevTools.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">
- <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
- <Name>DevTools.Providers</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <PRIResource Include="Strings\en\JsonFormatter.resw" />
- </ItemGroup>
- <ItemGroup>
<PRIResource Include="Strings\en\Common.resw" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Assets\CascadiaCode.ttf" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Assets\CascadiaMono.ttf" />
- </ItemGroup>
- <ItemGroup>
- <PRIResource Include="Strings\en\TextDiff.resw" />
- </ItemGroup>
- <ItemGroup>
<PRIResource Include="Strings\en\HashGenerator.resw" />
- </ItemGroup>
- <ItemGroup>
+ <PRIResource Include="Strings\en\JsonFormatter.resw" />
+ <PRIResource Include="Strings\en\MainPage.resw" />
<PRIResource Include="Strings\en\RegEx.resw" />
+ <PRIResource Include="Strings\en\Settings.resw" />
+ <PRIResource Include="Strings\en\TextDiff.resw" />
+ <PRIResource Include="Strings\fr\Base64EncoderDecoder.resw" />
+ <PRIResource Include="Strings\fr\Common.resw" />
+ <PRIResource Include="Strings\fr\HashGenerator.resw" />
+ <PRIResource Include="Strings\fr\JsonFormatter.resw" />
+ <PRIResource Include="Strings\fr\MainPage.resw" />
+ <PRIResource Include="Strings\fr\RegEx.resw" />
+ <PRIResource Include="Strings\fr\Settings.resw" />
+ <PRIResource Include="Strings\fr\TextDiff.resw" />
</ItemGroup>
<ItemGroup>
- <PRIResource Include="Strings\fr\MainPage.resw" />
+ <PackageReference Include="ColorCode.Core" Version="$(Nuget_ColorCodeUwp)" />
+ <PackageReference Include="ColorCode.UWP" Version="$(Nuget_ColorCodeUwp)" />
+ <PackageReference Include="DiffPlex" Version="$(Nuget_DiffPlex)" />
+ <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
+ <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />
+ <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Behaviors" Version="$(Nuget_MicrosoftToolkitUwpUIBehaviors)" />
+ <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="$(Nuget_MicrosoftToolkitUwpUIControls)" />
+ <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />
+ <PackageReference Include="Newtonsoft.Json" Version="$(NuGet_NewtonsoftJson)"/>
+ <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />
</ItemGroup>
<ItemGroup>
- <None Include="..\..\..\..\LICENSE.md">
- <Link>Assets\LICENSE.md</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\..\PRIVACY-POLICY.md">
- <Link>Assets\PRIVACY-POLICY.md</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\..\THIRD-PARTY-NOTICES.md">
- <Link>Assets\THIRD-PARTY-NOTICES.md</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <PRIResource Include="Strings\fr\TextDiff.resw" />
- <PRIResource Include="Strings\fr\Settings.resw" />
- <PRIResource Include="Strings\fr\RegEx.resw" />
- <PRIResource Include="Strings\fr\JsonFormatter.resw" />
- <PRIResource Include="Strings\fr\HashGenerator.resw" />
- <PRIResource Include="Strings\fr\Common.resw" />
- <PRIResource Include="Strings\fr\Base64EncoderDecoder.resw" />
+ <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/src/dev/impl/DevTools.Common/LanguageDefinition.cs b/src/dev/impl/DevToys/LanguageDefinition.cs
similarity index 89%
rename from src/dev/impl/DevTools.Common/LanguageDefinition.cs
rename to src/dev/impl/DevToys/LanguageDefinition.cs
index 3fc9a6727..13788a30d 100644
--- a/src/dev/impl/DevTools.Common/LanguageDefinition.cs
+++ b/src/dev/impl/DevToys/LanguageDefinition.cs
@@ -1,6 +1,8 @@
-using System.Globalization;
+#nullable enable
-namespace DevTools.Common
+using System.Globalization;
+
+namespace DevToys
{
/// <summary>
/// Represents un language supported by the app.
diff --git a/src/dev/impl/DevTools.Common/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/LanguageManager.cs
rename to src/dev/impl/DevToys/LanguageManager.cs
index e03349171..920744fc6 100644
--- a/src/dev/impl/DevTools.Common/LanguageManager.cs
+++ b/src/dev/impl/DevToys/LanguageManager.cs
@@ -8,6 +8,8 @@
// </auto-generated>
//------------------------------------------------------------------------------
+#nullable enable
+
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System.Collections.Generic;
using System.ComponentModel;
@@ -16,11 +18,11 @@ using Windows.ApplicationModel.Resources;
using Windows.Globalization;
using Windows.UI.Xaml;
-namespace DevTools.Common
+namespace DevToys
{
public partial class LanguageManager : ObservableObject
{
- private static LanguageManager _languageManager;
+ private static LanguageManager? _languageManager;
private readonly Base64EncoderDecoderStrings _base64encoderdecoder = new Base64EncoderDecoderStrings();
private readonly CommonStrings _common = new CommonStrings();
@@ -140,7 +142,7 @@ namespace DevTools.Common
public class Base64EncoderDecoderStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/Base64EncoderDecoder");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("Base64EncoderDecoder");
/// <summary>
/// Gets the resource Ascii.
@@ -205,7 +207,7 @@ namespace DevTools.Common
public class CommonStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/Common");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("Common");
/// <summary>
/// Gets the resource Clear.
@@ -265,7 +267,7 @@ namespace DevTools.Common
public class HashGeneratorStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/HashGenerator");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("HashGenerator");
/// <summary>
/// Gets the resource Configuration.
@@ -310,7 +312,7 @@ namespace DevTools.Common
public class JsonFormatterStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/JsonFormatter");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("JsonFormatter");
/// <summary>
/// Gets the resource Configuration.
@@ -360,7 +362,7 @@ namespace DevTools.Common
public class MainPageStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/MainPage");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("MainPage");
/// <summary>
/// Gets the resource EnterCompactOverlayTooltip.
@@ -395,7 +397,7 @@ namespace DevTools.Common
/// <summary>
/// Gets the resource WindowTitleWithToolName with format.
/// </summary>
- public string GetFormattedWindowTitleWithToolName(string param0)
+ public string GetFormattedWindowTitleWithToolName(string? param0)
{
return string.Format(WindowTitleWithToolName, param0);
}
@@ -403,7 +405,7 @@ namespace DevTools.Common
public class RegExStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/RegEx");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("RegEx");
/// <summary>
/// Gets the resource DisplayName.
@@ -423,7 +425,7 @@ namespace DevTools.Common
public class SettingsStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/Settings");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("Settings");
/// <summary>
/// Gets the resource About.
@@ -568,7 +570,7 @@ namespace DevTools.Common
/// <summary>
/// Gets the resource Version with format.
/// </summary>
- public string GetFormattedVersion(string param0)
+ public string GetFormattedVersion(string? param0)
{
return string.Format(Version, param0);
}
@@ -581,7 +583,7 @@ namespace DevTools.Common
public class TextDiffStrings : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/TextDiff");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("TextDiff");
/// <summary>
/// Gets the resource Difference.
diff --git a/src/dev/impl/DevTools.Common/LanguageManager.tt b/src/dev/impl/DevToys/LanguageManager.tt
similarity index 96%
rename from src/dev/impl/DevTools.Common/LanguageManager.tt
rename to src/dev/impl/DevToys/LanguageManager.tt
index 76a0edf09..4e65fe69c 100644
--- a/src/dev/impl/DevTools.Common/LanguageManager.tt
+++ b/src/dev/impl/DevToys/LanguageManager.tt
@@ -31,6 +31,8 @@
// </auto-generated>
//------------------------------------------------------------------------------
+#nullable enable
+
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System.Collections.Generic;
using System.ComponentModel;
@@ -39,11 +41,11 @@ using Windows.ApplicationModel.Resources;
using Windows.Globalization;
using Windows.UI.Xaml;
-namespace DevTools.Common
+namespace DevToys
{
public partial class LanguageManager : ObservableObject
{
- private static LanguageManager _languageManager;
+ private static LanguageManager? _languageManager;
<#
foreach (var file in Directory.GetFiles(stringsFolder, "*.resw"))
@@ -157,7 +159,7 @@ namespace DevTools.Common
public class <#= $"{fileName}Strings" #> : ObservableObject
{
- private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("DevTools.Common/<#= fileName #>");
+ private readonly ResourceLoader _resources = ResourceLoader.GetForViewIndependentUse("<#= fileName #>");
<#
foreach (DictionaryEntry entry in reader)
{
@@ -178,7 +180,7 @@ namespace DevTools.Common
var argumentsRef = "";
for (var i = 0; i < parametersCount; i++)
{
- argumentsDecl += $"string param{i}, ";
+ argumentsDecl += $"string? param{i}, ";
argumentsRef += $"param{i}, ";
}
diff --git a/src/dev/impl/DevTools.Impl/Messages/NavigateToToolMessage.cs b/src/dev/impl/DevToys/Messages/NavigateToToolMessage.cs
similarity index 81%
rename from src/dev/impl/DevTools.Impl/Messages/NavigateToToolMessage.cs
rename to src/dev/impl/DevToys/Messages/NavigateToToolMessage.cs
index 93046b350..519f75808 100644
--- a/src/dev/impl/DevTools.Impl/Messages/NavigateToToolMessage.cs
+++ b/src/dev/impl/DevToys/Messages/NavigateToToolMessage.cs
@@ -1,7 +1,9 @@
-using DevTools.Core;
-using DevTools.Providers;
+#nullable enable
-namespace DevTools.Impl.Messages
+using DevToys.Api.Tools;
+using DevToys.Core;
+
+namespace DevToys.Messages
{
public sealed class NavigateToToolMessage
{
diff --git a/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs b/src/dev/impl/DevToys/Models/MatchedToolProviderViewData.cs
similarity index 78%
rename from src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs
rename to src/dev/impl/DevToys/Models/MatchedToolProviderViewData.cs
index c9e966535..ecf2ff171 100644
--- a/src/dev/impl/DevTools.Impl/Models/MatchedToolProviderViewData.cs
+++ b/src/dev/impl/DevToys/Models/MatchedToolProviderViewData.cs
@@ -1,15 +1,14 @@
-using DevTools.Core;
-using DevTools.Core.Threading;
-using DevTools.Providers;
+#nullable enable
+
+using DevToys.Api.Tools;
+using DevToys.Core.Threading;
using System.Threading.Tasks;
using Windows.UI.Xaml.Controls;
-namespace DevTools.Impl.Models
+namespace DevToys.Models
{
public sealed class MatchedToolProviderViewData : MatchedToolProvider
{
- private readonly IThread _thread;
-
internal TaskCompletionNotifier<IconElement> Icon => (TaskCompletionNotifier<IconElement>)ToolProvider.IconSource;
/// <summary>
@@ -18,13 +17,11 @@ namespace DevTools.Impl.Models
public bool IsRecommended { get; private set; }
public MatchedToolProviderViewData(
- IThread thread,
ToolProviderMetadata metadata,
IToolProvider toolProvider,
MatchSpan[] matchedSpans)
: base(metadata, toolProvider, matchedSpans)
{
- _thread = Arguments.NotNull(thread, nameof(thread));
}
internal async Task UpdateIsRecommendedAsync(string clipboardContent)
@@ -33,7 +30,7 @@ namespace DevTools.Impl.Models
IsRecommended = ToolProvider.CanBeTreatedByTool(clipboardContent);
- _thread.RunOnUIThreadAsync(() =>
+ ThreadHelper.RunOnUIThreadAsync(() =>
{
RaisePropertyChanged(nameof(IsRecommended));
}).Forget();
diff --git a/src/dev/startup/DevTools/Package.appxmanifest b/src/dev/impl/DevToys/Package.appxmanifest
similarity index 97%
rename from src/dev/startup/DevTools/Package.appxmanifest
rename to src/dev/impl/DevToys/Package.appxmanifest
index e9ff9d2dd..d476d2d50 100644
--- a/src/dev/startup/DevTools/Package.appxmanifest
+++ b/src/dev/impl/DevToys/Package.appxmanifest
@@ -30,7 +30,7 @@
<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
- EntryPoint="DevTools.App">
+ EntryPoint="DevToys.App">
<uap:VisualElements
DisplayName="DevToys"
Square150x150Logo="Assets\Logo\Square150x150Logo.png"
diff --git a/src/dev/startup/DevTools/Properties/AssemblyInfo.cs b/src/dev/impl/DevToys/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/dev/startup/DevTools/Properties/AssemblyInfo.cs
rename to src/dev/impl/DevToys/Properties/AssemblyInfo.cs
diff --git a/src/dev/startup/DevTools/Properties/Default.rd.rd.xml b/src/dev/impl/DevToys/Properties/Default.rd.rd.xml
similarity index 94%
rename from src/dev/startup/DevTools/Properties/Default.rd.rd.xml
rename to src/dev/impl/DevToys/Properties/Default.rd.rd.xml
index f76b1ee5d..a4c980736 100644
--- a/src/dev/startup/DevTools/Properties/Default.rd.rd.xml
+++ b/src/dev/impl/DevToys/Properties/Default.rd.rd.xml
@@ -22,7 +22,7 @@
the application package. The asterisks are not wildcards.
-->
<Namespace Name="Microsoft.Toolkit.Mvvm" Dynamic="Required All" />
- <Namespace Name="DevTools" Dynamic="Required All" />
+ <Namespace Name="DevToys" Dynamic="Required All" />
<!-- Add your application specific runtime directives here. -->
</Application>
diff --git a/src/dev/impl/DevTools.Common/Strings/en/Base64EncoderDecoder.resw b/src/dev/impl/DevToys/Strings/en/Base64EncoderDecoder.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/Base64EncoderDecoder.resw
rename to src/dev/impl/DevToys/Strings/en/Base64EncoderDecoder.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/Common.resw b/src/dev/impl/DevToys/Strings/en/Common.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/Common.resw
rename to src/dev/impl/DevToys/Strings/en/Common.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/HashGenerator.resw b/src/dev/impl/DevToys/Strings/en/HashGenerator.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/HashGenerator.resw
rename to src/dev/impl/DevToys/Strings/en/HashGenerator.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/JsonFormatter.resw b/src/dev/impl/DevToys/Strings/en/JsonFormatter.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/JsonFormatter.resw
rename to src/dev/impl/DevToys/Strings/en/JsonFormatter.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw b/src/dev/impl/DevToys/Strings/en/MainPage.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
rename to src/dev/impl/DevToys/Strings/en/MainPage.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/RegEx.resw b/src/dev/impl/DevToys/Strings/en/RegEx.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/RegEx.resw
rename to src/dev/impl/DevToys/Strings/en/RegEx.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/Settings.resw b/src/dev/impl/DevToys/Strings/en/Settings.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/Settings.resw
rename to src/dev/impl/DevToys/Strings/en/Settings.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/en/TextDiff.resw b/src/dev/impl/DevToys/Strings/en/TextDiff.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/en/TextDiff.resw
rename to src/dev/impl/DevToys/Strings/en/TextDiff.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/Base64EncoderDecoder.resw b/src/dev/impl/DevToys/Strings/fr/Base64EncoderDecoder.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/Base64EncoderDecoder.resw
rename to src/dev/impl/DevToys/Strings/fr/Base64EncoderDecoder.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/Common.resw b/src/dev/impl/DevToys/Strings/fr/Common.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/Common.resw
rename to src/dev/impl/DevToys/Strings/fr/Common.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/HashGenerator.resw b/src/dev/impl/DevToys/Strings/fr/HashGenerator.resw
similarity index 99%
rename from src/dev/impl/DevTools.Common/Strings/fr/HashGenerator.resw
rename to src/dev/impl/DevToys/Strings/fr/HashGenerator.resw
index c597cbf66..e63942dd5 100644
--- a/src/dev/impl/DevTools.Common/Strings/fr/HashGenerator.resw
+++ b/src/dev/impl/DevToys/Strings/fr/HashGenerator.resw
@@ -139,6 +139,6 @@
<value>SHA512</value>
</data>
<data name="Uppercase" xml:space="preserve">
- <value>Lettres majuscules</value>
+ <value>Majuscules</value>
</data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/JsonFormatter.resw b/src/dev/impl/DevToys/Strings/fr/JsonFormatter.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/JsonFormatter.resw
rename to src/dev/impl/DevToys/Strings/fr/JsonFormatter.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/MainPage.resw b/src/dev/impl/DevToys/Strings/fr/MainPage.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/MainPage.resw
rename to src/dev/impl/DevToys/Strings/fr/MainPage.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/RegEx.resw b/src/dev/impl/DevToys/Strings/fr/RegEx.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/RegEx.resw
rename to src/dev/impl/DevToys/Strings/fr/RegEx.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/Settings.resw b/src/dev/impl/DevToys/Strings/fr/Settings.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/Settings.resw
rename to src/dev/impl/DevToys/Strings/fr/Settings.resw
diff --git a/src/dev/impl/DevTools.Common/Strings/fr/TextDiff.resw b/src/dev/impl/DevToys/Strings/fr/TextDiff.resw
similarity index 100%
rename from src/dev/impl/DevTools.Common/Strings/fr/TextDiff.resw
rename to src/dev/impl/DevToys/Strings/fr/TextDiff.resw
diff --git a/src/dev/impl/DevTools.Common/Themes/Custom.xaml b/src/dev/impl/DevToys/Themes/Custom.xaml
similarity index 99%
rename from src/dev/impl/DevTools.Common/Themes/Custom.xaml
rename to src/dev/impl/DevToys/Themes/Custom.xaml
index ddf4c4053..ab9ef51d6 100644
--- a/src/dev/impl/DevTools.Common/Themes/Custom.xaml
+++ b/src/dev/impl/DevToys/Themes/Custom.xaml
@@ -2,9 +2,9 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <FontFamily x:Key="FluentSystemIcons">ms-appx:///DevTools.Common/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>
- <FontFamily x:Key="CascadiaMono">ms-appx:///DevTools.Common/Assets/CascadiaMono.ttf#Cascadia Mono</FontFamily>
- <FontFamily x:Key="CascadiaCode">ms-appx:///DevTools.Common/Assets/CascadiaCode.ttf#Cascadia Code</FontFamily>
+ <FontFamily x:Key="FluentSystemIcons">ms-appx:///Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>
+ <FontFamily x:Key="CascadiaMono">ms-appx:///Assets/CascadiaMono.ttf#Cascadia Mono</FontFamily>
+ <FontFamily x:Key="CascadiaCode">ms-appx:///Assets/CascadiaCode.ttf#Cascadia Code</FontFamily>
<FontFamily x:Key="SegoeUI">Segoe UI</FontFamily>
<FontFamily x:Key="Consolas">Consolas</FontFamily>
diff --git a/src/dev/impl/DevTools.Common/Themes/Generic.xaml b/src/dev/impl/DevToys/Themes/Generic.xaml
similarity index 98%
rename from src/dev/impl/DevTools.Common/Themes/Generic.xaml
rename to src/dev/impl/DevToys/Themes/Generic.xaml
index 1a2d91b9a..76c19c28d 100644
--- a/src/dev/impl/DevTools.Common/Themes/Generic.xaml
+++ b/src/dev/impl/DevToys/Themes/Generic.xaml
@@ -1,9 +1,9 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:controls="using:DevTools.Common.UI.Controls"
- xmlns:textEditor="using:DevTools.Common.UI.Controls.TextEditor"
- xmlns:common="using:DevTools.Common"
+ xmlns:controls="using:DevToys.UI.Controls"
+ xmlns:textEditor="using:DevToys.UI.Controls.TextEditor"
+ xmlns:DevToys="using:DevToys"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls">
<ResourceDictionary.ThemeDictionaries>
@@ -18,7 +18,7 @@
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
- <common:LanguageManager x:Key="LanguageManager"/>
+ <DevToys:LanguageManager x:Key="LanguageManager"/>
<Style TargetType="controls:CustomPathIcon">
<Setter Property="Stretch" Value="Uniform"/>
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs b/src/dev/impl/DevToys/Tools/ToolProviderBase.cs
similarity index 73%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs
rename to src/dev/impl/DevToys/Tools/ToolProviderBase.cs
index f96864752..0280e8f19 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/ToolProviderBase.cs
+++ b/src/dev/impl/DevToys/Tools/ToolProviderBase.cs
@@ -1,7 +1,7 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Threading;
+using DevToys.Core;
+using DevToys.Core.Threading;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System.Threading.Tasks;
using Windows.UI.Xaml;
@@ -9,26 +9,18 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Markup;
using Windows.UI.Xaml.Media;
-namespace DevTools.Providers.Impl.Tools
+namespace DevToys.Tools
{
internal abstract class ToolProviderBase : ObservableRecipient
{
- protected const string AssetsFolderPath = "ms-appx:///DevTools.Providers.Impl/Assets/";
-
- private readonly IThread _thread;
-
- public ToolProviderBase(IThread thread)
- {
- _thread = Arguments.NotNull(thread, nameof(thread));
- }
+ protected const string AssetsFolderPath = "ms-appx:///DevToys/Assets/";
protected TaskCompletionNotifier<IconElement> CreatePathIconFromPath(string resourceName)
{
Arguments.NotNullOrWhiteSpace(resourceName, nameof(resourceName));
return new TaskCompletionNotifier<IconElement>(
- _thread,
- _thread.RunOnUIThreadAsync(() =>
+ ThreadHelper.RunOnUIThreadAsync(() =>
{
string? pathMarkup = Application.Current.Resources[resourceName] as string;
Assumes.NotNullOrWhiteSpace(pathMarkup, nameof(pathMarkup));
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomPathIcon.cs b/src/dev/impl/DevToys/UI/Controls/CustomPathIcon.cs
similarity index 81%
rename from src/dev/impl/DevTools.Common/UI/Controls/CustomPathIcon.cs
rename to src/dev/impl/DevToys/UI/Controls/CustomPathIcon.cs
index f48d28d3f..4b0b961cc 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/CustomPathIcon.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CustomPathIcon.cs
@@ -2,7 +2,7 @@
using Windows.UI.Xaml.Shapes;
-namespace DevTools.Common.UI.Controls
+namespace DevToys.UI.Controls
{
public sealed class CustomPathIcon : Path
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml
rename to src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
index 4cbc725d6..aae9b58f5 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
@@ -1,18 +1,18 @@
<UserControl
- x:Class="DevTools.Common.UI.Controls.CustomTextBox"
+ x:Class="DevToys.UI.Controls.CustomTextBox"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:DevTools.Common.UI.Controls"
+ xmlns:local="using:DevToys.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:common="using:DevTools.Common"
- xmlns:converters="using:DevTools.Common.UI.Converters"
+ xmlns:DevToys="using:DevToys"
+ xmlns:converters="using:DevToys.UI.Converters"
mc:Ignorable="d"
d:DesignHeight="24"
d:DesignWidth="200"
SizeChanged="UserControl_SizeChanged">
<UserControl.Resources>
- <common:LanguageManager x:Key="LanguageManager"/>
+ <DevToys:LanguageManager x:Key="LanguageManager"/>
<converters:InvertedBooleanConverter x:Key="InvertedBooleanConverter"/>
<converters:BooleanToTextWrappingConverter x:Key="BooleanToTextWrappingConverter" TextWrappingOnTrue="Wrap" TextWrappingOnFalse="NoWrap"/>
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs
rename to src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
index 8d3844938..23fc7c631 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -1,5 +1,6 @@
#nullable enable
+using DevToys.Core;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -11,8 +12,9 @@ using Windows.UI;
using Windows.UI.Text;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
+using Clipboard = Windows.ApplicationModel.DataTransfer.Clipboard;
-namespace DevTools.Common.UI.Controls
+namespace DevToys.UI.Controls
{
public sealed partial class CustomTextBox : UserControl, ICustomTextBox
{
@@ -412,7 +414,7 @@ namespace DevTools.Common.UI.Controls
}
catch (Exception ex)
{
- // TODO: Log this.
+ Logger.LogFault("Failed to paste in custom text box", ex);
}
}
else
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingControl.xaml b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingControl.xaml
similarity index 94%
rename from src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingControl.xaml
rename to src/dev/impl/DevToys/UI/Controls/ExpandableSettingControl.xaml
index 430ad08b2..fe9532cd0 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingControl.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingControl.xaml
@@ -1,12 +1,12 @@
<UserControl
- x:Class="DevTools.Common.UI.Controls.ExpandableSettingControl"
+ x:Class="DevToys.UI.Controls.ExpandableSettingControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:DevTools.Common.UI.Controls"
+ xmlns:local="using:DevToys.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
- xmlns:converters="using:DevTools.Common.UI.Converters"
+ xmlns:converters="using:DevToys.UI.Converters"
mc:Ignorable="d"
HorizontalAlignment="Stretch"
d:DesignHeight="300"
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingControl.xaml.cs b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingControl.xaml.cs
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingControl.xaml.cs
rename to src/dev/impl/DevToys/UI/Controls/ExpandableSettingControl.xaml.cs
index dc6c4afa9..130f92593 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingControl.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingControl.xaml.cs
@@ -4,7 +4,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Markup;
-namespace DevTools.Common.UI.Controls
+namespace DevToys.UI.Controls
{
[ContentProperty(Name = nameof(SettingActionableElement))]
public sealed partial class ExpandableSettingControl : UserControl
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingHeaderControl.xaml b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingHeaderControl.xaml
similarity index 95%
rename from src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingHeaderControl.xaml
rename to src/dev/impl/DevToys/UI/Controls/ExpandableSettingHeaderControl.xaml
index 0519981cf..54ffc3f02 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingHeaderControl.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingHeaderControl.xaml
@@ -1,11 +1,11 @@
<UserControl
- x:Class="DevTools.Common.UI.Controls.ExpandableSettingHeaderControl"
+ x:Class="DevToys.UI.Controls.ExpandableSettingHeaderControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:DevTools.Common.UI.Controls"
+ xmlns:local="using:DevToys.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:converters="using:DevTools.Common.UI.Converters"
+ xmlns:converters="using:DevToys.UI.Converters"
mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400">
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingHeaderControl.xaml.cs b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingHeaderControl.xaml.cs
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingHeaderControl.xaml.cs
rename to src/dev/impl/DevToys/UI/Controls/ExpandableSettingHeaderControl.xaml.cs
index f10d53f34..a29c77988 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/ExpandableSettingHeaderControl.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/ExpandableSettingHeaderControl.xaml.cs
@@ -4,7 +4,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Markup;
-namespace DevTools.Common.UI.Controls
+namespace DevToys.UI.Controls
{
[ContentProperty(Name = nameof(SettingActionableElement))]
public sealed partial class ExpandableSettingHeaderControl : UserControl
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/CustomDelimiterChunker.cs b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/CustomDelimiterChunker.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/CustomDelimiterChunker.cs
rename to src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/CustomDelimiterChunker.cs
index d68a8cc65..07a736c1f 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/CustomDelimiterChunker.cs
+++ b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/CustomDelimiterChunker.cs
@@ -1,8 +1,10 @@
-using DiffPlex;
+#nullable enable
+
+using DiffPlex;
using System;
using System.Collections.Generic;
-namespace DevTools.Common.UI.Controls.FormattedTextBlock
+namespace DevToys.UI.Controls.FormattedTextBlock
{
public class CustomDelimiterChunker : IChunker
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/CustomWordChunker.cs b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/CustomWordChunker.cs
similarity index 92%
rename from src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/CustomWordChunker.cs
rename to src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/CustomWordChunker.cs
index 52a33f8b4..e3209f87c 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/CustomWordChunker.cs
+++ b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/CustomWordChunker.cs
@@ -1,6 +1,6 @@
#nullable enable
-namespace DevTools.Common.UI.Controls.FormattedTextBlock
+namespace DevToys.UI.Controls.FormattedTextBlock
{
internal sealed class CustomWordChunker : CustomDelimiterChunker
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
rename to src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
index 529abeaa9..1e6f273a6 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
@@ -1,8 +1,8 @@
<UserControl
- x:Class="DevTools.Common.UI.Controls.FormattedTextBlock.FormattedTextBlock"
+ x:Class="DevToys.UI.Controls.FormattedTextBlock.FormattedTextBlock"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:DevTools.Common.UI.Controls.FormattedTextBlock"
+ xmlns:local="using:DevToys.UI.Controls.FormattedTextBlock"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs
similarity index 99%
rename from src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs
rename to src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs
index ed6d1b7cf..88b67b410 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs
@@ -1,8 +1,9 @@
#nullable enable
using ColorCode;
-using DevTools.Core;
-using DevTools.Core.Settings;
+using DevToys.Api.Core.Settings;
+using DevToys.Core;
+using DevToys.Core.Settings;
using DiffPlex;
using DiffPlex.Chunkers;
using DiffPlex.DiffBuilder;
@@ -19,8 +20,9 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Documents;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
+using Clipboard = Windows.ApplicationModel.DataTransfer.Clipboard;
-namespace DevTools.Common.UI.Controls.FormattedTextBlock
+namespace DevToys.UI.Controls.FormattedTextBlock
{
public sealed partial class FormattedTextBlock : UserControl, IFormattedTextBlock
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/IFormattedTextBlock.cs b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/IFormattedTextBlock.cs
similarity index 80%
rename from src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/IFormattedTextBlock.cs
rename to src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/IFormattedTextBlock.cs
index 178333942..3ed5b2681 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/IFormattedTextBlock.cs
+++ b/src/dev/impl/DevToys/UI/Controls/FormattedTextBlock/IFormattedTextBlock.cs
@@ -2,7 +2,7 @@
using ColorCode;
-namespace DevTools.Common.UI.Controls.FormattedTextBlock
+namespace DevToys.UI.Controls.FormattedTextBlock
{
public interface IFormattedTextBlock
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/HighlightSpan.cs b/src/dev/impl/DevToys/UI/Controls/HighlightSpan.cs
similarity index 92%
rename from src/dev/impl/DevTools.Common/UI/Controls/HighlightSpan.cs
rename to src/dev/impl/DevToys/UI/Controls/HighlightSpan.cs
index f1f7fe9c5..bf66b778e 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/HighlightSpan.cs
+++ b/src/dev/impl/DevToys/UI/Controls/HighlightSpan.cs
@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+#nullable enable
+
+using System.Collections.Generic;
using Windows.UI;
-namespace DevTools.Common.UI.Controls
+namespace DevToys.UI.Controls
{
public struct HighlightSpan
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/ICustomTextBox.cs b/src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs
similarity index 81%
rename from src/dev/impl/DevTools.Common/UI/Controls/ICustomTextBox.cs
rename to src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs
index 5b4347405..47395e71f 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/ICustomTextBox.cs
+++ b/src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
-namespace DevTools.Common.UI.Controls
+namespace DevToys.UI.Controls
{
public interface ICustomTextBox
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/CommandHandlerResult.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/CommandHandlerResult.cs
similarity index 95%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/CommandHandlerResult.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/CommandHandlerResult.cs
index 6e5954804..e3f32cabb 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/CommandHandlerResult.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/CommandHandlerResult.cs
@@ -1,6 +1,6 @@
#nullable enable
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
public class CommandHandlerResult
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/ICommandHandler.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/ICommandHandler.cs
similarity index 71%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/ICommandHandler.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/ICommandHandler.cs
index ff0aee1b2..d402e72cd 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/ICommandHandler.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/ICommandHandler.cs
@@ -1,6 +1,6 @@
#nullable enable
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
public interface ICommandHandler<in T>
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/IKeyboardCommand.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/IKeyboardCommand.cs
similarity index 87%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/IKeyboardCommand.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/IKeyboardCommand.cs
index 5df9f0917..2f4fa6e8b 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/IKeyboardCommand.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/IKeyboardCommand.cs
@@ -2,7 +2,7 @@
using Windows.System;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
public interface IKeyboardCommand<T>
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/KeyboardCommand.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/KeyboardCommand.cs
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/KeyboardCommand.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/KeyboardCommand.cs
index e541804e8..165975d2e 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/KeyboardCommand.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/KeyboardCommand.cs
@@ -4,7 +4,7 @@ using System;
using System.Collections.Generic;
using Windows.System;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
public class KeyboardCommand<T> : IKeyboardCommand<T>
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/KeyboardCommandHandler.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/KeyboardCommandHandler.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/KeyboardCommandHandler.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/KeyboardCommandHandler.cs
index 28a9a03d4..1477536e9 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/KeyboardCommandHandler.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/KeyboardCommandHandler.cs
@@ -6,7 +6,7 @@ using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Input;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
public class KeyboardCommandHandler : ICommandHandler<KeyRoutedEventArgs>
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/RtfBuilder.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/RtfBuilder.cs
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/RtfBuilder.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/RtfBuilder.cs
index f6fd7c0af..7a07d0460 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/RtfBuilder.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/RtfBuilder.cs
@@ -5,7 +5,7 @@ using System.Text;
using Windows.UI;
using Windows.UI.Xaml;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
internal sealed class RtfBuilder
{
@@ -184,7 +184,7 @@ namespace DevTools.Common.UI.Controls.TextEditor
return string.Format(@"{{\f{1}\fnil\fcharset0 {0}}}", font, nb);
}
- private void AppendIntern(string text, RtfFormat format, Color? color, Color? backgroundColor, bool useColor, string font, bool newLine)
+ private void AppendIntern(string text, RtfFormat format, Color? color, Color? backgroundColor, bool useColor, string? font, bool newLine)
{
//get color nb
int colorNb = 1;
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/RtfFormat.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/RtfFormat.cs
similarity index 79%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/RtfFormat.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/RtfFormat.cs
index 78d615a3b..1bacea332 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/RtfFormat.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/RtfFormat.cs
@@ -2,7 +2,7 @@
using System;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
[Flags]
public enum RtfFormat
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditor.xaml
similarity index 92%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditor.xaml
index b5456432d..d8a59e3ca 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditor.xaml
@@ -1,17 +1,17 @@
<UserControl
- x:Class="DevTools.Common.UI.Controls.TextEditor.TextEditor"
+ x:Class="DevToys.UI.Controls.TextEditor.TextEditor"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:common="using:DevTools.Common"
- xmlns:local="using:DevTools.Common.UI.Controls.TextEditor"
+ xmlns:DevToys="using:DevToys"
+ xmlns:local="using:DevToys.UI.Controls.TextEditor"
mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400"
SizeChanged="UserControl_SizeChanged">
<UserControl.Resources>
- <common:LanguageManager x:Key="LanguageManager"/>
+ <DevToys:LanguageManager x:Key="LanguageManager"/>
</UserControl.Resources>
<Grid>
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditor.xaml.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditor.xaml.cs
index 7d8b82f42..4c5b540ba 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditor.xaml.cs
@@ -1,13 +1,13 @@
#nullable enable
-using DevTools.Core.Settings;
+using DevToys.Api.Core.Settings;
using System;
using Windows.Storage;
using Windows.Storage.Pickers;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
public sealed partial class TextEditor : UserControl
{
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditorCore.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditorCore.cs
similarity index 99%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditorCore.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditorCore.cs
index 60c45787e..75420ffff 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditorCore.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextEditorCore.cs
@@ -1,9 +1,9 @@
#nullable enable
-using DevTools.Common.UI.Extensions;
-using DevTools.Core;
-using DevTools.Core.Settings;
-using DevTools.Core.Threading;
+using DevToys.UI.Extensions;
+using DevToys.Core;
+using DevToys.Core.Settings;
+using DevToys.Core.Threading;
using DiffPlex.DiffBuilder;
using Microsoft.Toolkit.Mvvm.Input;
using Microsoft.Toolkit.Uwp.Helpers;
@@ -20,8 +20,10 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
+using DevToys.Api.Core.Settings;
+using Clipboard = Windows.ApplicationModel.DataTransfer.Clipboard;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
[TemplatePart(Name = ContentElementName, Type = typeof(ScrollViewer))]
[TemplatePart(Name = RootGridName, Type = typeof(Grid))]
@@ -903,7 +905,7 @@ namespace DevTools.Common.UI.Controls.TextEditor
}
catch (Exception ex)
{
- // TODO: Log this.
+ Logger.LogFault("Failed to paste in text editor core", ex);
}
}
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextFormatter.cs b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextFormatter.cs
similarity index 98%
rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextFormatter.cs
rename to src/dev/impl/DevToys/UI/Controls/TextEditor/TextFormatter.cs
index df3131e4a..81c69c915 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextFormatter.cs
+++ b/src/dev/impl/DevToys/UI/Controls/TextEditor/TextFormatter.cs
@@ -4,8 +4,7 @@ using ColorCode;
using ColorCode.Common;
using ColorCode.Parsing;
using ColorCode.Styling;
-using DevTools.Common.UI.Extensions;
-using DevTools.Core.Threading;
+using DevToys.Core.Threading;
using Microsoft.Toolkit.Uwp.Helpers;
using System;
using System.Collections.Generic;
@@ -16,7 +15,7 @@ using Windows.ApplicationModel.Core;
using Windows.UI.Text;
using Windows.UI.Xaml;
-namespace DevTools.Common.UI.Controls.TextEditor
+namespace DevToys.UI.Controls.TextEditor
{
/// <summary>
/// Creates a <see cref="TextFormatter"/>, for rendering Syntax Highlighted code to a RichTextBox.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToGridLengthConverter.cs b/src/dev/impl/DevToys/UI/Converters/BooleanToGridLengthConverter.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Converters/BooleanToGridLengthConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/BooleanToGridLengthConverter.cs
index d36c0c3cf..e473a97f3 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToGridLengthConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/BooleanToGridLengthConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="bool"/> to a <see cref="GridLength"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToScrollBarVisibilityConverter.cs b/src/dev/impl/DevToys/UI/Converters/BooleanToScrollBarVisibilityConverter.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Converters/BooleanToScrollBarVisibilityConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/BooleanToScrollBarVisibilityConverter.cs
index 2025f00a2..0cf67c191 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToScrollBarVisibilityConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/BooleanToScrollBarVisibilityConverter.cs
@@ -5,7 +5,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="bool"/> to a <see cref="ScrollBarVisibility"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToScrollModeConverter.cs b/src/dev/impl/DevToys/UI/Converters/BooleanToScrollModeConverter.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Converters/BooleanToScrollModeConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/BooleanToScrollModeConverter.cs
index 66be77ebc..feb05b413 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToScrollModeConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/BooleanToScrollModeConverter.cs
@@ -5,7 +5,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="bool"/> to a <see cref="ScrollMode"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToTextWrappingConverter.cs b/src/dev/impl/DevToys/UI/Converters/BooleanToTextWrappingConverter.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Converters/BooleanToTextWrappingConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/BooleanToTextWrappingConverter.cs
index 5a901bb70..43199161d 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToTextWrappingConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/BooleanToTextWrappingConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="bool"/> to a <see cref="TextWrapping"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToVisibilityConverter.cs b/src/dev/impl/DevToys/UI/Converters/BooleanToVisibilityConverter.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Converters/BooleanToVisibilityConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/BooleanToVisibilityConverter.cs
index f085da0d5..c832f1b7f 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/BooleanToVisibilityConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/BooleanToVisibilityConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="bool"/> to a <see cref="Visibility"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/DoubleToGridLengthConverter.cs b/src/dev/impl/DevToys/UI/Converters/DoubleToGridLengthConverter.cs
similarity index 94%
rename from src/dev/impl/DevTools.Common/UI/Converters/DoubleToGridLengthConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/DoubleToGridLengthConverter.cs
index 247ac6372..e52e4cdf2 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/DoubleToGridLengthConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/DoubleToGridLengthConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Converts a <see cref="double"/> value to a <see cref="GridLength"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/EnumToBooleanConverter.cs b/src/dev/impl/DevToys/UI/Converters/EnumToBooleanConverter.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Converters/EnumToBooleanConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/EnumToBooleanConverter.cs
index 2d136a46e..254438603 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/EnumToBooleanConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/EnumToBooleanConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="Enum"/> to a <see cref="bool"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/EnumToThicknessConverter.cs b/src/dev/impl/DevToys/UI/Converters/EnumToThicknessConverter.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Converters/EnumToThicknessConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/EnumToThicknessConverter.cs
index 7f411575f..410570097 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/EnumToThicknessConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/EnumToThicknessConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="Enum"/> to a <see cref="Thickness"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/InvertedBooleanConverter.cs b/src/dev/impl/DevToys/UI/Converters/InvertedBooleanConverter.cs
similarity index 95%
rename from src/dev/impl/DevTools.Common/UI/Converters/InvertedBooleanConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/InvertedBooleanConverter.cs
index fa43766ed..e8946f5b7 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/InvertedBooleanConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/InvertedBooleanConverter.cs
@@ -4,7 +4,7 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Convert a <see cref="bool"/> to a inverted <see cref="bool"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Converters/NullToBooleanConverter.cs b/src/dev/impl/DevToys/UI/Converters/NullToBooleanConverter.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Converters/NullToBooleanConverter.cs
rename to src/dev/impl/DevToys/UI/Converters/NullToBooleanConverter.cs
index 040ba5ea6..cfa1f8be3 100644
--- a/src/dev/impl/DevTools.Common/UI/Converters/NullToBooleanConverter.cs
+++ b/src/dev/impl/DevToys/UI/Converters/NullToBooleanConverter.cs
@@ -3,7 +3,7 @@
using System;
using Windows.UI.Xaml.Data;
-namespace DevTools.Common.UI.Converters
+namespace DevToys.UI.Converters
{
/// <summary>
/// Converts a null value to a <see cref="bool"/> value.
diff --git a/src/dev/impl/DevTools.Common/UI/Extensions/Axis.cs b/src/dev/impl/DevToys/UI/Extensions/Axis.cs
similarity index 88%
rename from src/dev/impl/DevTools.Common/UI/Extensions/Axis.cs
rename to src/dev/impl/DevToys/UI/Extensions/Axis.cs
index 0cef2ab7a..f2a724356 100644
--- a/src/dev/impl/DevTools.Common/UI/Extensions/Axis.cs
+++ b/src/dev/impl/DevToys/UI/Extensions/Axis.cs
@@ -1,6 +1,6 @@
#nullable enable
-namespace DevTools.Common.UI.Extensions
+namespace DevToys.UI.Extensions
{
/// <summary>
/// Indicates an axis in the 2D space
diff --git a/src/dev/impl/DevTools.Common/UI/Extensions/HighlighterExtension.cs b/src/dev/impl/DevToys/UI/Extensions/HighlighterExtension.cs
similarity index 97%
rename from src/dev/impl/DevTools.Common/UI/Extensions/HighlighterExtension.cs
rename to src/dev/impl/DevToys/UI/Extensions/HighlighterExtension.cs
index f584be43a..6b55d289a 100644
--- a/src/dev/impl/DevTools.Common/UI/Extensions/HighlighterExtension.cs
+++ b/src/dev/impl/DevToys/UI/Extensions/HighlighterExtension.cs
@@ -1,6 +1,6 @@
#nullable enable
-using DevTools.Providers;
+using DevToys.Api.Tools;
using System;
using System.Collections.Generic;
using Windows.UI;
@@ -11,7 +11,7 @@ using Windows.UI.Xaml.Documents;
using Windows.UI.Xaml.Markup;
using Windows.UI.Xaml.Media;
-namespace DevTools.Common.UI.Extensions
+namespace DevToys.UI.Extensions
{
[MarkupExtensionReturnType(ReturnType = typeof(IList<TextHighlighter>))]
[Bindable]
diff --git a/src/dev/impl/DevTools.Common/UI/Extensions/IsCompactOverlayModeTrigger.cs b/src/dev/impl/DevToys/UI/Extensions/IsCompactOverlayModeTrigger.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Extensions/IsCompactOverlayModeTrigger.cs
rename to src/dev/impl/DevToys/UI/Extensions/IsCompactOverlayModeTrigger.cs
index 28cecea01..795aafacd 100644
--- a/src/dev/impl/DevTools.Common/UI/Extensions/IsCompactOverlayModeTrigger.cs
+++ b/src/dev/impl/DevToys/UI/Extensions/IsCompactOverlayModeTrigger.cs
@@ -3,7 +3,7 @@
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
-namespace DevTools.Common.UI.Extensions
+namespace DevToys.UI.Extensions
{
public sealed class IsCompactOverlayModeTrigger : StateTriggerBase
{
diff --git a/src/dev/impl/DevTools.Common/UI/Extensions/ScrollViewerExtensions.cs b/src/dev/impl/DevToys/UI/Extensions/ScrollViewerExtensions.cs
similarity index 96%
rename from src/dev/impl/DevTools.Common/UI/Extensions/ScrollViewerExtensions.cs
rename to src/dev/impl/DevToys/UI/Extensions/ScrollViewerExtensions.cs
index b321f56dd..31e5866fc 100644
--- a/src/dev/impl/DevTools.Common/UI/Extensions/ScrollViewerExtensions.cs
+++ b/src/dev/impl/DevToys/UI/Extensions/ScrollViewerExtensions.cs
@@ -5,7 +5,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Hosting;
-namespace DevTools.Common.UI.Extensions
+namespace DevToys.UI.Extensions
{
internal static class ScrollViewerExtensions
{
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
similarity index 93%
rename from src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
index 4bac61403..cbd012637 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
@@ -1,14 +1,15 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core;
-using DevTools.Core.Collections;
-using DevTools.Core.Navigation;
-using DevTools.Core.Settings;
-using DevTools.Core.Threading;
-using DevTools.Impl.Messages;
-using DevTools.Impl.Models;
-using DevTools.Providers;
+using DevToys.Api.Core;
+using DevToys.Api.Core.Navigation;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Tools;
+using DevToys.Core;
+using DevToys.Core.Collections;
+using DevToys.Core.Settings;
+using DevToys.Core.Threading;
+using DevToys.Messages;
+using DevToys.Models;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
using Microsoft.Toolkit.Mvvm.Messaging;
@@ -25,15 +26,13 @@ using Windows.Foundation;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
-using ThreadPriority = DevTools.Core.Threading.ThreadPriority;
+using ThreadPriority = DevToys.Core.Threading.ThreadPriority;
-namespace DevTools.Impl.ViewModels
+namespace DevToys.ViewModels
{
[Export(typeof(MainPageViewModel))]
public sealed class MainPageViewModel : ObservableRecipient
{
- private readonly ILogger _logger;
- private readonly IThread _thread;
private readonly IClipboard _clipboard;
private readonly IToolProviderFactory _toolProviderFactory;
private readonly IUriActivationProtocolService _launchProtocolService;
@@ -113,7 +112,7 @@ namespace DevTools.Impl.ViewModels
get => _searchQuery;
set
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
if (_searchQuery != value)
{
_searchQuery = value;
@@ -131,7 +130,7 @@ namespace DevTools.Impl.ViewModels
get => _isInCompactOverlayMode;
private set
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
if (_isInCompactOverlayMode != value)
{
_isInCompactOverlayMode = value;
@@ -150,7 +149,7 @@ namespace DevTools.Impl.ViewModels
get => _navigationViewDisplayMode;
set
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
_navigationViewDisplayMode = value;
OnPropertyChanged();
OnPropertyChanged(nameof(ActualNavigationViewDisplayMode));
@@ -165,7 +164,7 @@ namespace DevTools.Impl.ViewModels
get => _isNavigationViewPaneOpened;
set
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
_isNavigationViewPaneOpened = value;
OnPropertyChanged();
OnPropertyChanged(nameof(ActualNavigationViewDisplayMode));
@@ -199,16 +198,12 @@ namespace DevTools.Impl.ViewModels
[ImportingConstructor]
public MainPageViewModel(
- ILogger logger,
- IThread thread,
IClipboard clipboard,
ITitleBar titleBar,
IToolProviderFactory toolProviderFactory,
IUriActivationProtocolService launchProtocolService,
ISettingsProvider settingsProvider)
{
- _logger = logger;
- _thread = thread;
_clipboard = clipboard;
_toolProviderFactory = toolProviderFactory;
_launchProtocolService = launchProtocolService;
@@ -264,7 +259,7 @@ namespace DevTools.Impl.ViewModels
if (await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(applicationViewMode, compactOptions))
{
- await _thread.RunOnUIThreadAsync(() =>
+ await ThreadHelper.RunOnUIThreadAsync(() =>
{
IsInCompactOverlayMode = applicationViewMode == ApplicationViewMode.CompactOverlay;
});
@@ -306,7 +301,7 @@ namespace DevTools.Impl.ViewModels
}
}
- await _thread.RunOnUIThreadAsync(
+ await ThreadHelper.RunOnUIThreadAsync(
ThreadPriority.Low,
() =>
{
@@ -316,7 +311,7 @@ namespace DevTools.Impl.ViewModels
private void SetSelectedMenuItem(MatchedToolProviderViewData? value, string? clipboardContentData)
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
if (_isUpdatingSelectedItem)
{
return;
@@ -356,7 +351,6 @@ namespace DevTools.Impl.ViewModels
{
item
= new MatchedToolProviderViewData(
- _thread,
matchedToolProvider.Metadata,
matchedToolProvider.ToolProvider,
matchedToolProvider.MatchedSpans);
@@ -383,7 +377,6 @@ namespace DevTools.Impl.ViewModels
{
footerMenuItems.Add(
new MatchedToolProviderViewData(
- _thread,
matchedToolProvider.Metadata,
matchedToolProvider.ToolProvider,
matchedToolProvider.MatchedSpans));
@@ -391,7 +384,7 @@ namespace DevTools.Impl.ViewModels
}
}
- await _thread.RunOnUIThreadAsync(
+ await ThreadHelper.RunOnUIThreadAsync(
ThreadPriority.Low,
() =>
{
@@ -415,7 +408,7 @@ namespace DevTools.Impl.ViewModels
}
catch (Exception ex)
{
- _logger.LogFault("Update main menu after a search", ex, $"Search query: {searchQuery}");
+ Logger.LogFault("Update main menu after a search", ex, $"Search query: {searchQuery}");
}
}
@@ -451,7 +444,7 @@ namespace DevTools.Impl.ViewModels
}
catch (Exception ex)
{
- _logger.LogFault("Check if tool is recommended", ex, $"Tool : {tool.Metadata.Name}");
+ Logger.LogFault("Check if tool is recommended", ex, $"Tool : {tool.Metadata.Name}");
}
}));
}
@@ -473,7 +466,7 @@ namespace DevTools.Impl.ViewModels
// The recommended tool is displayed in the top menu.
// The recommended tool is different that the ones that were recommended before (if any...).
// Let's select automatically this tool.
- await _thread.RunOnUIThreadAsync(
+ await ThreadHelper.RunOnUIThreadAsync(
ThreadPriority.High,
() =>
{
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
index a79a2c491..60f2d3640 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
@@ -1,14 +1,13 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core.Injection;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Tools;
using System;
using System.Composition;
using System.Text;
using System.Text.RegularExpressions;
-namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
+namespace DevToys.ViewModels.Tools.Base64EncoderDecoder
{
[Export(typeof(IToolProvider))]
[Name("Base64 Encoder/Decoder")]
@@ -23,8 +22,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
private readonly IMefProvider _mefProvider;
[ImportingConstructor]
- public Base64EncoderDecoderToolProvider(IThread thread, IMefProvider mefProvider)
- : base(thread)
+ public Base64EncoderDecoderToolProvider(IMefProvider mefProvider)
{
_mefProvider = mefProvider;
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
similarity index 86%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
index ef6ae1f63..92d738d5f 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
@@ -1,8 +1,9 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core;
-using DevTools.Core.Threading;
+using DevToys.Api.Tools;
+using DevToys.Core;
+using DevToys.Core.Threading;
+using DevToys.Views.Tools.Base64EncoderDecoder;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System;
using System.Collections.Generic;
@@ -10,7 +11,7 @@ using System.Composition;
using System.Text;
using System.Threading.Tasks;
-namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
+namespace DevToys.ViewModels.Tools.Base64EncoderDecoder
{
[Export(typeof(Base64EncoderDecoderToolViewModel))]
public class Base64EncoderDecoderToolViewModel : ObservableRecipient, IToolViewModel
@@ -25,8 +26,6 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
private string _conversionMode = DefaultConversion;
private bool _conversionInProgress;
private bool _setPropertyInProgress;
- private readonly ILogger _logger;
- private readonly IThread _thread;
private readonly Queue<string> _conversionQueue = new();
public Type View { get; } = typeof(Base64EncoderDecoderToolPage);
@@ -41,7 +40,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
get => _inputValue;
set
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
SetProperty(ref _inputValue, value);
QueueConversionCalculation();
}
@@ -67,7 +66,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
if (!_setPropertyInProgress)
{
_setPropertyInProgress = true;
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
SetProperty(ref _conversionMode, value);
InputValue = OutputValue;
_setPropertyInProgress = false;
@@ -83,19 +82,12 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
get => _encodingMode;
set
{
- _thread.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
SetProperty(ref _encodingMode, value);
QueueConversionCalculation();
}
}
- [ImportingConstructor]
- public Base64EncoderDecoderToolViewModel(ILogger logger, IThread thread)
- {
- _logger = logger;
- _thread = thread;
- }
-
private void QueueConversionCalculation()
{
_conversionQueue.Enqueue(InputValue ?? string.Empty);
@@ -125,7 +117,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
conversionResult = await DecodeBase64DataAsync(text).ConfigureAwait(false);
}
- _thread.RunOnUIThreadAsync(ThreadPriority.Low, () =>
+ ThreadHelper.RunOnUIThreadAsync(ThreadPriority.Low, () =>
{
OutputValue = conversionResult;
}).ForgetSafely();
@@ -153,7 +145,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
}
catch (Exception ex)
{
- _logger.LogFault("Base 64 - Encoder", ex, $"Encoding mode: {EncodingMode}");
+ Logger.LogFault("Base 64 - Encoder", ex, $"Encoding mode: {EncodingMode}");
return ex.Message;
}
@@ -182,7 +174,7 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
}
catch (Exception ex)
{
- _logger.LogFault("Base 64 - Decoder", ex, $"Encoding mode: {EncodingMode}");
+ Logger.LogFault("Base 64 - Decoder", ex, $"Encoding mode: {EncodingMode}");
return ex.Message;
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/HashGenerator/HashGeneratorToolProvider.cs
similarity index 74%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/HashGenerator/HashGeneratorToolProvider.cs
index 61b37873a..6ef0f2055 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/HashGenerator/HashGeneratorToolProvider.cs
@@ -1,13 +1,13 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core.Injection;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Tools;
+using DevToys.Core.Threading;
using System.Composition;
using System.Threading.Tasks;
using Windows.UI.Xaml.Controls;
-namespace DevTools.Providers.Impl.Tools.HashGenerator
+namespace DevToys.ViewModels.Tools.HashGenerator
{
[Export(typeof(IToolProvider))]
[Name("Hash Generator")]
@@ -16,15 +16,13 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
[CompactOverlaySize(width: 400, height: 500)]
internal sealed class HashGeneratorToolProvider : ToolProviderBase, IToolProvider
{
- private readonly IThread _thread;
private readonly IMefProvider _mefProvider;
public string? DisplayName => LanguageManager.Instance.HashGenerator.DisplayName;
public object IconSource
=> new TaskCompletionNotifier<IconElement>(
- _thread,
- _thread.RunOnUIThreadAsync(() =>
+ ThreadHelper.RunOnUIThreadAsync(() =>
{
return Task.FromResult<IconElement>(
new FontIcon
@@ -34,10 +32,8 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
}));
[ImportingConstructor]
- public HashGeneratorToolProvider(IThread thread, IMefProvider mefProvider)
- : base(thread)
+ public HashGeneratorToolProvider(IMefProvider mefProvider)
{
- _thread = thread;
_mefProvider = mefProvider;
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/HashGenerator/HashGeneratorToolViewModel.cs
similarity index 88%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/HashGenerator/HashGeneratorToolViewModel.cs
index d640c1709..7a17679cb 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/HashGenerator/HashGeneratorToolViewModel.cs
@@ -1,8 +1,9 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core;
-using DevTools.Core.Threading;
+using DevToys.Api.Tools;
+using DevToys.Core;
+using DevToys.Core.Threading;
+using DevToys.Views.Tools.HashGenerator;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System;
using System.Collections.Generic;
@@ -12,13 +13,11 @@ using Windows.Security.Cryptography;
using Windows.Security.Cryptography.Core;
using Windows.Storage.Streams;
-namespace DevTools.Providers.Impl.Tools.HashGenerator
+namespace DevToys.ViewModels.Tools.HashGenerator
{
[Export(typeof(HashGeneratorToolViewModel))]
public sealed class HashGeneratorToolViewModel : ObservableRecipient, IToolViewModel
{
- private readonly ILogger _logger;
- private readonly IThread _thread;
private readonly Queue<string> _hashCalculationQueue = new();
private bool _calculationInProgress;
@@ -77,13 +76,6 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
private set => SetProperty(ref _sha512, value);
}
- [ImportingConstructor]
- public HashGeneratorToolViewModel(ILogger logger, IThread thread)
- {
- _logger = logger;
- _thread = thread;
- }
-
private void QueueHashCalculation()
{
_hashCalculationQueue.Enqueue(Input ?? string.Empty);
@@ -110,7 +102,7 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
await Task.WhenAll(md5CalculationTask).ConfigureAwait(false);
- _thread.RunOnUIThreadAsync(() =>
+ ThreadHelper.RunOnUIThreadAsync(() =>
{
MD5 = md5CalculationTask.Result;
SHA1 = sha1CalculationTask.Result;
@@ -151,7 +143,7 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
}
catch (Exception ex)
{
- _logger.LogFault("Hash Generator", ex, $"Alrogithm name: {alrogithmName}");
+ Logger.LogFault("Hash Generator", ex, $"Alrogithm name: {alrogithmName}");
return ex.Message;
}
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/JsonFormatter/JsonFormatterToolProvider.cs
similarity index 81%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/JsonFormatter/JsonFormatterToolProvider.cs
index 4272b5e37..c5f4573c5 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/JsonFormatter/JsonFormatterToolProvider.cs
@@ -1,15 +1,14 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core;
-using DevTools.Core.Injection;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Tools;
+using DevToys.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Composition;
-namespace DevTools.Providers.Impl.Tools.JsonFormatter
+namespace DevToys.ViewModels.Tools.JsonFormatter
{
[Export(typeof(IToolProvider))]
[Name("Json Formatter")]
@@ -18,7 +17,6 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
[NotScrollable]
internal sealed class JsonFormatterToolProvider : ToolProviderBase, IToolProvider
{
- private readonly ILogger _logger;
private readonly IMefProvider _mefProvider;
public string DisplayName => LanguageManager.Instance.JsonFormatter.DisplayName;
@@ -26,10 +24,8 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
public object IconSource => CreatePathIconFromPath(nameof(JsonFormatterToolProvider));
[ImportingConstructor]
- public JsonFormatterToolProvider(ILogger logger, IThread thread, IMefProvider mefProvider)
- : base(thread)
+ public JsonFormatterToolProvider(IMefProvider mefProvider)
{
- _logger = logger;
_mefProvider = mefProvider;
}
@@ -67,7 +63,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
}
catch (Exception ex) //some other exception
{
- _logger.LogFault("Check is string if JSON", ex);
+ Logger.LogFault("Check is string if JSON", ex);
return false;
}
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
similarity index 89%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
index 90911ebf1..103ba6c91 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/JsonFormatter/JsonFormatterToolViewModel.cs
@@ -1,11 +1,12 @@
#nullable enable
using ColorCode;
-using DevTools.Common;
-using DevTools.Common.UI.Controls.FormattedTextBlock;
-using DevTools.Core;
-using DevTools.Core.Settings;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Tools;
+using DevToys.Core;
+using DevToys.Core.Threading;
+using DevToys.UI.Controls.FormattedTextBlock;
+using DevToys.Views.Tools.JsonFormatter;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -16,7 +17,7 @@ using System.IO;
using System.Text;
using System.Threading.Tasks;
-namespace DevTools.Providers.Impl.Tools.JsonFormatter
+namespace DevToys.ViewModels.Tools.JsonFormatter
{
[Export(typeof(JsonFormatterToolViewModel))]
public sealed class JsonFormatterToolViewModel : ObservableRecipient, IToolViewModel
@@ -26,8 +27,6 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
private const string OneTabIndentation = "OneTab";
private const string NoIndentation = "Minified";
- private readonly ILogger _logger;
- private readonly IThread _thread;
private readonly Queue<string> _formattingQueue = new();
private bool _formattingInProgress;
@@ -69,10 +68,8 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
internal IFormattedTextBlock? OutputTextBlock { private get; set; }
[ImportingConstructor]
- public JsonFormatterToolViewModel(ILogger logger, IThread thread, ISettingsProvider settingsProvider)
+ public JsonFormatterToolViewModel(ISettingsProvider settingsProvider)
{
- _logger = logger;
- _thread = thread;
SettingsProvider = settingsProvider;
}
@@ -99,7 +96,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
{
var success = FormatJson(text, out string result);
- _thread.RunOnUIThreadAsync(ThreadPriority.Low, () =>
+ ThreadHelper.RunOnUIThreadAsync(ThreadPriority.Low, () =>
{
if (success)
{
@@ -177,7 +174,7 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
}
catch (Exception ex) //some other exception
{
- _logger.LogFault("Json formatter", ex, $"Indentation: {Indentation}");
+ Logger.LogFault("Json formatter", ex, $"Indentation: {Indentation}");
output = ex.Message;
return false;
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/RegEx/RegExToolProvider.cs
similarity index 72%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolProvider.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/RegEx/RegExToolProvider.cs
index 9c9cc112d..c390f5f48 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/RegEx/RegExToolProvider.cs
@@ -1,11 +1,10 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core.Injection;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Tools;
using System.Composition;
-namespace DevTools.Providers.Impl.Tools.RegEx
+namespace DevToys.ViewModels.Tools.RegEx
{
[Export(typeof(IToolProvider))]
[Name("Regular Expression Tester")]
@@ -14,7 +13,6 @@ namespace DevTools.Providers.Impl.Tools.RegEx
[NotScrollable]
internal sealed class RegExToolProvider : ToolProviderBase, IToolProvider
{
- private readonly IThread _thread;
private readonly IMefProvider _mefProvider;
public string? DisplayName => LanguageManager.Instance.RegEx.DisplayName;
@@ -22,10 +20,8 @@ namespace DevTools.Providers.Impl.Tools.RegEx
public object IconSource => CreatePathIconFromPath(nameof(RegExToolProvider));
[ImportingConstructor]
- public RegExToolProvider(IThread thread, IMefProvider mefProvider)
- : base(thread)
+ public RegExToolProvider(IMefProvider mefProvider)
{
- _thread = thread;
_mefProvider = mefProvider;
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/RegEx/RegExToolViewModel.cs
similarity index 89%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/RegEx/RegExToolViewModel.cs
index a31d1a6b4..aadbcff84 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/RegEx/RegExToolViewModel.cs
@@ -1,8 +1,9 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Common.UI.Controls;
-using DevTools.Core.Threading;
+using DevToys.Api.Tools;
+using DevToys.Core.Threading;
+using DevToys.UI.Controls;
+using DevToys.Views.Tools.RegEx;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System;
using System.Collections.Generic;
@@ -11,12 +12,11 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Windows.UI;
-namespace DevTools.Providers.Impl.Tools.RegEx
+namespace DevToys.ViewModels.Tools.RegEx
{
[Export(typeof(RegExToolViewModel))]
public sealed class RegExToolViewModel : ObservableRecipient, IToolViewModel
{
- private readonly IThread _thread;
private readonly Queue<(string pattern, string text)> _regExMatchingQueue = new();
private bool _calculationInProgress;
@@ -49,12 +49,6 @@ namespace DevTools.Providers.Impl.Tools.RegEx
internal ICustomTextBox? MatchTextBox { private get; set; }
- [ImportingConstructor]
- public RegExToolViewModel(IThread thread)
- {
- _thread = thread;
- }
-
private void QueueRegExMatch()
{
_regExMatchingQueue.Enqueue(new(RegularExpression ?? string.Empty, Text ?? string.Empty));
@@ -100,7 +94,7 @@ namespace DevTools.Providers.Impl.Tools.RegEx
// TODO: indicate the user that the regex is wrong.
}
- _thread.RunOnUIThreadAsync(
+ ThreadHelper.RunOnUIThreadAsync(
ThreadPriority.Low,
() =>
{
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs
similarity index 81%
rename from src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolProvider.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs
index ece081f2d..dbcafd463 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolProvider.cs
@@ -1,9 +1,8 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core.Injection;
-using DevTools.Core.Threading;
-using DevTools.Providers;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Tools;
+using DevToys.Core.Threading;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.AnimatedVisuals;
@@ -13,7 +12,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
-namespace DevTools.Impl.ViewModels.Settings
+namespace DevToys.ViewModels.Settings
{
[Export(typeof(IToolProvider))]
[Name("Settings")]
@@ -22,7 +21,6 @@ namespace DevTools.Impl.ViewModels.Settings
[IsFooterItem]
internal sealed class SettingsToolProvider : ObservableRecipient, IToolProvider
{
- private readonly IThread _thread;
private readonly IMefProvider _mefProvider;
public string DisplayName => LanguageManager.Instance.Settings.DisplayName;
@@ -30,15 +28,13 @@ namespace DevTools.Impl.ViewModels.Settings
public object IconSource { get; }
[ImportingConstructor]
- public SettingsToolProvider(IThread thread, IMefProvider mefProvider)
+ public SettingsToolProvider(IMefProvider mefProvider)
{
- _thread = thread;
_mefProvider = mefProvider;
IconSource
= new TaskCompletionNotifier<IconElement>(
- _thread,
- _thread.RunOnUIThreadAsync(() =>
+ ThreadHelper.RunOnUIThreadAsync(() =>
{
return Task.FromResult<IconElement>(
new AnimatedIcon
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
similarity index 90%
rename from src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
index 174ed9bb7..cac2828ef 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/Settings/SettingsToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core;
-using DevTools.Core.Settings;
-using DevTools.Core.Theme;
-using DevTools.Core.Threading;
-using DevTools.Impl.Views.Settings;
-using DevTools.Providers;
+using DevToys.Api.Core.Navigation;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Core.Theme;
+using DevToys.Api.Tools;
+using DevToys.Core;
+using DevToys.Core.Settings;
+using DevToys.Core.Threading;
+using DevToys.Views.Tools.Settings;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
using System;
@@ -16,13 +17,11 @@ using System.Reflection;
using System.Threading.Tasks;
using Windows.Services.Store;
-namespace DevTools.Impl.ViewModels.Settings
+namespace DevToys.ViewModels.Settings
{
[Export(typeof(SettingsToolViewModel))]
public sealed class SettingsToolViewModel : ObservableRecipient, IToolViewModel
{
- private readonly ILogger _logger;
- private readonly IThread _thread;
private readonly IWindowManager _windowManager;
private readonly ISettingsProvider _settingsProvider;
@@ -81,13 +80,9 @@ namespace DevTools.Impl.ViewModels.Settings
[ImportingConstructor]
public SettingsToolViewModel(
- ILogger logger,
- IThread thread,
IWindowManager windowManager,
ISettingsProvider settingsProvider)
{
- _logger = logger;
- _thread = thread;
_windowManager = windowManager;
_settingsProvider = settingsProvider;
@@ -151,7 +146,7 @@ namespace DevTools.Impl.ViewModels.Settings
{
StoreContext storeContext = StoreContext.GetDefault();
- StoreRateAndReviewResult result = await _thread.RunOnUIThreadAsync(async () =>
+ StoreRateAndReviewResult result = await ThreadHelper.RunOnUIThreadAsync(async () =>
{
return await storeContext.RequestRateAndReviewAppAsync();
}).ConfigureAwait(false);
@@ -165,7 +160,7 @@ namespace DevTools.Impl.ViewModels.Settings
private async Task ExecuteOpenLogsCommandAsync()
{
- await _logger.OpenLogsAsync();
+ await Logger.OpenLogsAsync();
}
#endregion
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/TextDiff/TextDiffToolProvider.cs
similarity index 76%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/TextDiff/TextDiffToolProvider.cs
index 81979e4d4..e8b05ad8d 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/TextDiff/TextDiffToolProvider.cs
@@ -1,11 +1,10 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Core.Injection;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Tools;
using System.Composition;
-namespace DevTools.Providers.Impl.Tools.TextDiff
+namespace DevToys.ViewModels.Tools.TextDiff
{
[Export(typeof(IToolProvider))]
[Name("Text Diff")]
@@ -20,8 +19,7 @@ namespace DevTools.Providers.Impl.Tools.TextDiff
public object IconSource => CreatePathIconFromPath(nameof(TextDiffToolProvider));
[ImportingConstructor]
- public TextDiffToolProvider(IThread thread, IMefProvider mefProvider)
- : base(thread)
+ public TextDiffToolProvider(IMefProvider mefProvider)
{
_mefProvider = mefProvider;
}
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/TextDiff/TextDiffToolViewModel.cs
similarity index 88%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolViewModel.cs
rename to src/dev/impl/DevToys/ViewModels/Tools/TextDiff/TextDiffToolViewModel.cs
index 4eeea6761..a9f5a5d10 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/TextDiff/TextDiffToolViewModel.cs
@@ -1,23 +1,23 @@
#nullable enable
-using DevTools.Common;
-using DevTools.Common.UI.Controls.FormattedTextBlock;
-using DevTools.Core;
-using DevTools.Core.Settings;
-using DevTools.Core.Threading;
+using DevToys.Api.Core.Settings;
+using DevToys.Api.Tools;
+using DevToys.Core;
+using DevToys.Core.Threading;
+using DevToys.UI.Controls.FormattedTextBlock;
+using DevToys.Views.Tools.TextDiff;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using System;
using System.Collections.Generic;
using System.Composition;
using System.Threading.Tasks;
-namespace DevTools.Providers.Impl.Tools.TextDiff
+namespace DevToys.ViewModels.Tools.TextDiff
{
[Export(typeof(TextDiffToolViewModel))]
public sealed class TextDiffToolViewModel : ObservableRecipient, IToolViewModel
{
private readonly Queue<(string? oldText, string? newText)> _comparisonQueue = new();
- private readonly IThread _thread;
private bool _comparisonInProgress;
private string? _oldText;
@@ -54,10 +54,9 @@ namespace DevTools.Providers.Impl.Tools.TextDiff
internal IFormattedTextBlock? OutputTextBlock { private get; set; }
[ImportingConstructor]
- public TextDiffToolViewModel(ISettingsProvider settingsProvider, IThread thread)
+ public TextDiffToolViewModel(ISettingsProvider settingsProvider)
{
SettingsProvider = settingsProvider;
- _thread = thread;
}
private void QueueComparison()
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs
new file mode 100644
index 000000000..237494163
--- /dev/null
+++ b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs
@@ -0,0 +1,34 @@
+#nullable enable
+
+using DevToys.Core;
+using DevToys.Core.Threading;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System.Threading.Tasks;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+using Windows.UI.Xaml.Media;
+
+namespace DevToys.ViewModels.Tools
+{
+ internal abstract class ToolProviderBase : ObservableRecipient
+ {
+ protected const string AssetsFolderPath = "ms-appx:///DevToys/Assets/";
+
+ protected TaskCompletionNotifier<IconElement> CreatePathIconFromPath(string resourceName)
+ {
+ Arguments.NotNullOrWhiteSpace(resourceName, nameof(resourceName));
+
+ return new TaskCompletionNotifier<IconElement>(
+ ThreadHelper.RunOnUIThreadAsync(() =>
+ {
+ string? pathMarkup = Application.Current.Resources[resourceName] as string;
+ Assumes.NotNullOrWhiteSpace(pathMarkup, nameof(pathMarkup));
+ return Task.FromResult<IconElement>(new PathIcon
+ {
+ Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), pathMarkup)
+ });
+ }));
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevToys/Views/MainPage.xaml
similarity index 96%
rename from src/dev/impl/DevTools.Impl/Views/MainPage.xaml
rename to src/dev/impl/DevToys/Views/MainPage.xaml
index 846b4cf66..665da7a37 100644
--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
+++ b/src/dev/impl/DevToys/Views/MainPage.xaml
@@ -1,14 +1,14 @@
<Page
- x:Class="DevTools.Impl.Views.MainPage"
+ x:Class="DevToys.Views.MainPage"
x:Name="Page"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:DevTools.Common.UI.Controls"
- xmlns:converters="using:DevTools.Common.UI.Converters"
- xmlns:ex="using:DevTools.Common.UI.Extensions"
- xmlns:models="using:DevTools.Impl.Models"
+ xmlns:controls="using:DevToys.UI.Controls"
+ xmlns:converters="using:DevToys.UI.Converters"
+ xmlns:ex="using:DevToys.UI.Extensions"
+ xmlns:models="using:DevToys.Models"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
xmlns:i="using:Microsoft.Xaml.Interactivity"
@@ -59,7 +59,7 @@
<Image
HorizontalAlignment="Left"
VerticalAlignment="Center"
- Source="/DevTools.Impl/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png"
+ Source="/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png"
Width="16"
Height="16"
Visibility="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
@@ -213,7 +213,7 @@
x:Name="NavigationViewItemRecommendedIcon"
x:Load="{x:Bind IsRecommended, Mode=OneWay}"
Grid.Column="1"
- Source="ms-appx:///DevTools.Common/Assets/Icons/Idea.svg"
+ Source="ms-appx:///DevToys/Assets/Icons/Idea.svg"
Height="16"
Width="16"/>
</Grid>
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs b/src/dev/impl/DevToys/Views/MainPage.xaml.cs
similarity index 87%
rename from src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
rename to src/dev/impl/DevToys/Views/MainPage.xaml.cs
index ef74fbebb..e52844256 100644
--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/MainPage.xaml.cs
@@ -1,23 +1,22 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Injection;
-using DevTools.Core.Navigation;
-using DevTools.Core.Threading;
-using DevTools.Impl.Messages;
-using DevTools.Impl.ViewModels;
+using DevToys.Api.Core.Injection;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.Core.Threading;
+using DevToys.Messages;
+using DevToys.ViewModels;
using Microsoft.Toolkit.Mvvm.Messaging;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media.Animation;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Impl.Views
+namespace DevToys.Views
{
public sealed partial class MainPage : Page, IRecipient<NavigateToToolMessage>
{
private IMefProvider? _mefProvider;
- private IThread? _thread;
private NavigationParameter? _parameters;
public static readonly DependencyProperty ViewModelProperty =
@@ -63,7 +62,6 @@ namespace DevTools.Impl.Views
_parameters = (NavigationParameter)e.Parameter;
_mefProvider = _parameters.ExportProvider;
- _thread = _mefProvider.Import<IThread>();
// Set the view model
ViewModel = _mefProvider!.Import<MainPageViewModel>();
@@ -81,9 +79,8 @@ namespace DevTools.Impl.Views
{
Arguments.NotNull(message, nameof(message));
Assumes.NotNull(_mefProvider, nameof(_mefProvider));
- Assumes.NotNull(_thread, nameof(_thread));
- _thread!.ThrowIfNotOnUIThread();
+ ThreadHelper.ThrowIfNotOnUIThread();
contentFrame.Navigate(
message.ViewModel.View,
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
similarity index 94%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
rename to src/dev/impl/DevToys/Views/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
index 7ce5ad7f3..10ee4b718 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
@@ -1,11 +1,11 @@
<Page
- x:Class="DevTools.Providers.Impl.Tools.Base64EncoderDecoder.Base64EncoderDecoderToolPage"
+ x:Class="DevToys.Views.Tools.Base64EncoderDecoder.Base64EncoderDecoderToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:DevTools.Common.UI.Controls"
- xmlns:ex="using:DevTools.Common.UI.Extensions"
+ xmlns:controls="using:DevToys.UI.Controls"
+ xmlns:ex="using:DevToys.UI.Extensions"
mc:Ignorable="d"
NavigationCacheMode="Disabled">
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
index 39be7da5d..3db6728ec 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Navigation;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.ViewModels.Tools.Base64EncoderDecoder;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
+namespace DevToys.Views.Tools.Base64EncoderDecoder
{
public sealed partial class Base64EncoderDecoderToolPage : Page
{
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/HashGenerator/HashGeneratorToolPage.xaml
similarity index 94%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml
rename to src/dev/impl/DevToys/Views/Tools/HashGenerator/HashGeneratorToolPage.xaml
index 651e9d2a2..e9cae4efa 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/HashGenerator/HashGeneratorToolPage.xaml
@@ -1,10 +1,10 @@
<Page
- x:Class="DevTools.Providers.Impl.Tools.HashGenerator.HashGeneratorToolPage"
+ x:Class="DevToys.Views.Tools.HashGenerator.HashGeneratorToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:DevTools.Common.UI.Controls"
+ xmlns:controls="using:DevToys.UI.Controls"
mc:Ignorable="d"
NavigationCacheMode="Required">
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
similarity index 90%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
index 7e60e2e2d..c658fd682 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Navigation;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.ViewModels.Tools.HashGenerator;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Providers.Impl.Tools.HashGenerator
+namespace DevToys.Views.Tools.HashGenerator
{
public sealed partial class HashGeneratorToolPage : Page
{
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/JsonFormatter/JsonFormatterToolPage.xaml
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml
rename to src/dev/impl/DevToys/Views/Tools/JsonFormatter/JsonFormatterToolPage.xaml
index 92ed6c4d7..13d404543 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/JsonFormatter/JsonFormatterToolPage.xaml
@@ -1,12 +1,12 @@
<Page
- x:Class="DevTools.Providers.Impl.Tools.JsonFormatter.JsonFormatterToolPage"
+ x:Class="DevToys.Views.Tools.JsonFormatter.JsonFormatterToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:DevTools.Common.UI.Controls"
- xmlns:formattedtextblock="using:DevTools.Common.UI.Controls.FormattedTextBlock"
- xmlns:texteditor="using:DevTools.Common.UI.Controls.TextEditor"
+ xmlns:controls="using:DevToys.UI.Controls"
+ xmlns:formattedtextblock="using:DevToys.UI.Controls.FormattedTextBlock"
+ xmlns:texteditor="using:DevToys.UI.Controls.TextEditor"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
mc:Ignorable="d"
NavigationCacheMode="Required">
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
index b6d1ebf66..92737db02 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Navigation;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.ViewModels.Tools.JsonFormatter;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Providers.Impl.Tools.JsonFormatter
+namespace DevToys.Views.Tools.JsonFormatter
{
public sealed partial class JsonFormatterToolPage : Page
{
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/RegEx/RegExToolPage.xaml
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml
rename to src/dev/impl/DevToys/Views/Tools/RegEx/RegExToolPage.xaml
index 8d5365934..741f0dbba 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/RegEx/RegExToolPage.xaml
@@ -1,10 +1,10 @@
<Page
- x:Class="DevTools.Providers.Impl.Tools.RegEx.RegExToolPage"
+ x:Class="DevToys.Views.Tools.RegEx.RegExToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:DevTools.Common.UI.Controls"
+ xmlns:controls="using:DevToys.UI.Controls"
mc:Ignorable="d"
NavigationCacheMode="Required">
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/RegEx/RegExToolPage.xaml.cs
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/RegEx/RegExToolPage.xaml.cs
index 55bc35fb0..cd1c87249 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/RegEx/RegExToolPage.xaml.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Navigation;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.ViewModels.Tools.RegEx;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Providers.Impl.Tools.RegEx
+namespace DevToys.Views.Tools.RegEx
{
public sealed partial class RegExToolPage : Page
{
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/MarkdownContentDialog.xaml b/src/dev/impl/DevToys/Views/Tools/Settings/MarkdownContentDialog.xaml
similarity index 89%
rename from src/dev/impl/DevTools.Impl/Views/Settings/MarkdownContentDialog.xaml
rename to src/dev/impl/DevToys/Views/Tools/Settings/MarkdownContentDialog.xaml
index 6f8b4201b..665cef7a6 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/MarkdownContentDialog.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Settings/MarkdownContentDialog.xaml
@@ -1,8 +1,8 @@
<UserControl
- x:Class="DevTools.Impl.Views.Settings.MarkdownContentDialog"
+ x:Class="DevToys.Views.Tools.Settings.MarkdownContentDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:DevTools.Impl.Views.Settings"
+ xmlns:local="using:DevToys.Views.Settings"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/MarkdownContentDialog.xaml.cs b/src/dev/impl/DevToys/Views/Tools/Settings/MarkdownContentDialog.xaml.cs
similarity index 91%
rename from src/dev/impl/DevTools.Impl/Views/Settings/MarkdownContentDialog.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/Settings/MarkdownContentDialog.xaml.cs
index 31f5af34e..49a8b8271 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/MarkdownContentDialog.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/Settings/MarkdownContentDialog.xaml.cs
@@ -1,10 +1,9 @@
#nullable enable
-using DevTools.Common;
using System;
using Windows.UI.Xaml.Controls;
-namespace DevTools.Impl.Views.Settings
+namespace DevToys.Views.Tools.Settings
{
public sealed partial class MarkdownContentDialog : UserControl
{
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
similarity index 96%
rename from src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml
rename to src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
index 6ffa44728..04a6c35fc 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml
@@ -1,11 +1,11 @@
<Page
- x:Class="DevTools.Impl.Views.Settings.SettingsToolPage"
+ x:Class="DevToys.Views.Tools.Settings.SettingsToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:DevTools.Common.UI.Controls"
- xmlns:converters="using:DevTools.Common.UI.Converters"
+ xmlns:controls="using:DevToys.UI.Controls"
+ xmlns:converters="using:DevToys.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d"
NavigationCacheMode="Required">
@@ -112,7 +112,7 @@
Title="{x:Bind ViewModel.Strings.AppTitle}"
Description="{x:Bind ViewModel.Version}">
<controls:ExpandableSettingControl.Icon>
- <muxc:ImageIcon Source="/DevTools.Impl/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png" Height="16" />
+ <muxc:ImageIcon Source="/Assets/Logo/Square44x44Logo.altform-lightunplated_targetsize-16.png" Height="16" />
</controls:ExpandableSettingControl.Icon>
</controls:ExpandableSettingControl>
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml.cs
similarity index 90%
rename from src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml.cs
index 8c4bc3992..db106a4a1 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/Settings/SettingsToolPage.xaml.cs
@@ -1,13 +1,13 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Navigation;
-using DevTools.Impl.ViewModels.Settings;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.ViewModels.Settings;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Impl.Views.Settings
+namespace DevToys.Views.Tools.Settings
{
public sealed partial class SettingsToolPage : Page
{
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/TextDiff/TextDiffToolPage.xaml
similarity index 94%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml
rename to src/dev/impl/DevToys/Views/Tools/TextDiff/TextDiffToolPage.xaml
index 58b66f4d2..e8e2d9766 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/TextDiff/TextDiffToolPage.xaml
@@ -1,12 +1,12 @@
<Page
- x:Class="DevTools.Providers.Impl.Tools.TextDiff.TextDiffToolPage"
+ x:Class="DevToys.Views.Tools.TextDiff.TextDiffToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:formattedtextblock="using:DevTools.Common.UI.Controls.FormattedTextBlock"
- xmlns:texteditor="using:DevTools.Common.UI.Controls.TextEditor"
- xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:ex="using:DevTools.Common.UI.Extensions"
+ xmlns:formattedtextblock="using:DevToys.UI.Controls.FormattedTextBlock"
+ xmlns:texteditor="using:DevToys.UI.Controls.TextEditor"
+ xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:ex="using:DevToys.UI.Extensions"
mc:Ignorable="d"
NavigationCacheMode="Required">
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/TextDiff/TextDiffToolPage.xaml.cs
similarity index 91%
rename from src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs
rename to src/dev/impl/DevToys/Views/Tools/TextDiff/TextDiffToolPage.xaml.cs
index 8a92969f0..61658c34c 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/TextDiff/TextDiffToolPage.xaml.cs
@@ -1,12 +1,13 @@
#nullable enable
-using DevTools.Core;
-using DevTools.Core.Navigation;
+using DevToys.Api.Core.Navigation;
+using DevToys.Core;
+using DevToys.ViewModels.Tools.TextDiff;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Providers.Impl.Tools.TextDiff
+namespace DevToys.Views.Tools.TextDiff
{
public sealed partial class TextDiffToolPage : Page
{
diff --git a/src/dev/impl/Directory.Build.props b/src/dev/impl/Directory.Build.props
new file mode 100644
index 000000000..3ca33e5a1
--- /dev/null
+++ b/src/dev/impl/Directory.Build.props
@@ -0,0 +1,84 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+ <PropertyGroup>
+ <LangVersion>latest</LangVersion>
+ <Nullable>enable</Nullable>
+
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+
+ <!-- Defines the bin and obj folder paths -->
+ <RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))\</RepoRoot>
+ <BaseOutputPath>$(RepoRoot)bin\</BaseOutputPath>
+ <BaseIntermediateOutputPath>$(RepoRoot)obj\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+ <OutputPath>$(BaseOutputPath)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
+ <PackagesConfigRestorePath>$(RepoRoot)packages\</PackagesConfigRestorePath>
+
+ <!-- Enable generation of .tt files -->
+ <TransformOnBuild>true</TransformOnBuild>
+ <OverwriteReadOnlyOutputFiles>true</OverwriteReadOnlyOutputFiles>
+ <TransformOutOfDateOnly>false</TransformOutOfDateOnly>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
+ <VisualStudioVersion>16.0</VisualStudioVersion>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+ <!-- In Debug mode, don't generate .tt files at each build. -->
+ <TransformOutOfDateOnly>true</TransformOutOfDateOnly>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+ <DebugSymbols>true</DebugSymbols>
+ <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+ <DebugType>full</DebugType>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'x86'">
+ <PlatformTarget>x86</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'x64'">
+ <PlatformTarget>x64</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'ARM'">
+ <PlatformTarget>ARM</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
+ <PlatformTarget>ARM64</PlatformTarget>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM' or '$(Configuration)|$(Platform)' == 'Release|ARM64'">
+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ARM</DefineConstants>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <Nuget_ColorCodeUwp>2.0.6</Nuget_ColorCodeUwp>
+ <Nuget_DiffPlex>1.7.0</Nuget_DiffPlex>
+ <NuGet_MicrosoftNETCoreUniversalWindowsPlatform>6.2.12</NuGet_MicrosoftNETCoreUniversalWindowsPlatform>
+ <NuGet_MicrosoftToolkitMvvm>7.0.2</NuGet_MicrosoftToolkitMvvm>
+ <Nuget_MicrosoftToolkitUwpUIBehaviors>7.0.2</Nuget_MicrosoftToolkitUwpUIBehaviors>
+ <Nuget_MicrosoftToolkitUwpUIControls>7.0.2</Nuget_MicrosoftToolkitUwpUIControls>
+ <NuGet_MicrosoftUIXaml>2.6.2</NuGet_MicrosoftUIXaml>
+ <NuGet_MicrosoftWindowsSDKBuildTools>10.0.19041.8</NuGet_MicrosoftWindowsSDKBuildTools>
+ <NuGet_MSTestTestAdapter>2.1.1</NuGet_MSTestTestAdapter>
+ <NuGet_MSTestTestFramework>2.1.1</NuGet_MSTestTestFramework>
+ <NuGet_NewtonsoftJson>12.0.3</NuGet_NewtonsoftJson>
+ <NuGet_SystemComposition>5.0.0</NuGet_SystemComposition>
+ <NuGet_SystemRuntimeCompilerServicesUnsafe>5.0.0</NuGet_SystemRuntimeCompilerServicesUnsafe>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Directory.Build.targets b/src/dev/impl/Directory.Build.targets
similarity index 80%
rename from src/Directory.Build.targets
rename to src/dev/impl/Directory.Build.targets
index fbb34b296..d6cb86e75 100644
--- a/src/Directory.Build.targets
+++ b/src/dev/impl/Directory.Build.targets
@@ -1,8 +1,4 @@
<Project>
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="$(NuGet_NewtonsoftJson)"/>
- </ItemGroup>
-
<!-- Update Assembly Version info on build -->
<PropertyGroup>
<SetVersionPath>$(RepoRoot)tools\SetVersionTask.dll</SetVersionPath>
@@ -17,5 +13,5 @@
</Target>
<Target Name="BeforeBuild" DependsOnTargets="UpdateVersionNumber"/>
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\TextTemplating\Microsoft.TextTemplating.targets" />
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TextTemplating\Microsoft.TextTemplating.targets" />
</Project>
\ No newline at end of file
diff --git a/src/dev/shared/SharedAssemblyInfo.cs b/src/dev/shared/SharedAssemblyInfo.cs
index 75b1539d6..a6aa849c4 100644
--- a/src/dev/shared/SharedAssemblyInfo.cs
+++ b/src/dev/shared/SharedAssemblyInfo.cs
@@ -34,7 +34,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyVersion("2021.09.26.0")]
+[assembly: AssemblyFileVersion("2021.09.26.0")]
[assembly: InternalsVisibleTo("DevTools.Tests")]
diff --git a/src/dev/startup/DevTools/DevTools.csproj b/src/dev/startup/DevTools/DevTools.csproj
deleted file mode 100644
index 7b1707e3b..000000000
--- a/src/dev/startup/DevTools/DevTools.csproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <ProjectGuid>{E3E4E200-B380-4207-9A7E-4C9421904502}</ProjectGuid>
- <OutputType>AppContainerExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools</RootNamespace>
- <AssemblyName>DevTools</AssemblyName>
- <DefaultLanguage>en</DefaultLanguage>
- <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
- <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>
- <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
- <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="App.xaml.cs">
- <DependentUpon>App.xaml</DependentUpon>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <AppxManifest Include="Package.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- </ItemGroup>
- <ItemGroup>
- <Content Include="..\DevTools.Startup\Assets\Logo\SplashScreen.scale-200.png">
- <Link>Assets\Logo\SplashScreen.scale-200.png</Link>
- </Content>
- <Content Include="..\DevTools.Startup\Assets\Logo\Square150x150Logo.scale-200.png">
- <Link>Assets\Logo\Square150x150Logo.scale-200.png</Link>
- </Content>
- <Content Include="..\DevTools.Startup\Assets\Logo\Square44x44Logo.scale-200.png">
- <Link>Assets\Logo\Square44x44Logo.scale-200.png</Link>
- </Content>
- <Content Include="..\DevTools.Startup\Assets\Logo\Wide310x150Logo.scale-200.png">
- <Link>Assets\Logo\Wide310x150Logo.scale-200.png</Link>
- </Content>
- <Content Include="Properties\Default.rd.rd.xml" />
- </ItemGroup>
- <ItemGroup>
- <ApplicationDefinition Include="App.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </ApplicationDefinition>
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />
- <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">
- <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>
- <Name>DevTools.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">
- <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
- <Name>DevTools.Providers</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\impl\DevTools.Core.Impl\DevTools.Core.Impl.csproj">
- <Project>{98274c08-4636-45ee-95af-2c069bfbabd4}</Project>
- <Name>DevTools.Core.Impl</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\impl\DevTools.Impl\DevTools.Impl.csproj">
- <Project>{e2f0c303-04fc-4504-a272-7662af9a0a80}</Project>
- <Name>DevTools.Impl</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\impl\DevTools.Common\DevTools.Common.csproj">
- <Project>{935D5DF8-C400-4CA6-AABE-34A06A69AF85}</Project>
- <Name>DevTools.Common</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj">
- <Project>{8621ed11-e9dd-480a-be2b-c1db00919b6f}</Project>
- <Name>DevTools.Providers.Impl</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/src/tests/DevTools.Tests/Assets/LockScreenLogo.scale-200.png b/src/tests/DevToys.Tests/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/LockScreenLogo.scale-200.png
rename to src/tests/DevToys.Tests/Assets/LockScreenLogo.scale-200.png
diff --git a/src/tests/DevTools.Tests/Assets/SplashScreen.scale-200.png b/src/tests/DevToys.Tests/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/SplashScreen.scale-200.png
rename to src/tests/DevToys.Tests/Assets/SplashScreen.scale-200.png
diff --git a/src/tests/DevTools.Tests/Assets/Square150x150Logo.scale-200.png b/src/tests/DevToys.Tests/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/Square150x150Logo.scale-200.png
rename to src/tests/DevToys.Tests/Assets/Square150x150Logo.scale-200.png
diff --git a/src/tests/DevTools.Tests/Assets/Square44x44Logo.scale-200.png b/src/tests/DevToys.Tests/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/Square44x44Logo.scale-200.png
rename to src/tests/DevToys.Tests/Assets/Square44x44Logo.scale-200.png
diff --git a/src/tests/DevTools.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/tests/DevToys.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to src/tests/DevToys.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/tests/DevTools.Tests/Assets/StoreLogo.png b/src/tests/DevToys.Tests/Assets/StoreLogo.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/StoreLogo.png
rename to src/tests/DevToys.Tests/Assets/StoreLogo.png
diff --git a/src/tests/DevTools.Tests/Assets/Wide310x150Logo.scale-200.png b/src/tests/DevToys.Tests/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/tests/DevTools.Tests/Assets/Wide310x150Logo.scale-200.png
rename to src/tests/DevToys.Tests/Assets/Wide310x150Logo.scale-200.png
diff --git a/src/tests/DevTools.Tests/DevTools.Tests.csproj b/src/tests/DevToys.Tests/DevToys.Tests.csproj
similarity index 69%
rename from src/tests/DevTools.Tests/DevTools.Tests.csproj
rename to src/tests/DevToys.Tests/DevToys.Tests.csproj
index f8840d427..1810f7df8 100644
--- a/src/tests/DevTools.Tests/DevTools.Tests.csproj
+++ b/src/tests/DevToys.Tests/DevToys.Tests.csproj
@@ -5,8 +5,8 @@
<ProjectGuid>{E1C4AB49-CFFF-420E-A182-E3028BD0493C}</ProjectGuid>
<OutputType>AppContainerExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevTools.Tests</RootNamespace>
- <AssemblyName>DevTools.Tests</AssemblyName>
+ <RootNamespace>DevToys.Tests</RootNamespace>
+ <AssemblyName>DevToys.Tests</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>
@@ -59,36 +59,6 @@
<PackageReference Include="MSTest.TestAdapter" Version="$(NuGet_MSTestTestAdapter)" />
<PackageReference Include="MSTest.TestFramework" Version="$(NuGet_MSTestTestFramework)" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\dev\def\DevTools.Core\DevTools.Core.csproj">
- <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>
- <Name>DevTools.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\dev\def\DevTools.Providers\DevTools.Providers.csproj">
- <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>
- <Name>DevTools.Providers</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\dev\impl\DevTools.Core.Impl\DevTools.Core.Impl.csproj">
- <Project>{98274c08-4636-45ee-95af-2c069bfbabd4}</Project>
- <Name>DevTools.Core.Impl</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\dev\impl\DevTools.Impl\DevTools.Impl.csproj">
- <Project>{e2f0c303-04fc-4504-a272-7662af9a0a80}</Project>
- <Name>DevTools.Impl</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\dev\impl\DevTools.Common\DevTools.Common.csproj">
- <Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>
- <Name>DevTools.Common</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\dev\impl\DevTools.Providers.Impl\DevTools.Providers.Impl.csproj">
- <Project>{8621ed11-e9dd-480a-be2b-c1db00919b6f}</Project>
- <Name>DevTools.Providers.Impl</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\dev\startup\DevTools\DevTools.csproj">
- <Project>{e3e4e200-b380-4207-9a7e-4c9421904502}</Project>
- <Name>DevTools</Name>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/tests/DevTools.Tests/MefBaseTest.cs b/src/tests/DevToys.Tests/MefBaseTest.cs
similarity index 74%
rename from src/tests/DevTools.Tests/MefBaseTest.cs
rename to src/tests/DevToys.Tests/MefBaseTest.cs
index c6ee0faac..bef9965ec 100644
--- a/src/tests/DevTools.Tests/MefBaseTest.cs
+++ b/src/tests/DevToys.Tests/MefBaseTest.cs
@@ -1,11 +1,9 @@
-using DevTools.Core.Impl.Injection;
-using DevTools.Core.Injection;
-using DevTools.Common;
-using DevTools.Providers;
+using DevToys.Api.Core.Injection;
+using DevToys.Core;
using System;
using System.Globalization;
-namespace DevTools.Tests
+namespace DevToys.Tests
{
public abstract class MefBaseTest : IDisposable
{
@@ -22,10 +20,7 @@ namespace DevTools.Tests
_mefComposer
= new MefComposer(
- typeof(MefComposer).Assembly,
- typeof(IToolProvider).Assembly,
- typeof(DevTools.Providers.Impl.Dummy).Assembly,
- typeof(Impl.Dummy).Assembly);
+ typeof(MefComposer).Assembly);
ExportProvider = _mefComposer.ExportProvider.GetExport<IMefProvider>();
}
diff --git a/src/tests/DevTools.Tests/Package.appxmanifest b/src/tests/DevToys.Tests/Package.appxmanifest
similarity index 89%
rename from src/tests/DevTools.Tests/Package.appxmanifest
rename to src/tests/DevToys.Tests/Package.appxmanifest
index 963e6122e..898537ec2 100644
--- a/src/tests/DevTools.Tests/Package.appxmanifest
+++ b/src/tests/DevToys.Tests/Package.appxmanifest
@@ -12,7 +12,7 @@
<mp:PhoneIdentity PhoneProductId="b99a209c-7a2d-42fa-ba34-b16c8dee0379" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
- <DisplayName>DevTools.Tests</DisplayName>
+ <DisplayName>DevToys.Tests</DisplayName>
<PublisherDisplayName>etbaudou</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
@@ -27,12 +27,12 @@
<Applications>
<Application Id="vstest.executionengine.universal.App"
Executable="$targetnametoken$.exe"
- EntryPoint="DevTools.Tests.App">
+ EntryPoint="DevToys.Tests.App">
<uap:VisualElements
- DisplayName="DevTools.Tests"
+ DisplayName="DevToys.Tests"
Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png"
- Description="DevTools.Tests"
+ Description="DevToys.Tests"
BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
<uap:SplashScreen Image="Assets\SplashScreen.png" />
diff --git a/src/tests/DevTools.Tests/Properties/AssemblyInfo.cs b/src/tests/DevToys.Tests/Properties/AssemblyInfo.cs
similarity index 80%
rename from src/tests/DevTools.Tests/Properties/AssemblyInfo.cs
rename to src/tests/DevToys.Tests/Properties/AssemblyInfo.cs
index a287e88e7..2f43efdad 100644
--- a/src/tests/DevTools.Tests/Properties/AssemblyInfo.cs
+++ b/src/tests/DevToys.Tests/Properties/AssemblyInfo.cs
@@ -2,11 +2,11 @@ using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-[assembly: AssemblyTitle("DevTools.Tests")]
+[assembly: AssemblyTitle("DevToys.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DevTools.Tests")]
+[assembly: AssemblyProduct("DevToys.Tests")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/src/tests/DevTools.Tests/Properties/Default.rd.xml b/src/tests/DevToys.Tests/Properties/Default.rd.xml
similarity index 100%
rename from src/tests/DevTools.Tests/Properties/Default.rd.xml
rename to src/tests/DevToys.Tests/Properties/Default.rd.xml
diff --git a/src/tests/DevTools.Tests/Providers/IToolProviderFactoryTest.cs b/src/tests/DevToys.Tests/Providers/IToolProviderFactoryTest.cs
similarity index 92%
rename from src/tests/DevTools.Tests/Providers/IToolProviderFactoryTest.cs
rename to src/tests/DevToys.Tests/Providers/IToolProviderFactoryTest.cs
index b7001d9a7..6831a34ef 100644
--- a/src/tests/DevTools.Tests/Providers/IToolProviderFactoryTest.cs
+++ b/src/tests/DevToys.Tests/Providers/IToolProviderFactoryTest.cs
@@ -1,8 +1,8 @@
-using DevTools.Providers;
+using DevToys.Api.Tools;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Linq;
-namespace DevTools.Tests.Providers
+namespace DevToys.Tests.Providers
{
[TestClass]
public class IToolProviderFactoryTest : MefBaseTest
diff --git a/src/tests/DevTools.Tests/Providers/Tools/Base64EncoderDecoderTests.cs b/src/tests/DevToys.Tests/Providers/Tools/Base64EncoderDecoderTests.cs
similarity index 86%
rename from src/tests/DevTools.Tests/Providers/Tools/Base64EncoderDecoderTests.cs
rename to src/tests/DevToys.Tests/Providers/Tools/Base64EncoderDecoderTests.cs
index cf496a92a..4bc64363b 100644
--- a/src/tests/DevTools.Tests/Providers/Tools/Base64EncoderDecoderTests.cs
+++ b/src/tests/DevToys.Tests/Providers/Tools/Base64EncoderDecoderTests.cs
@@ -1,11 +1,11 @@
-using DevTools.Core.Threading;
-using DevTools.Providers;
-using DevTools.Providers.Impl.Tools.Base64EncoderDecoder;
+using DevToys.Api.Tools;
+using DevToys.Core.Threading;
+using DevToys.ViewModels.Tools.Base64EncoderDecoder;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Linq;
using System.Threading.Tasks;
-namespace DevTools.Tests.Providers.Tools
+namespace DevToys.Tests.Providers.Tools
{
[TestClass]
public class Base64EncoderDecoderTests : MefBaseTest
@@ -35,7 +35,7 @@ namespace DevTools.Tests.Providers.Tools
{
var viewModel = ExportProvider.Import<Base64EncoderDecoderToolViewModel>();
- await ExportProvider.Import<IThread>().RunOnUIThreadAsync(() =>
+ await ThreadHelper.RunOnUIThreadAsync(() =>
{
viewModel.ConversionMode = "Encode";
viewModel.InputValue = input;
@@ -55,7 +55,7 @@ namespace DevTools.Tests.Providers.Tools
{
var viewModel = ExportProvider.Import<Base64EncoderDecoderToolViewModel>();
- await ExportProvider.Import<IThread>().RunOnUIThreadAsync(() =>
+ await ThreadHelper.RunOnUIThreadAsync(() =>
{
viewModel.ConversionMode = "Decode";
viewModel.InputValue = input;
diff --git a/src/tests/DevTools.Tests/Providers/Tools/HashGeneratorTests.cs b/src/tests/DevToys.Tests/Providers/Tools/HashGeneratorTests.cs
similarity index 83%
rename from src/tests/DevTools.Tests/Providers/Tools/HashGeneratorTests.cs
rename to src/tests/DevToys.Tests/Providers/Tools/HashGeneratorTests.cs
index 9472ce1c3..a923bc25d 100644
--- a/src/tests/DevTools.Tests/Providers/Tools/HashGeneratorTests.cs
+++ b/src/tests/DevToys.Tests/Providers/Tools/HashGeneratorTests.cs
@@ -1,10 +1,9 @@
-using DevTools.Core.Threading;
-using DevTools.Providers.Impl.Tools.Base64EncoderDecoder;
-using DevTools.Providers.Impl.Tools.HashGenerator;
+using DevToys.Core.Threading;
+using DevToys.ViewModels.Tools.HashGenerator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Threading.Tasks;
-namespace DevTools.Tests.Providers.Tools
+namespace DevToys.Tests.Providers.Tools
{
[TestClass]
public class HashGeneratorTests : MefBaseTest
@@ -18,7 +17,7 @@ namespace DevTools.Tests.Providers.Tools
{
var viewModel = ExportProvider.Import<HashGeneratorToolViewModel>();
- await ExportProvider.Import<IThread>().RunOnUIThreadAsync(() =>
+ await ThreadHelper.RunOnUIThreadAsync(() =>
{
viewModel.Input = input;
});
@@ -37,7 +36,7 @@ namespace DevTools.Tests.Providers.Tools
{
var viewModel = ExportProvider.Import<HashGeneratorToolViewModel>();
- await ExportProvider.Import<IThread>().RunOnUIThreadAsync(() =>
+ await ThreadHelper.RunOnUIThreadAsync(() =>
{
viewModel.IsUppercase = true;
viewModel.Input = input;
diff --git a/src/tests/DevTools.Tests/UI/ConvertersTests.cs b/src/tests/DevToys.Tests/UI/ConvertersTests.cs
similarity index 98%
rename from src/tests/DevTools.Tests/UI/ConvertersTests.cs
rename to src/tests/DevToys.Tests/UI/ConvertersTests.cs
index 5182cd33a..2888b8d9a 100644
--- a/src/tests/DevTools.Tests/UI/ConvertersTests.cs
+++ b/src/tests/DevToys.Tests/UI/ConvertersTests.cs
@@ -1,11 +1,11 @@
#nullable disable
-using DevTools.Common.UI.Converters;
+using DevToys.UI.Converters;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
-namespace DevTools.Tests.UI
+namespace DevToys.Tests.UI
{
[TestClass]
public class ConvertersTests
diff --git a/src/tests/DevTools.Tests/UnitTestApp.xaml b/src/tests/DevToys.Tests/UnitTestApp.xaml
similarity index 68%
rename from src/tests/DevTools.Tests/UnitTestApp.xaml
rename to src/tests/DevToys.Tests/UnitTestApp.xaml
index 35588fd9d..d2eae1e18 100644
--- a/src/tests/DevTools.Tests/UnitTestApp.xaml
+++ b/src/tests/DevToys.Tests/UnitTestApp.xaml
@@ -1,7 +1,7 @@
<Application
- x:Class="DevTools.Tests.App"
+ x:Class="DevToys.Tests.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:DevTools.Tests">
+ xmlns:local="using:DevToys.Tests">
</Application>
diff --git a/src/tests/DevTools.Tests/UnitTestApp.xaml.cs b/src/tests/DevToys.Tests/UnitTestApp.xaml.cs
similarity index 99%
rename from src/tests/DevTools.Tests/UnitTestApp.xaml.cs
rename to src/tests/DevToys.Tests/UnitTestApp.xaml.cs
index 7f2a47f94..1afbf8e54 100644
--- a/src/tests/DevTools.Tests/UnitTestApp.xaml.cs
+++ b/src/tests/DevToys.Tests/UnitTestApp.xaml.cs
@@ -5,7 +5,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
-namespace DevTools.Tests
+namespace DevToys.Tests
{
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.