From 20d1d66cad05227a4f16966e143d577762dd44cb Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:56:15 -0800
Subject: [PATCH 01/18] Init files

---
 src/AppInstallerCLI.sln                       | 880 ++++++++++++++----
 src/Internal/Experiment/Experiment.cpp        |  12 +
 src/Internal/Experiment/Experiment.h          |  10 +
 src/Internal/Experiment/Experiment.vcxproj    | 414 ++++++++
 .../Experiment/Experiment.vcxproj.filters     |  36 +
 5 files changed, 1151 insertions(+), 201 deletions(-)
 create mode 100644 src/Internal/Experiment/Experiment.cpp
 create mode 100644 src/Internal/Experiment/Experiment.h
 create mode 100644 src/Internal/Experiment/Experiment.vcxproj
 create mode 100644 src/Internal/Experiment/Experiment.vcxproj.filters

diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
index f4dbf6a7e2..ace6cbee4a 100644
--- a/src/AppInstallerCLI.sln
+++ b/src/AppInstallerCLI.sln
@@ -212,25 +212,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Management.Deploy
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01} = {2B00D362-AC92-41F3-A8D2-5B1599BDCA01}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Internal", "Internal", "{800529ED-3374-49C4-BAD1-9B27647E4359}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experiment", "Experiment", "{13E55125-0ABF-4975-9B5B-DD6E5527D47F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Experiment", "Internal\Experiment\Experiment.vcxproj", "{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Fuzzing|ARM = Fuzzing|ARM
 		Fuzzing|ARM64 = Fuzzing|ARM64
 		Fuzzing|x64 = Fuzzing|x64
 		Fuzzing|x86 = Fuzzing|x86
-		ReleaseStatic|ARM64 = ReleaseStatic|ARM64
-		ReleaseStatic|x64 = ReleaseStatic|x64
-		ReleaseStatic|x86 = ReleaseStatic|x86
+		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		ReleaseStatic|ARM = ReleaseStatic|ARM
+		ReleaseStatic|ARM64 = ReleaseStatic|ARM64
+		ReleaseStatic|x64 = ReleaseStatic|x64
+		ReleaseStatic|x86 = ReleaseStatic|x86
+		TestRelease|ARM = TestRelease|ARM
 		TestRelease|ARM64 = TestRelease|ARM64
 		TestRelease|x64 = TestRelease|x64
 		TestRelease|x86 = TestRelease|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM.ActiveCfg = Debug|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM.Build.0 = Debug|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM.Deploy.0 = Debug|ARM
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM64.Build.0 = Debug|ARM64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|ARM64.Deploy.0 = Debug|ARM64
@@ -240,12 +254,15 @@ Global
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|x86.ActiveCfg = Debug|x86
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|x86.Build.0 = Debug|x86
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Debug|x86.Deploy.0 = Debug|x86
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|ARM.Build.0 = Debug|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|ARM.Deploy.0 = Debug|ARM
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|x64.ActiveCfg = Release|x64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Fuzzing|x86.ActiveCfg = Release|x86
-		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM.ActiveCfg = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM.Build.0 = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM.Deploy.0 = Release|ARM
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM64.ActiveCfg = Release|ARM64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM64.Build.0 = Release|ARM64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|ARM64.Deploy.0 = Release|ARM64
@@ -255,224 +272,326 @@ Global
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|x86.ActiveCfg = Release|x86
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|x86.Build.0 = Release|x86
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.Release|x86.Deploy.0 = Release|x86
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|ARM.ActiveCfg = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|ARM.Build.0 = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|ARM.Deploy.0 = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.TestRelease|ARM.Build.0 = Release|ARM
+		{6AA3791A-0713-4548-A357-87A323E7AC3A}.TestRelease|ARM.Deploy.0 = Release|ARM
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.TestRelease|x64.ActiveCfg = Release|x64
 		{6AA3791A-0713-4548-A357-87A323E7AC3A}.TestRelease|x86.ActiveCfg = Release|x86
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM.Build.0 = Debug|ARM
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x64.ActiveCfg = Debug|x64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x64.Build.0 = Debug|x64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x86.ActiveCfg = Debug|Win32
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Debug|x86.Build.0 = Debug|Win32
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|x64.ActiveCfg = Release|x64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM.ActiveCfg = Release|ARM
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM.Build.0 = Release|ARM
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM64.ActiveCfg = Release|ARM64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|ARM64.Build.0 = Release|ARM64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x64.ActiveCfg = Release|x64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x64.Build.0 = Release|x64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x86.ActiveCfg = Release|Win32
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.Release|x86.Build.0 = Release|Win32
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|ARM.ActiveCfg = Release|ARM
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|ARM.Build.0 = Release|ARM
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.TestRelease|ARM.Build.0 = Release|ARM
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.TestRelease|x64.ActiveCfg = Release|x64
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}.TestRelease|x86.ActiveCfg = Release|Win32
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM.ActiveCfg = Debug|ARM
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM.Build.0 = Debug|ARM
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x64.ActiveCfg = Debug|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x64.Build.0 = Debug|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x86.ActiveCfg = Debug|Win32
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Debug|x86.Build.0 = Debug|Win32
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|ARM
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|ARM.Build.0 = ReleaseStatic|ARM
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|x64.ActiveCfg = Release|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM.ActiveCfg = Release|ARM
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM.Build.0 = Release|ARM
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM64.ActiveCfg = Release|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|ARM64.Build.0 = Release|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x64.ActiveCfg = Release|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x64.Build.0 = Release|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x86.ActiveCfg = Release|Win32
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.Release|x86.Build.0 = Release|Win32
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|ARM.Build.0 = Release|ARM
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|x64.ActiveCfg = Release|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|x64.Build.0 = Release|x64
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|x86.ActiveCfg = Release|Win32
 		{1C6E0108-2860-4B17-9F7E-FA5C6C1F3D3D}.TestRelease|x86.Build.0 = Release|Win32
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|ARM.ActiveCfg = Debug|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|ARM.Build.0 = Debug|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|ARM64.Build.0 = Debug|ARM64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x64.ActiveCfg = Debug|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x64.Build.0 = Debug|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x86.ActiveCfg = Debug|Win32
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Debug|x86.Build.0 = Debug|Win32
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|ARM.ActiveCfg = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|ARM.Build.0 = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|ARM64.ActiveCfg = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|x64.ActiveCfg = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|ARM64.ActiveCfg = Release|x64
-		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|ARM.ActiveCfg = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|ARM.Build.0 = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|ARM64.ActiveCfg = Release|ARM64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|ARM64.Build.0 = Release|ARM64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x64.ActiveCfg = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x64.Build.0 = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x86.ActiveCfg = Release|Win32
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.Release|x86.Build.0 = Release|Win32
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|ARM.ActiveCfg = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|ARM.Build.0 = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|ARM64.ActiveCfg = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.TestRelease|ARM.ActiveCfg = Release|x64
+		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.TestRelease|ARM.Build.0 = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.TestRelease|ARM64.ActiveCfg = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.TestRelease|x64.ActiveCfg = Release|x64
 		{89B1AAB4-2BBC-4B65-9ED7-A01D5CF88230}.TestRelease|x86.ActiveCfg = Release|Win32
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM.Build.0 = Debug|ARM
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x64.ActiveCfg = Debug|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x64.Build.0 = Debug|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x86.ActiveCfg = Debug|Win32
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Debug|x86.Build.0 = Debug|Win32
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|ARM
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|ARM.Build.0 = ReleaseStatic|ARM
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|x64.ActiveCfg = Release|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM.ActiveCfg = Release|ARM
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM.Build.0 = Release|ARM
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM64.ActiveCfg = Release|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|ARM64.Build.0 = Release|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x64.ActiveCfg = Release|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x64.Build.0 = Release|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x86.ActiveCfg = Release|Win32
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.Release|x86.Build.0 = Release|Win32
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|ARM.Build.0 = Release|ARM
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|x64.ActiveCfg = Release|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|x64.Build.0 = Release|x64
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|x86.ActiveCfg = Release|Win32
 		{5EB88068-5FB9-4E69-89B2-72DBC5E068F9}.TestRelease|x86.Build.0 = Release|Win32
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM.Build.0 = Debug|ARM
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|ARM64.Build.0 = Debug|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x64.ActiveCfg = Debug|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x64.Build.0 = Debug|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x86.ActiveCfg = Debug|Win32
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Debug|x86.Build.0 = Debug|Win32
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|ARM.ActiveCfg = Fuzzing|ARM
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|ARM.Build.0 = Fuzzing|ARM
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x64.Build.0 = Fuzzing|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM.ActiveCfg = Release|ARM
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM.Build.0 = Release|ARM
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM64.ActiveCfg = Release|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|ARM64.Build.0 = Release|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x64.ActiveCfg = Release|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x64.Build.0 = Release|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x86.ActiveCfg = Release|Win32
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.Release|x86.Build.0 = Release|Win32
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|ARM.Build.0 = Release|ARM
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|x64.ActiveCfg = Release|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|x64.Build.0 = Release|x64
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|x86.ActiveCfg = Release|Win32
 		{8BB94BB8-374F-4294-BCA1-C7811514A6B7}.TestRelease|x86.Build.0 = Release|Win32
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM.Build.0 = Debug|ARM
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x64.ActiveCfg = Debug|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x64.Build.0 = Debug|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x86.ActiveCfg = Debug|Win32
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Debug|x86.Build.0 = Debug|Win32
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|ARM.Build.0 = Fuzzing|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x64.Build.0 = Fuzzing|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM.ActiveCfg = Release|ARM
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM.Build.0 = Release|ARM
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM64.ActiveCfg = Release|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|ARM64.Build.0 = Release|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x64.ActiveCfg = Release|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x64.Build.0 = Release|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x86.ActiveCfg = Release|Win32
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.Release|x86.Build.0 = Release|Win32
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|ARM.Build.0 = Release|ARM
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|x64.ActiveCfg = Release|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|x64.Build.0 = Release|x64
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|x86.ActiveCfg = Release|Win32
 		{5890D6ED-7C3B-40F3-B436-B54F640D9E65}.TestRelease|x86.Build.0 = Release|Win32
+		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM.Build.0 = Debug|ARM
 		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x64.ActiveCfg = Debug|x64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x64.Build.0 = Debug|x64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x86.ActiveCfg = Debug|Win32
 		{FB313532-38B0-4676-9303-AB200AA13576}.Debug|x86.Build.0 = Debug|Win32
+		{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|x64.ActiveCfg = Release|x64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM.ActiveCfg = Release|ARM
+		{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM.Build.0 = Release|ARM
 		{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Release|ARM64.Build.0 = Release|ARM64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Release|x64.ActiveCfg = Release|x64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Release|x64.Build.0 = Release|x64
 		{FB313532-38B0-4676-9303-AB200AA13576}.Release|x86.ActiveCfg = Release|Win32
 		{FB313532-38B0-4676-9303-AB200AA13576}.Release|x86.Build.0 = Release|Win32
+		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|ARM.ActiveCfg = Release|ARM
+		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|ARM.Build.0 = Release|ARM
+		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
+		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{FB313532-38B0-4676-9303-AB200AA13576}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{FB313532-38B0-4676-9303-AB200AA13576}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{FB313532-38B0-4676-9303-AB200AA13576}.TestRelease|ARM.Build.0 = Release|ARM
 		{FB313532-38B0-4676-9303-AB200AA13576}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{FB313532-38B0-4676-9303-AB200AA13576}.TestRelease|x64.ActiveCfg = Release|x64
 		{FB313532-38B0-4676-9303-AB200AA13576}.TestRelease|x86.ActiveCfg = Release|Win32
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM.ActiveCfg = Debug|ARM
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM.Build.0 = Debug|ARM
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|ARM64.Build.0 = Debug|ARM64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x64.ActiveCfg = Debug|x64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x64.Build.0 = Debug|x64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x86.ActiveCfg = Debug|Win32
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Debug|x86.Build.0 = Debug|Win32
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|x64.ActiveCfg = Release|x64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM.ActiveCfg = Release|ARM
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM.Build.0 = Release|ARM
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM64.ActiveCfg = Release|ARM64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|ARM64.Build.0 = Release|ARM64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x64.ActiveCfg = Release|x64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x64.Build.0 = Release|x64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x86.ActiveCfg = Release|Win32
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.Release|x86.Build.0 = Release|Win32
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|ARM.ActiveCfg = Release|ARM
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|ARM.Build.0 = Release|ARM
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{6CB84692-5994-407D-B9BD-9216AF77FE83}.TestRelease|ARM.Build.0 = Release|ARM
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.TestRelease|x64.ActiveCfg = Release|x64
 		{6CB84692-5994-407D-B9BD-9216AF77FE83}.TestRelease|x86.ActiveCfg = Release|Win32
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|ARM.ActiveCfg = Debug|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|ARM.Build.0 = Debug|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|ARM64.ActiveCfg = Debug|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x64.ActiveCfg = Debug|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x64.Build.0 = Debug|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x86.ActiveCfg = Debug|x86
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Debug|x86.Build.0 = Debug|x86
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|ARM.ActiveCfg = Release|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|ARM.Build.0 = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|ARM64.ActiveCfg = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|x64.ActiveCfg = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Fuzzing|x86.ActiveCfg = Release|x86
-		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|ARM64.ActiveCfg = Release|x86
-		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|ARM.ActiveCfg = Release|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|ARM.Build.0 = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|ARM64.ActiveCfg = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x64.ActiveCfg = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x64.Build.0 = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x86.ActiveCfg = Release|x86
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.Release|x86.Build.0 = Release|x86
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|ARM.ActiveCfg = Release|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|ARM.Build.0 = Release|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|ARM64.ActiveCfg = Release|x86
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.TestRelease|ARM.ActiveCfg = Release|x64
+		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.TestRelease|ARM.Build.0 = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.TestRelease|ARM64.ActiveCfg = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.TestRelease|x64.ActiveCfg = Release|x64
 		{3C0269FA-E582-4CA7-9E33-3881A005CA0C}.TestRelease|x86.ActiveCfg = Release|x86
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM.ActiveCfg = Debug|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM.Build.0 = Debug|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM.Deploy.0 = Debug|ARM
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM64.Build.0 = Debug|ARM64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|ARM64.Deploy.0 = Debug|ARM64
@@ -482,12 +601,15 @@ Global
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|x86.ActiveCfg = Debug|x86
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|x86.Build.0 = Debug|x86
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Debug|x86.Deploy.0 = Debug|x86
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|ARM.Build.0 = Debug|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|ARM.Deploy.0 = Debug|ARM
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|x64.ActiveCfg = Release|x64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Fuzzing|x86.ActiveCfg = Release|x86
-		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM.ActiveCfg = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM.Build.0 = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM.Deploy.0 = Release|ARM
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM64.ActiveCfg = Release|ARM64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM64.Build.0 = Release|ARM64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|ARM64.Deploy.0 = Release|ARM64
@@ -497,752 +619,1106 @@ Global
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|x86.ActiveCfg = Release|x86
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|x86.Build.0 = Release|x86
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.Release|x86.Deploy.0 = Release|x86
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|ARM.ActiveCfg = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|ARM.Build.0 = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|ARM.Deploy.0 = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.TestRelease|ARM.Build.0 = Release|ARM
+		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.TestRelease|ARM.Deploy.0 = Release|ARM
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.TestRelease|x64.ActiveCfg = Release|x64
 		{3E2CBA31-CEBA-4D63-BF52-49C0718E19EA}.TestRelease|x86.ActiveCfg = Release|x86
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|ARM.ActiveCfg = Debug
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|ARM64.ActiveCfg = Debug
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|x64.ActiveCfg = Debug
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Debug|x86.ActiveCfg = Debug
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|ARM.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|ARM64.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|x64.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Fuzzing|x86.ActiveCfg = Release
-		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|ARM64.ActiveCfg = Release
-		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|x64.ActiveCfg = Release
-		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|x86.ActiveCfg = Release
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|ARM.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|ARM64.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|x64.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.Release|x86.ActiveCfg = Release
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|ARM.ActiveCfg = Release
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|ARM64.ActiveCfg = Release
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|x64.ActiveCfg = Release
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.ReleaseStatic|x86.ActiveCfg = Release
+		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.TestRelease|ARM.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.TestRelease|ARM64.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.TestRelease|x64.ActiveCfg = Release
 		{C1624B2F-2BF6-4E28-92FA-1BF85C6B62A8}.TestRelease|x86.ActiveCfg = Release
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|ARM.ActiveCfg = Debug|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|ARM.Build.0 = Debug|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|ARM64.ActiveCfg = Debug|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x64.ActiveCfg = Debug|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x64.Build.0 = Debug|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x86.ActiveCfg = Debug|x86
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Debug|x86.Build.0 = Debug|x86
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|ARM.ActiveCfg = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|ARM.Build.0 = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|ARM64.ActiveCfg = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|x64.ActiveCfg = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Fuzzing|x86.ActiveCfg = Release|x86
-		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|ARM64.ActiveCfg = Release|x64
-		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|ARM.ActiveCfg = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|ARM.Build.0 = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|ARM64.ActiveCfg = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x64.ActiveCfg = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x64.Build.0 = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x86.ActiveCfg = Release|x86
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.Release|x86.Build.0 = Release|x86
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|ARM.ActiveCfg = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|ARM.Build.0 = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|ARM64.ActiveCfg = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.TestRelease|ARM.ActiveCfg = Release|x64
+		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.TestRelease|ARM.Build.0 = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.TestRelease|ARM64.ActiveCfg = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.TestRelease|x64.ActiveCfg = Release|x64
 		{3B8466CF-4FDD-4329-9C80-91321C4AAC99}.TestRelease|x86.ActiveCfg = Release|x86
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM.ActiveCfg = Debug|ARM
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM.Build.0 = Debug|ARM
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|ARM64.Build.0 = Debug|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x64.ActiveCfg = Debug|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x64.Build.0 = Debug|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x86.ActiveCfg = Debug|Win32
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Debug|x86.Build.0 = Debug|Win32
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|ARM.Build.0 = Fuzzing|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x64.Build.0 = Fuzzing|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM.ActiveCfg = Release|ARM
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM.Build.0 = Release|ARM
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM64.ActiveCfg = Release|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|ARM64.Build.0 = Release|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x64.ActiveCfg = Release|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x64.Build.0 = Release|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x86.ActiveCfg = Release|Win32
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.Release|x86.Build.0 = Release|Win32
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|ARM.Build.0 = Release|ARM
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|x64.ActiveCfg = Release|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|x64.Build.0 = Release|x64
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|x86.ActiveCfg = Release|Win32
 		{82B39FDA-E86B-4713-A873-9D56DE00247A}.TestRelease|x86.Build.0 = Release|Win32
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|ARM.ActiveCfg = Debug|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|ARM.Build.0 = Debug|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|ARM64.ActiveCfg = Debug|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|x64.ActiveCfg = Debug|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Debug|x86.ActiveCfg = Fuzzing|Win32
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|ARM.Build.0 = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|ARM64.ActiveCfg = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x64.Build.0 = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|ARM64.ActiveCfg = Fuzzing|x64
-		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|x64.ActiveCfg = Fuzzing|x64
-		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|x86.ActiveCfg = Fuzzing|Win32
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|ARM.ActiveCfg = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|ARM.Build.0 = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|ARM64.ActiveCfg = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|x64.ActiveCfg = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.Release|x86.ActiveCfg = Fuzzing|Win32
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|ARM.ActiveCfg = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|ARM.Build.0 = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|ARM64.ActiveCfg = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|x64.ActiveCfg = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.ReleaseStatic|x86.ActiveCfg = Fuzzing|Win32
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.TestRelease|ARM.ActiveCfg = Fuzzing|x64
+		{1622DA16-914F-4F57-A259-D5169003CC8C}.TestRelease|ARM.Build.0 = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.TestRelease|ARM64.ActiveCfg = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.TestRelease|x64.ActiveCfg = Fuzzing|x64
 		{1622DA16-914F-4F57-A259-D5169003CC8C}.TestRelease|x86.ActiveCfg = Fuzzing|Win32
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|ARM.ActiveCfg = Debug|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|ARM.Build.0 = Debug|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|ARM64.ActiveCfg = Debug|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x64.ActiveCfg = Debug|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x64.Build.0 = Debug|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x86.ActiveCfg = Debug|x86
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Debug|x86.Build.0 = Debug|x86
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|ARM.ActiveCfg = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|ARM.Build.0 = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|ARM64.ActiveCfg = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|x64.ActiveCfg = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Fuzzing|x86.ActiveCfg = Release|x86
-		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|ARM64.ActiveCfg = Release|x64
-		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|ARM.ActiveCfg = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|ARM.Build.0 = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|ARM64.ActiveCfg = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x64.ActiveCfg = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x64.Build.0 = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x86.ActiveCfg = Release|x86
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.Release|x86.Build.0 = Release|x86
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|ARM.ActiveCfg = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|ARM.Build.0 = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|ARM64.ActiveCfg = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.TestRelease|ARM.ActiveCfg = Release|x64
+		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.TestRelease|ARM.Build.0 = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.TestRelease|ARM64.ActiveCfg = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.TestRelease|x64.ActiveCfg = Release|x64
 		{3BAF989F-7F65-465B-ACE8-BAFE42D1017E}.TestRelease|x86.ActiveCfg = Release|x86
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM.ActiveCfg = Debug|ARM
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM.Build.0 = Debug|ARM
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x64.ActiveCfg = Debug|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x64.Build.0 = Debug|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x86.ActiveCfg = Debug|Win32
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Debug|x86.Build.0 = Debug|Win32
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|x64.ActiveCfg = Release|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM.ActiveCfg = Release|ARM
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM.Build.0 = Release|ARM
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM64.ActiveCfg = Release|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|ARM64.Build.0 = Release|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x64.ActiveCfg = Release|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x64.Build.0 = Release|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x86.ActiveCfg = Release|Win32
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.Release|x86.Build.0 = Release|Win32
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|ARM.Build.0 = Release|ARM
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|x64.ActiveCfg = Release|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|x64.Build.0 = Release|x64
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|x86.ActiveCfg = Release|Win32
 		{866C3F06-636F-4BE8-BC24-5F86ECC606A1}.TestRelease|x86.Build.0 = Release|Win32
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM.ActiveCfg = Debug|ARM
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM.Build.0 = Debug|ARM
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|ARM64.Build.0 = Debug|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x64.ActiveCfg = Debug|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x64.Build.0 = Debug|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x86.ActiveCfg = Debug|Win32
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Debug|x86.Build.0 = Debug|Win32
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|ARM
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|ARM.Build.0 = ReleaseStatic|ARM
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|x64.ActiveCfg = Release|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM.ActiveCfg = Release|ARM
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM.Build.0 = Release|ARM
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM64.ActiveCfg = Release|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|ARM64.Build.0 = Release|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x64.ActiveCfg = Release|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x64.Build.0 = Release|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x86.ActiveCfg = Release|Win32
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.Release|x86.Build.0 = Release|Win32
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|ARM.Build.0 = Release|ARM
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|x64.ActiveCfg = Release|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|x64.Build.0 = Release|x64
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|x86.ActiveCfg = Release|Win32
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69}.TestRelease|x86.Build.0 = Release|Win32
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM.ActiveCfg = Debug|ARM
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM.Build.0 = Debug|ARM
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x64.ActiveCfg = Debug|x64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x64.Build.0 = Debug|x64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x86.ActiveCfg = Debug|Win32
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Debug|x86.Build.0 = Debug|Win32
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|x64.ActiveCfg = Release|x64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|ARM64.Build.0 = Release|ARM64
-		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x64.Build.0 = Release|x64
-		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x86.ActiveCfg = Release|Win32
-		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x86.Build.0 = Release|Win32
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM.ActiveCfg = Release|ARM
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM.Build.0 = Release|ARM
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|ARM64.Build.0 = Release|ARM64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x64.ActiveCfg = Release|x64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x64.Build.0 = Release|x64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x86.ActiveCfg = Release|Win32
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.Release|x86.Build.0 = Release|Win32
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|ARM.ActiveCfg = Release|ARM
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|ARM.Build.0 = Release|ARM
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|ARM64.Build.0 = Release|ARM64
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x64.Build.0 = Release|x64
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x86.ActiveCfg = Release|Win32
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.ReleaseStatic|x86.Build.0 = Release|Win32
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.TestRelease|ARM.Build.0 = Release|ARM
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.TestRelease|x64.ActiveCfg = Release|x64
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01}.TestRelease|x86.ActiveCfg = Release|Win32
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|ARM.Build.0 = Debug|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|x64.Build.0 = Debug|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Debug|x86.Build.0 = Debug|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Fuzzing|ARM.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Fuzzing|ARM.Build.0 = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|x64.ActiveCfg = Release|Any CPU
-		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|x86.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|ARM.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|ARM.Build.0 = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|ARM64.Build.0 = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|x64.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|x64.Build.0 = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|x86.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.Release|x86.Build.0 = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|ARM.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|ARM.Build.0 = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|x64.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.ReleaseStatic|x86.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{846FB88B-BF1B-4F33-9883-E589CEC99739}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{846FB88B-BF1B-4F33-9883-E589CEC99739}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|ARM.ActiveCfg = Debug|x64
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|ARM.Build.0 = Debug|x64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|x64.ActiveCfg = Debug|x64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|x64.Build.0 = Debug|x64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|x86.ActiveCfg = Debug|x86
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Debug|x86.Build.0 = Debug|x86
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.Fuzzing|ARM.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.Fuzzing|ARM.Build.0 = Release|Any CPU
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Fuzzing|x86.ActiveCfg = Release|x86
-		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|x64.ActiveCfg = Release|Any CPU
-		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|ARM.Build.0 = Release|Any CPU
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|ARM64.ActiveCfg = Release|ARM64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|x64.ActiveCfg = Release|x64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|x64.Build.0 = Release|x64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|x86.ActiveCfg = Release|x86
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.Release|x86.Build.0 = Release|x86
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|ARM.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|ARM.Build.0 = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|x64.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{68808357-902B-406C-8C19-E8E26A69DE8A}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.TestRelease|x64.ActiveCfg = Release|x64
 		{68808357-902B-406C-8C19-E8E26A69DE8A}.TestRelease|x86.ActiveCfg = Release|x86
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|ARM.ActiveCfg = Debug|ARM
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|ARM.Build.0 = Debug|ARM
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|x64.ActiveCfg = Debug|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|x64.Build.0 = Debug|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|x86.ActiveCfg = Debug|Win32
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Debug|x86.Build.0 = Debug|Win32
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|ARM
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Fuzzing|ARM.Build.0 = ReleaseStatic|ARM
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Fuzzing|x64.ActiveCfg = Release|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|ARM.ActiveCfg = Release|ARM
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|ARM.Build.0 = Release|ARM
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|ARM64.Build.0 = Release|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|x64.ActiveCfg = Release|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|x64.Build.0 = Release|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|x86.ActiveCfg = Release|Win32
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.Release|x86.Build.0 = Release|Win32
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|ARM.Build.0 = Release|ARM
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|x64.ActiveCfg = Release|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|x64.Build.0 = Release|x64
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|x86.ActiveCfg = Release|Win32
 		{2046B5AF-666D-4CE8-8D3E-C32C57908A56}.TestRelease|x86.Build.0 = Release|Win32
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|ARM.ActiveCfg = Debug|ARM
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|ARM.Build.0 = Debug|ARM
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|ARM64.Build.0 = Debug|ARM64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|x64.ActiveCfg = Debug|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|x64.Build.0 = Debug|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|x86.ActiveCfg = Debug|Win32
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Debug|x86.Build.0 = Debug|Win32
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Fuzzing|x64.ActiveCfg = Release|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Fuzzing|x86.ActiveCfg = Release|Win32
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|ARM.ActiveCfg = Release|ARM
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|ARM.Build.0 = Release|ARM
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x64.ActiveCfg = Release|x64
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x64.Build.0 = Release|x64
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x86.ActiveCfg = Release|Win32
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x86.Build.0 = Release|Win32
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
-		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x64.ActiveCfg = Release|x64
-		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x64.Build.0 = Release|x64
-		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x86.ActiveCfg = Release|Win32
-		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.Release|x86.Build.0 = Release|Win32
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.TestRelease|ARM.Build.0 = Release|ARM
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.TestRelease|ARM64.ActiveCfg = Release|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.TestRelease|x64.ActiveCfg = Release|x64
 		{9AC3C6A4-1875-4D3E-BF9C-C31E81EFF6B4}.TestRelease|x86.ActiveCfg = Release|Win32
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|x64.Build.0 = Debug|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Debug|x86.Build.0 = Debug|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|ARM.Build.0 = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|ARM64.Build.0 = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|x64.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|x64.Build.0 = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|x86.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.Release|x86.Build.0 = Release|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|ARM.ActiveCfg = Debug|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|ARM.Build.0 = Debug|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|ARM64.ActiveCfg = Debug|arm64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|x64.ActiveCfg = Debug|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|x64.Build.0 = Debug|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|x86.ActiveCfg = Debug|x86
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Debug|x86.Build.0 = Debug|x86
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Fuzzing|ARM.Build.0 = ReleaseStatic|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Fuzzing|ARM64.ActiveCfg = Release|arm64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Fuzzing|x64.ActiveCfg = Release|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Fuzzing|x86.ActiveCfg = Release|x86
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|ARM.ActiveCfg = Release|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|ARM.Build.0 = Release|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|ARM64.ActiveCfg = Release|arm64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x64.ActiveCfg = Release|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x64.Build.0 = Release|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x86.ActiveCfg = Release|x86
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x86.Build.0 = Release|x86
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|arm64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|arm64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|x86
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.ReleaseStatic|x86.Build.0 = ReleaseStatic|x86
-		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|ARM64.ActiveCfg = Release|arm64
-		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x64.ActiveCfg = Release|x64
-		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x64.Build.0 = Release|x64
-		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x86.ActiveCfg = Release|x86
-		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.Release|x86.Build.0 = Release|x86
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.TestRelease|ARM.ActiveCfg = Release|x64
+		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.TestRelease|ARM.Build.0 = Release|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.TestRelease|ARM64.ActiveCfg = Release|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.TestRelease|x64.ActiveCfg = Release|x64
 		{0B104762-5CD8-47EE-A904-71C1C3F84DCD}.TestRelease|x86.ActiveCfg = Release|x86
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|ARM.ActiveCfg = Debug|ARM
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|ARM.Build.0 = Debug|ARM
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|x64.ActiveCfg = Debug|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|x64.Build.0 = Debug|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|x86.ActiveCfg = Debug|Win32
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Debug|x86.Build.0 = Debug|Win32
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|ARM
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Fuzzing|ARM.Build.0 = ReleaseStatic|ARM
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Fuzzing|x64.ActiveCfg = Release|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|ARM.ActiveCfg = Release|ARM
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|ARM.Build.0 = Release|ARM
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|ARM64.ActiveCfg = Release|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|ARM64.Build.0 = Release|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|x64.ActiveCfg = Release|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|x64.Build.0 = Release|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|x86.ActiveCfg = Release|Win32
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.Release|x86.Build.0 = Release|Win32
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|ARM.Build.0 = Release|ARM
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x64.ActiveCfg = Release|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x64.Build.0 = Release|x64
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x86.ActiveCfg = Release|Win32
 		{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x86.Build.0 = Release|Win32
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|ARM.ActiveCfg = Debug|ARM
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|ARM.Build.0 = Debug|ARM
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|ARM64.Build.0 = Debug|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|x64.ActiveCfg = Debug|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|x64.Build.0 = Debug|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|x86.ActiveCfg = Debug|Win32
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Debug|x86.Build.0 = Debug|Win32
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|ARM
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Fuzzing|ARM.Build.0 = ReleaseStatic|ARM
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Fuzzing|x64.ActiveCfg = Release|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|ARM.ActiveCfg = Release|ARM
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|ARM.Build.0 = Release|ARM
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|ARM64.Build.0 = Release|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|x64.ActiveCfg = Release|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|x64.Build.0 = Release|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|x86.ActiveCfg = Release|Win32
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.Release|x86.Build.0 = Release|Win32
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|ARM.Build.0 = Release|ARM
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|x64.ActiveCfg = Release|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|x64.Build.0 = Release|x64
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|x86.ActiveCfg = Release|Win32
 		{787EC629-C0FB-4BA9-9746-4A82CD06B73E}.TestRelease|x86.Build.0 = Release|Win32
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM.Build.0 = Debug|ARM
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM64.Build.0 = Debug|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x64.ActiveCfg = Debug|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x64.Build.0 = Debug|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x86.ActiveCfg = Debug|Win32
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x86.Build.0 = Debug|Win32
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|x64.ActiveCfg = Release|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM.ActiveCfg = Release|ARM
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM.Build.0 = Release|ARM
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM64.ActiveCfg = Release|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM64.Build.0 = Release|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x64.ActiveCfg = Release|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x64.Build.0 = Release|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x86.ActiveCfg = Release|Win32
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x86.Build.0 = Release|Win32
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM.Build.0 = Release|ARM
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x64.ActiveCfg = Release|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x64.Build.0 = Release|x64
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x86.ActiveCfg = Release|Win32
 		{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x86.Build.0 = Release|Win32
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM.ActiveCfg = Debug|ARM
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM.Build.0 = Debug|ARM
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM64.Build.0 = Debug|ARM64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|x64.ActiveCfg = Debug|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|x64.Build.0 = Debug|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|x86.ActiveCfg = Debug|Win32
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|x86.Build.0 = Debug|Win32
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|ARM.Build.0 = Fuzzing|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|ARM64.ActiveCfg = Fuzzing|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|x64.Build.0 = Fuzzing|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Fuzzing|x86.Build.0 = Fuzzing|Win32
-		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|ARM.ActiveCfg = Release|ARM
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|ARM.Build.0 = Release|ARM
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|ARM64.ActiveCfg = Release|ARM64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|ARM64.Build.0 = Release|ARM64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|x64.ActiveCfg = Release|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|x64.Build.0 = Release|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|x86.ActiveCfg = Release|Win32
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Release|x86.Build.0 = Release|Win32
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|ARM.Build.0 = Release|ARM
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|x64.ActiveCfg = Release|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|x64.Build.0 = Release|x64
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|x86.ActiveCfg = Release|Win32
 		{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.TestRelease|x86.Build.0 = Release|Win32
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|ARM.ActiveCfg = Debug|ARM
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|ARM.Build.0 = Debug|ARM
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|ARM64.Build.0 = Debug|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|x64.ActiveCfg = Debug|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|x64.Build.0 = Debug|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|x86.ActiveCfg = Debug|Win32
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Debug|x86.Build.0 = Debug|Win32
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Fuzzing|x64.ActiveCfg = Release|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|ARM.ActiveCfg = Release|ARM
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|ARM.Build.0 = Release|ARM
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|ARM64.ActiveCfg = Release|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|ARM64.Build.0 = Release|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|x64.ActiveCfg = Release|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|x64.Build.0 = Release|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|x86.ActiveCfg = Release|Win32
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.Release|x86.Build.0 = Release|Win32
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|ARM.Build.0 = Release|ARM
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|x64.ActiveCfg = Release|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|x64.Build.0 = Release|x64
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|x86.ActiveCfg = Release|Win32
 		{CA460806-5E41-4E97-9A3D-1D74B433B663}.TestRelease|x86.Build.0 = Release|Win32
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|x64.Build.0 = Debug|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Debug|x86.Build.0 = Debug|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|Any CPU
-		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|Any CPU
-		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|ARM.Build.0 = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|ARM64.Build.0 = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|x64.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|x64.Build.0 = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|x86.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.Release|x86.Build.0 = Release|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|ARM64.Build.0 = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|x64.Build.0 = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|x86.ActiveCfg = Release|Any CPU
 		{E8454BF1-2068-4513-A525-ABF55CC8742C}.TestRelease|x86.Build.0 = Release|Any CPU
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|ARM.ActiveCfg = Debug|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|ARM.Build.0 = Debug|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|ARM64.ActiveCfg = Debug|arm64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|ARM64.Build.0 = Debug|arm64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|x64.ActiveCfg = Debug|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|x64.Build.0 = Debug|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|x86.ActiveCfg = Debug|x86
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Debug|x86.Build.0 = Debug|x86
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Fuzzing|ARM.ActiveCfg = Release|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Fuzzing|ARM.Build.0 = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Fuzzing|ARM64.ActiveCfg = Release|arm64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Fuzzing|x64.ActiveCfg = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Fuzzing|x86.ActiveCfg = Release|x86
-		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|ARM64.ActiveCfg = Release|arm64
-		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|ARM.ActiveCfg = Release|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|ARM.Build.0 = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|ARM64.ActiveCfg = Release|arm64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|ARM64.Build.0 = Release|arm64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|x64.ActiveCfg = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|x64.Build.0 = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|x86.ActiveCfg = Release|x86
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.Release|x86.Build.0 = Release|x86
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|ARM.ActiveCfg = Release|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|ARM.Build.0 = Release|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|ARM64.ActiveCfg = Release|arm64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.TestRelease|ARM.ActiveCfg = Release|x64
+		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.TestRelease|ARM.Build.0 = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.TestRelease|ARM64.ActiveCfg = Release|arm64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.TestRelease|x64.ActiveCfg = Release|x64
 		{EE43C990-7789-4A60-B077-BF0ED3D093A1}.TestRelease|x86.ActiveCfg = Release|x86
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|ARM.Build.0 = Debug|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Debug|x86.Build.0 = Debug|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|Any CPU
-		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|Any CPU
-		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|ARM.ActiveCfg = Release|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|ARM.Build.0 = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|ARM64.Build.0 = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|x64.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|x64.Build.0 = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|x86.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.Release|x86.Build.0 = Release|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|ARM64.Build.0 = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x64.Build.0 = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x86.ActiveCfg = Release|Any CPU
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x86.Build.0 = Release|Any CPU
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|ARM.ActiveCfg = Debug|arm
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|ARM.Build.0 = Debug|arm
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|ARM64.ActiveCfg = Debug|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|ARM64.Build.0 = Debug|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x64.ActiveCfg = Debug|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x64.Build.0 = Debug|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x86.ActiveCfg = Debug|x86
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x86.Build.0 = Debug|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|ARM.ActiveCfg = Debug|arm
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|ARM.Build.0 = Debug|arm
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|ARM64.ActiveCfg = Release|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|x64.ActiveCfg = Release|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|x86.ActiveCfg = Release|x86
-		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|ARM64.ActiveCfg = Release|arm64
-		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|ARM.ActiveCfg = Release|arm
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|ARM.Build.0 = Release|arm
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|ARM64.ActiveCfg = Release|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|ARM64.Build.0 = Release|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x64.ActiveCfg = Release|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x64.Build.0 = Release|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x86.ActiveCfg = Release|x86
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x86.Build.0 = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|ARM.ActiveCfg = Release|arm
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|ARM.Build.0 = Release|arm
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|ARM64.ActiveCfg = Release|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|x64.ActiveCfg = Release|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.ReleaseStatic|x86.ActiveCfg = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|ARM.ActiveCfg = Release|arm
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|ARM.Build.0 = Release|arm
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|ARM64.ActiveCfg = Release|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|ARM64.Build.0 = Release|arm64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x64.ActiveCfg = Release|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x64.Build.0 = Release|x64
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x86.ActiveCfg = Release|x86
 		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x86.Build.0 = Release|x86
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|ARM.Build.0 = Debug|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|ARM.Build.0 = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|ARM64.Build.0 = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|x64.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|x64.Build.0 = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.Release|x86.Build.0 = Release|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{1F56BECB-D65D-4BBA-8788-6671B251392A}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{1F56BECB-D65D-4BBA-8788-6671B251392A}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|ARM.Build.0 = Debug|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|ARM.Build.0 = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|ARM64.Build.0 = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|x64.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|x64.Build.0 = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.Release|x86.Build.0 = Release|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{167F634B-A3AD-494E-8E67-B888103E35FF}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{167F634B-A3AD-494E-8E67-B888103E35FF}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|ARM.Build.0 = Debug|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|x64.Build.0 = Debug|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Debug|x86.Build.0 = Debug|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|ARM.Build.0 = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|ARM64.Build.0 = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|x64.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|x64.Build.0 = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|x86.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.Release|x86.Build.0 = Release|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{C54F80ED-B736-49B0-9BD3-662F57024D01}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{C54F80ED-B736-49B0-9BD3-662F57024D01}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|ARM.ActiveCfg = Debug|ARM
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|ARM.Build.0 = Debug|ARM
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|x64.ActiveCfg = Debug|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|x64.Build.0 = Debug|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|x86.ActiveCfg = Debug|Win32
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Debug|x86.Build.0 = Debug|Win32
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Fuzzing|x64.ActiveCfg = Release|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|ARM.ActiveCfg = Release|ARM
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|ARM.Build.0 = Release|ARM
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|ARM64.Build.0 = Release|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|x64.ActiveCfg = Release|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|x64.Build.0 = Release|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|x86.ActiveCfg = Release|Win32
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.Release|x86.Build.0 = Release|Win32
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|ARM.Build.0 = Release|ARM
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|x64.ActiveCfg = Release|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|x64.Build.0 = Release|x64
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|x86.ActiveCfg = Release|Win32
 		{2268D5AD-7F2A-485A-8C4B-C574497514C9}.TestRelease|x86.Build.0 = Release|Win32
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|ARM.Build.0 = Debug|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|x64.Build.0 = Debug|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Fuzzing|ARM.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Fuzzing|ARM.Build.0 = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
-		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|x64.ActiveCfg = Release|Any CPU
-		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|x86.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|ARM.Build.0 = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|ARM64.Build.0 = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|x64.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|x64.Build.0 = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|x86.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.Release|x86.Build.0 = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|ARM.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|ARM.Build.0 = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|ARM64.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|x64.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.ReleaseStatic|x86.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{52EC37D6-088C-40D3-AD0B-BDE8F8DAF9EB}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|ARM.Build.0 = Debug|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|x64.Build.0 = Debug|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Debug|x86.Build.0 = Debug|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Fuzzing|ARM.Build.0 = ReleaseStatic|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Fuzzing|ARM64.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Fuzzing|x64.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Fuzzing|x86.ActiveCfg = Release|Any CPU
-		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|Any CPU
-		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|Any CPU
-		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
-		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
-		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
-		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|ARM.ActiveCfg = Release|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|ARM.Build.0 = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|ARM64.Build.0 = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|x64.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|x64.Build.0 = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|x86.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.Release|x86.Build.0 = Release|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x64.Build.0 = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.TestRelease|ARM.ActiveCfg = Release|Any CPU
+		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.TestRelease|ARM.Build.0 = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.TestRelease|ARM64.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.TestRelease|x64.ActiveCfg = Release|Any CPU
 		{272B2B0E-40D4-4F0F-B187-519A6EF89B10}.TestRelease|x86.ActiveCfg = Release|Any CPU
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|ARM.ActiveCfg = Debug|ARM
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|ARM.Build.0 = Debug|ARM
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|ARM64.Build.0 = Debug|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|x64.ActiveCfg = Debug|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|x64.Build.0 = Debug|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|x86.ActiveCfg = Debug|Win32
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Debug|x86.Build.0 = Debug|Win32
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Fuzzing|ARM.ActiveCfg = Debug|ARM
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Fuzzing|ARM.Build.0 = Debug|ARM
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Fuzzing|x64.ActiveCfg = Release|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|ARM.ActiveCfg = Release|ARM
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|ARM.Build.0 = Release|ARM
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|ARM64.ActiveCfg = Release|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|ARM64.Build.0 = Release|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|x64.ActiveCfg = Release|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|x64.Build.0 = Release|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|x86.ActiveCfg = Release|Win32
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.Release|x86.Build.0 = Release|Win32
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|ARM.Build.0 = Release|ARM
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|x64.ActiveCfg = Release|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|x64.Build.0 = Release|x64
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|x86.ActiveCfg = Release|Win32
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4}.TestRelease|x86.Build.0 = Release|Win32
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|ARM.ActiveCfg = Debug|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|ARM.Build.0 = Debug|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|x64.ActiveCfg = Debug|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|x64.Build.0 = Debug|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|x86.ActiveCfg = Debug|Win32
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Debug|x86.Build.0 = Debug|Win32
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Fuzzing|ARM.ActiveCfg = ReleaseStatic|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Fuzzing|ARM.Build.0 = ReleaseStatic|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Fuzzing|x64.ActiveCfg = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Fuzzing|x86.ActiveCfg = Release|Win32
-		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
-		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
-		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
-		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
-		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
-		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|ARM.ActiveCfg = Release|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|ARM.Build.0 = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|ARM64.ActiveCfg = Release|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|ARM64.Build.0 = Release|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|x64.ActiveCfg = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|x64.Build.0 = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|x86.ActiveCfg = Release|Win32
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.Release|x86.Build.0 = Release|Win32
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|ARM.ActiveCfg = Release|x64
+		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|ARM.Build.0 = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|ARM64.ActiveCfg = Release|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|ARM64.Build.0 = Release|ARM64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|x64.ActiveCfg = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|x64.Build.0 = Release|x64
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|x86.ActiveCfg = Release|Win32
 		{0BA531C8-CF0C-405B-8221-0FE51BA529D1}.TestRelease|x86.Build.0 = Release|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|ARM.ActiveCfg = Debug|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|ARM.Build.0 = Debug|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|x64.ActiveCfg = Debug|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|x64.Build.0 = Debug|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|x86.ActiveCfg = Debug|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Debug|x86.Build.0 = Debug|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|ARM.Build.0 = Fuzzing|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|ARM64.ActiveCfg = Fuzzing|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|ARM64.Build.0 = Fuzzing|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|x64.Build.0 = Fuzzing|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Fuzzing|x86.Build.0 = Fuzzing|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|ARM.ActiveCfg = Release|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|ARM.Build.0 = Release|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|ARM64.Build.0 = Release|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|x64.ActiveCfg = Release|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|x64.Build.0 = Release|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|x86.ActiveCfg = Release|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.Release|x86.Build.0 = Release|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|ARM.ActiveCfg = ReleaseStatic|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|ARM.Build.0 = ReleaseStatic|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|ARM.ActiveCfg = Release|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|ARM.Build.0 = Release|ARM
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|ARM64.ActiveCfg = Release|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|ARM64.Build.0 = Release|ARM64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|x64.ActiveCfg = Release|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|x64.Build.0 = Release|x64
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|x86.ActiveCfg = Release|Win32
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA}.TestRelease|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1275,6 +1751,8 @@ Global
 		{5A52D9FC-0059-4A4A-8196-427A7AA0D1C5} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
 		{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
 		{76B26B2C-602A-4AD0-9736-4162D3FCA92A} = {1A5D7A7D-5CB2-47D5-B40D-4E61CAEDC798}
+		{13E55125-0ABF-4975-9B5B-DD6E5527D47F} = {800529ED-3374-49C4-BAD1-9B27647E4359}
+		{98920AB6-27B0-4C0F-B336-FA49DE57A1BA} = {13E55125-0ABF-4975-9B5B-DD6E5527D47F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B6FDB70C-A751-422C-ACD1-E35419495857}
diff --git a/src/Internal/Experiment/Experiment.cpp b/src/Internal/Experiment/Experiment.cpp
new file mode 100644
index 0000000000..36e92b35c2
--- /dev/null
+++ b/src/Internal/Experiment/Experiment.cpp
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "Experiment.h"
+
+namespace AppInstaller::Experiment
+{
+    bool IsEnabled(const std::string&, bool overrideResult)
+    {
+        return overrideResult;
+    }
+}
diff --git a/src/Internal/Experiment/Experiment.h b/src/Internal/Experiment/Experiment.h
new file mode 100644
index 0000000000..c909b6a0c0
--- /dev/null
+++ b/src/Internal/Experiment/Experiment.h
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+
+#include <string>
+
+namespace AppInstaller::Experiment
+{
+    bool IsEnabled(const std::string& experimentKey, bool overrideResult = false);
+}
diff --git a/src/Internal/Experiment/Experiment.vcxproj b/src/Internal/Experiment/Experiment.vcxproj
new file mode 100644
index 0000000000..7ab8865e4c
--- /dev/null
+++ b/src/Internal/Experiment/Experiment.vcxproj
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(MSBuildProjectDirectory)\Experiment.props" Condition="exists('$(MSBuildProjectDirectory)\Experiment.props')" />
+  <PropertyGroup Label="Globals">
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
+    <MinimalCoreWin>true</MinimalCoreWin>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{98920ab6-27b0-4c0f-b336-fa49de57a1ba}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Experiment</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Fuzzing|x64">
+      <Configuration>Fuzzing</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Fuzzing|Win32">
+      <Configuration>Fuzzing</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseStatic|ARM">
+      <Configuration>ReleaseStatic</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseStatic|ARM64">
+      <Configuration>ReleaseStatic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseStatic|Win32">
+      <Configuration>ReleaseStatic</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseStatic|x64">
+      <Configuration>ReleaseStatic</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='ReleaseStatic'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Fuzzing'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+    <EnableASAN>true</EnableASAN>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'" Label="Configuration">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'" Label="Configuration">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
+    <SpectreMitigation>Spectre</SpectreMitigation>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)x86\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)x86\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)x86\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Fuzzing|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Fuzzing|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)x86\$(Configuration)\$(ProjectName)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalOptions>%(AdditionalOptions) /permissive- /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</SDLCheck>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnablePREfast>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
+    </ClCompile>
+    <Link>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</SDLCheck>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnablePREfast>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
+    </ClCompile>
+    <Link>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatWarningAsError>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</SDLCheck>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</EnablePREfast>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</RuntimeTypeInfo>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='ReleaseStatic'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">true</TreatWarningAsError>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</SDLCheck>
+      <SDLCheck Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">true</SDLCheck>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">false</EnablePREfast>
+      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">MultiThreaded</RuntimeLibrary>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">false</RuntimeTypeInfo>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">Windows</SubSystem>
+      <SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Fuzzing'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD;WINGET_DISABLE_FOR_FUZZING;_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalOptions>%(AdditionalOptions) /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div</AdditionalOptions>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Fuzzing|x64'">false</RuntimeTypeInfo>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(WingetDisableTestHooks)'=='true'">
+    <ClCompile>
+      <PreprocessorDefinitions>AICLI_DISABLE_TEST_HOOKS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(WingetDisableExperimentalFeatures)'=='true'">
+    <ClCompile>
+      <PreprocessorDefinitions>WINGET_DISABLE_EXPERIMENTAL_FEATURES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(WingetEnableReleaseBuild)'=='true'">
+    <ClCompile>
+      <PreprocessorDefinitions>WINGET_ENABLE_RELEASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Experiment.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Experiment_internal.cpp" Condition="Exists('$(MSBuildProjectDirectory)\Experiment_internal.cpp')" />
+    <ClCompile Include="Experiment.cpp" Condition="!Exists('$(MSBuildProjectDirectory)\Experiment_internal.cpp')" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" Condition="Exists('$(MSBuildProjectDirectory)\packages.config')" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Internal/Experiment/Experiment.vcxproj.filters b/src/Internal/Experiment/Experiment.vcxproj.filters
new file mode 100644
index 0000000000..1c381b05ef
--- /dev/null
+++ b/src/Internal/Experiment/Experiment.vcxproj.filters
@@ -0,0 +1,36 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Experiment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Experiment_internal.cpp" Condition="Exists('$(MSBuildProjectDirectory)\Experiment_internal.cpp')">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Experiment.cpp" Condition="!Exists('$(MSBuildProjectDirectory)\Experiment_internal.cpp')">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" Condition="Exists('$(MSBuildProjectDirectory)\packages.config')" />
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 3e66324eec9b27ae9765c79799eee55ba79f37a8 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Wed, 13 Nov 2024 16:19:49 -0800
Subject: [PATCH 02/18] Init experiment

---
 doc/admx/DesktopAppInstaller.admx             | 10 +++
 doc/admx/en-US/DesktopAppInstaller.adml       |  6 ++
 .../Shared/Strings/en-us/winget.resw          |  3 +
 .../AppInstallerCommonCore.vcxproj            | 31 +++++----
 .../AppInstallerCommonCore.vcxproj.filters    |  6 ++
 src/AppInstallerCommonCore/Experiment.cpp     | 68 +++++++++++++++++++
 .../Public/winget/Experiment.h                | 40 +++++++++++
 .../Public/winget/UserSettings.h              |  8 ++-
 src/AppInstallerSharedLib/GroupPolicy.cpp     |  2 +
 .../Public/winget/GroupPolicy.h               |  1 +
 .../Public/winget/Resources.h                 |  1 +
 src/Internal/Experiment/Experiment.cpp        |  4 +-
 src/Internal/Experiment/Experiment.h          |  2 +-
 .../Extensions/EnumPolicyExtension.cs         |  4 +-
 .../PolicySettings/Enums.cs                   |  7 +-
 .../PolicySettings/TogglePolicy.cs            |  4 +-
 .../Resources/GroupPolicyResource.Designer.cs | 11 ++-
 .../Resources/GroupPolicyResource.resx        |  7 +-
 18 files changed, 192 insertions(+), 23 deletions(-)
 create mode 100644 src/AppInstallerCommonCore/Experiment.cpp
 create mode 100644 src/AppInstallerCommonCore/Public/winget/Experiment.h

diff --git a/doc/admx/DesktopAppInstaller.admx b/doc/admx/DesktopAppInstaller.admx
index c692c37061..154d4143c4 100644
--- a/doc/admx/DesktopAppInstaller.admx
+++ b/doc/admx/DesktopAppInstaller.admx
@@ -43,6 +43,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="EnableExperiments" class="Machine" displayName="$(string.EnableExperiments)" explainText="$(string.EnableExperimentsExplanation)" key="Software\Policies\Microsoft\Windows\AppInstaller" valueName="EnableExperiments">
+      <parentCategory ref="AppInstaller" />
+      <supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="EnableLocalManifestFiles" class="Machine" displayName="$(string.EnableLocalManifestFiles)" explainText="$(string.EnableLocalManifestFilesExplanation)" key="Software\Policies\Microsoft\Windows\AppInstaller" valueName="EnableLocalManifestFiles">
       <parentCategory ref="AppInstaller" />
       <supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />
diff --git a/doc/admx/en-US/DesktopAppInstaller.adml b/doc/admx/en-US/DesktopAppInstaller.adml
index 746b678784..033788fb80 100644
--- a/doc/admx/en-US/DesktopAppInstaller.adml
+++ b/doc/admx/en-US/DesktopAppInstaller.adml
@@ -25,6 +25,12 @@ If you disable this setting, users will not be able to change settings for the W
 If you enable or do not configure this setting, users will be able to enable experimental features for the Windows Package Manager.
 
 If you disable this setting, users will not be able to enable experimental features for the Windows Package Manager.</string>
+      <string id="EnableExperiments">Enable Windows Package Manager Experiments</string>
+      <string id="EnableExperimentsExplanation">This policy controls whether users can enable experiments in the Windows Package Manager.
+
+If you enable or do not configure this setting, users will be able to enable experiments for the Windows Package Manager.
+
+If you disable this setting, users will not be able to enable experiments for the Windows Package Manager.</string>
       <string id="EnableLocalManifestFiles">Enable Windows Package Manager Local Manifest Files</string>
       <string id="EnableLocalManifestFilesExplanation">This policy controls whether users can install packages with local manifest files.
 
diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
index e2c98bbf6d..76e1d077c0 100644
--- a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
+++ b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -897,6 +897,9 @@ They can be configured through the settings file 'winget settings'.</value>
   <data name="PolicyEnableExperimentalFeatures" xml:space="preserve">
     <value>Enable Windows App Installer Experimental Features</value>
   </data>
+  <data name="PolicyEnableExperiments" xml:space="preserve">
+    <value>Enable Windows App Installer Experiments</value>
+  </data>
   <data name="PolicyEnableMSStoreSource" xml:space="preserve">
     <value>Enable Windows App Installer Microsoft Store Source</value>
   </data>
diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj
index 927547fc8f..dfa906b614 100644
--- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj
+++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj
@@ -252,9 +252,9 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
@@ -278,7 +278,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</SDLCheck>
       <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnablePREfast>
@@ -294,10 +294,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>
@@ -331,10 +331,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</TreatWarningAsError>
@@ -372,7 +372,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD;WINGET_DISABLE_FOR_FUZZING;_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Public;$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerSharedLib;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\binver;$(ProjectDir)..\YamlCppLib\libyaml\include;$(ProjectDir)..\Internal;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\PureLib\pure;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -426,6 +426,7 @@
     <ClInclude Include="Public\AppInstallerArchitecture.h" />
     <ClInclude Include="Public\winget\Archive.h" />
     <ClInclude Include="Public\winget\ExperimentalFeature.h" />
+    <ClInclude Include="Public\winget\Experiment.h" />
     <ClInclude Include="Public\winget\ExtensionCatalog.h" />
     <ClInclude Include="Public\winget\Fonts.h" />
     <ClInclude Include="Public\winget\HttpClientHelper.h">
@@ -472,6 +473,7 @@
     <ClCompile Include="Debugging.cpp" />
     <ClCompile Include="DependenciesGraph.cpp" />
     <ClCompile Include="DODownloader.cpp" />
+    <ClCompile Include="Experiment.cpp" />
     <ClCompile Include="FileCache.cpp" />
     <ClCompile Include="FolderFileWatcher.cpp" />
     <ClCompile Include="Deployment.cpp" />
@@ -538,6 +540,9 @@
     <ProjectReference Include="..\AppInstallerSharedLib\AppInstallerSharedLib.vcxproj">
       <Project>{f3f6e699-bc5d-4950-8a05-e49dd9eb0d51}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\Internal\Experiment\Experiment.vcxproj">
+      <Project>{98920ab6-27b0-4c0f-b336-fa49de57a1ba}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters
index 1cb64a4d0e..d1e7bed1e1 100644
--- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters
+++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters
@@ -207,6 +207,9 @@
     <ClInclude Include="Public\winget\Fonts.h">
       <Filter>Public\winget</Filter>
     </ClInclude>
+    <ClInclude Include="Public\winget\Experiment.h">
+      <Filter>Public\winget</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -374,6 +377,9 @@
     <ClCompile Include="Fonts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Experiment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
new file mode 100644
index 0000000000..803f8b9f39
--- /dev/null
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -0,0 +1,68 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "winget/Experiment.h"
+#include "winget/UserSettings.h"
+#include "Experiment/Experiment.h"
+
+namespace AppInstaller::Settings
+{
+    namespace
+    {
+        bool IsEnabledInternal(Experiment::Key key, const UserSettings& userSettings)
+        {
+            if (key == Experiment::Key::None)
+            {
+                return true;
+            }
+
+            if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
+            {
+                AICLI_LOG(Core, Info, <<
+                    "Experiments '" << Experiment::GetExperiment(key).Name() <<
+                    "' is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
+                return false;
+            }
+
+            auto experiments = userSettings.Get<Setting::Experiments>();
+            auto experiment = Experiment::GetExperiment(key);
+            auto jsonName = std::string(experiment.JsonName());
+            if (experiments.find(jsonName) != experiments.end())
+            {
+                return experiments[jsonName];
+            }
+
+            return AppInstaller::Experiment::IsEnabled(experiment.GetKey());
+        }
+    }
+
+    bool Experiment::IsEnabled(Key key)
+    {
+        return IsEnabledInternal(key, User());
+    }
+
+    Experiment Experiment::GetExperiment(Key key)
+    {
+        switch (key)
+        {
+        case Key::CDN:
+            return Experiment{ "CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
+            
+        default:
+            THROW_HR(E_UNEXPECTED);
+        }
+    }
+
+    std::vector<Experiment> Experiment::GetAllExperiments()
+    {
+        std::vector<Experiment> result;
+
+        for (Key_t i = 0x1; i < static_cast<Key_t>(Key::Max); i = i << 1)
+        {
+            result.emplace_back(GetExperiment(static_cast<Key>(i)));
+        }
+
+        return result;
+    }
+}
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
new file mode 100644
index 0000000000..37f10cb8b8
--- /dev/null
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include <string>
+#include <type_traits>
+#include "AppInstallerStrings.h"
+
+namespace AppInstaller::Settings
+{
+    struct Experiment
+    {
+        enum class Key : unsigned
+        {
+            None = 0x0,
+            CDN = 0x1,
+            Max,
+        };
+
+        using Key_t = std::underlying_type_t<Key>;
+
+        Experiment(std::string_view name, std::string_view jsonName, std::string_view link, std::string key) :
+            m_name(name), m_jsonName(jsonName), m_link(link), m_key(key) {}
+
+        static bool IsEnabled(Key feature);
+
+        static Experiment GetExperiment(Experiment::Key key);
+        static std::vector<Experiment> GetAllExperiments();
+
+        std::string_view Name() const { return m_name; }
+        Utility::LocIndView JsonName() const { return m_jsonName; }
+        std::string_view Link() const { return m_link; }
+        std::string GetKey() const { return m_key; }
+
+    private:
+        std::string_view m_name;
+        Utility::LocIndView m_jsonName;
+        std::string_view m_link;
+        std::string m_key;
+    };
+}
diff --git a/src/AppInstallerCommonCore/Public/winget/UserSettings.h b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
index b580775c28..13d2304d8e 100644
--- a/src/AppInstallerCommonCore/Public/winget/UserSettings.h
+++ b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
@@ -110,6 +110,8 @@ namespace AppInstaller::Settings
         DownloadDefaultDirectory,
         // Interactivity
         InteractivityDisable,
+        // Experiments
+        Experiments,
 #ifndef AICLI_DISABLE_TEST_HOOKS
         // Debug
         EnableSelfInitiatedMinidump,
@@ -200,7 +202,11 @@ namespace AppInstaller::Settings
         SETTINGMAPPING_SPECIALIZATION(Setting::LoggingChannelPreference, std::vector<std::string>, Logging::Channel, Logging::Channel::Defaults, ".logging.channels"sv);
         // Interactivity
         SETTINGMAPPING_SPECIALIZATION(Setting::InteractivityDisable, bool, bool, false, ".interactivity.disable"sv);
-        
+
+        // Experiments
+        using Experiments_t = std::map<std::string, bool>;
+        SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, std::string, Experiments_t, {}, ".experiments"sv);
+
         // Used to deduce the SettingVariant type; making a variant that includes std::monostate and all SettingMapping types.
         template <size_t... I>
         inline auto Deduce(std::index_sequence<I...>) { return std::variant<std::monostate, typename SettingMapping<static_cast<Setting>(I)>::value_t...>{}; }
diff --git a/src/AppInstallerSharedLib/GroupPolicy.cpp b/src/AppInstallerSharedLib/GroupPolicy.cpp
index 862c1ccce4..1680e23eb7 100644
--- a/src/AppInstallerSharedLib/GroupPolicy.cpp
+++ b/src/AppInstallerSharedLib/GroupPolicy.cpp
@@ -326,6 +326,8 @@ namespace AppInstaller::Settings
             return TogglePolicy(policy, "EnableWindowsPackageManagerConfiguration"sv, String::PolicyEnableWinGetConfiguration);
         case TogglePolicy::Policy::ProxyCommandLineOptions:
             return TogglePolicy(policy, "EnableWindowsPackageManagerProxyCommandLineOptions"sv, String::PolicyEnableProxyCommandLineOptions);
+        case TogglePolicy::Policy::Experiments:
+            return TogglePolicy(policy, "EnableExperiments"sv, String::PolicyEnableExperiments);
         default:
             THROW_HR(E_UNEXPECTED);
         }
diff --git a/src/AppInstallerSharedLib/Public/winget/GroupPolicy.h b/src/AppInstallerSharedLib/Public/winget/GroupPolicy.h
index 850526f60c..06625b2750 100644
--- a/src/AppInstallerSharedLib/Public/winget/GroupPolicy.h
+++ b/src/AppInstallerSharedLib/Public/winget/GroupPolicy.h
@@ -47,6 +47,7 @@ namespace AppInstaller::Settings
             WinGetCommandLineInterfaces,
             Configuration,
             ProxyCommandLineOptions,
+            Experiments,
             Max,
         };
 
diff --git a/src/AppInstallerSharedLib/Public/winget/Resources.h b/src/AppInstallerSharedLib/Public/winget/Resources.h
index dc6591abd0..2253a51295 100644
--- a/src/AppInstallerSharedLib/Public/winget/Resources.h
+++ b/src/AppInstallerSharedLib/Public/winget/Resources.h
@@ -60,6 +60,7 @@ namespace AppInstaller
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableWindowsPackageManagerCommandLineInterfaces);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableWinGetConfiguration);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableProxyCommandLineOptions);
+            WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableExperiments);
 
             WINGET_DEFINE_RESOURCE_STRINGID(SettingsWarningInvalidFieldFormat);
             WINGET_DEFINE_RESOURCE_STRINGID(SettingsWarningInvalidFieldValue);
diff --git a/src/Internal/Experiment/Experiment.cpp b/src/Internal/Experiment/Experiment.cpp
index 36e92b35c2..b2a3d166df 100644
--- a/src/Internal/Experiment/Experiment.cpp
+++ b/src/Internal/Experiment/Experiment.cpp
@@ -5,8 +5,8 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string&, bool overrideResult)
+    bool IsEnabled(const std::string&)
     {
-        return overrideResult;
+        return true;
     }
 }
diff --git a/src/Internal/Experiment/Experiment.h b/src/Internal/Experiment/Experiment.h
index c909b6a0c0..9d52cef764 100644
--- a/src/Internal/Experiment/Experiment.h
+++ b/src/Internal/Experiment/Experiment.h
@@ -6,5 +6,5 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string& experimentKey, bool overrideResult = false);
+    bool IsEnabled(const std::string& experimentKey);
 }
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs
index 08dc136e03..a841e2ed60 100644
--- a/src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs
+++ b/src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs
@@ -1,4 +1,4 @@
-﻿// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="EnumPolicyExtension.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -50,6 +50,8 @@ public static string GetResourceString(this Policy policy)
                     return GroupPolicyResource.PolicyEnableWindowsPackageManagerCommandLineInterfaces;
                 case Policy.Configuration:
                     return GroupPolicyResource.PolicyEnableWinGetConfiguration;
+                case Policy.Experiments:
+                    return GroupPolicyResource.PolicyEnableExperiments;
                 default:
                     return string.Empty;
             }
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs
index d4121f040d..cd2766b290 100644
--- a/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs
+++ b/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs
@@ -1,4 +1,4 @@
-﻿// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="Enums.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -96,6 +96,11 @@ public enum Policy
         /// Enabled configuration.
         /// </summary>
         Configuration,
+
+        /// <summary>
+        /// Enabled experiments.
+        /// </summary>
+        Experiments,
     }
 
     /// <summary>
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs
index 481d80e2a9..073f183b1b 100644
--- a/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs
+++ b/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs
@@ -1,4 +1,4 @@
-﻿// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="TogglePolicy.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -125,6 +125,8 @@ internal static TogglePolicy Create(Policy policy)
                     return new TogglePolicy(policy, "EnableWindowsPackageManagerCommandLineInterfaces", GroupPolicyResource.PolicyEnableWindowsPackageManagerCommandLineInterfaces);
                 case Policy.Configuration:
                     return new TogglePolicy(policy, "EnableWindowsPackageManagerConfiguration", GroupPolicyResource.PolicyEnableWinGetConfiguration);
+                case Policy.Experiments:
+                    return new TogglePolicy(policy, "EnableExperiments", GroupPolicyResource.PolicyEnableExperiments);
                 default:
                     throw new ArgumentException(null, nameof(policy));
             }
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.Designer.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.Designer.cs
index 13d57659f4..93791a0c0b 100644
--- a/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.Designer.cs
+++ b/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.Designer.cs
@@ -1,4 +1,4 @@
-﻿//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -114,6 +114,15 @@ internal static string PolicyEnableExperimentalFeatures {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enable Windows App Installer Experiments.
+        /// </summary>
+        internal static string PolicyEnableExperiments {
+            get {
+                return ResourceManager.GetString("PolicyEnableExperiments", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enable Windows App Installer Hash Override.
         /// </summary>
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx b/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx
index 60d79c6e0f..564afd613d 100644
--- a/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx
+++ b/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx
@@ -1,4 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -135,6 +135,9 @@
   <data name="PolicyEnableExperimentalFeatures" xml:space="preserve">
     <value>Enable Windows App Installer Experimental Features</value>
   </data>
+  <data name="PolicyEnableExperiments" xml:space="preserve">
+    <value>Enable Windows App Installer Experiments</value>
+  </data>
   <data name="PolicyEnableHashOverride" xml:space="preserve">
     <value>Enable Windows App Installer Hash Override</value>
   </data>
@@ -168,4 +171,4 @@
   <data name="PolicyNotFound" xml:space="preserve">
     <value>Error occurred when retrieving policy settings for the Group Policy : {0}</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From e9d77e98e69267ced698e4fdb7da3a1d95acb7a8 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:15:37 -0800
Subject: [PATCH 03/18] Add template

---
 .../Public/winget/UserSettings.h              |  2 +-
 src/AppInstallerCommonCore/UserSettings.cpp   | 27 +++++++++++++++++++
 src/AppInstallerSharedLib/JsonUtil.cpp        | 21 +++++++++++++++
 .../Public/winget/JsonUtil.h                  |  3 +++
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/AppInstallerCommonCore/Public/winget/UserSettings.h b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
index 13d2304d8e..ff3cb24373 100644
--- a/src/AppInstallerCommonCore/Public/winget/UserSettings.h
+++ b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
@@ -205,7 +205,7 @@ namespace AppInstaller::Settings
 
         // Experiments
         using Experiments_t = std::map<std::string, bool>;
-        SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, std::string, Experiments_t, {}, ".experiments"sv);
+        SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, Experiments_t, Experiments_t, {}, ".experiments"sv);
 
         // Used to deduce the SettingVariant type; making a variant that includes std::monostate and all SettingMapping types.
         template <size_t... I>
diff --git a/src/AppInstallerCommonCore/UserSettings.cpp b/src/AppInstallerCommonCore/UserSettings.cpp
index 9e13610537..b30882ddaa 100644
--- a/src/AppInstallerCommonCore/UserSettings.cpp
+++ b/src/AppInstallerCommonCore/UserSettings.cpp
@@ -75,6 +75,32 @@ namespace AppInstaller::Settings
             return convertedValue;
         }
 
+        template<>
+        std::string GetValueString(std::map<std::string, bool> value)
+        {
+            std::stringstream convertedValue;
+            convertedValue << "{";
+
+            bool first = true;
+            for (auto const& entry : value)
+            {
+                if (first)
+                {
+                    first = false;
+                }
+                else
+                {
+                    convertedValue << ", ";
+                }
+
+                convertedValue << "'" << entry.first << "' = " << entry.second;
+            }
+
+            convertedValue << "}";
+
+            return convertedValue.str();
+        }
+
         std::optional<Json::Value> ParseSettingsContent(const std::string& content, std::string_view settingName, std::vector<UserSettings::Warning>& warnings)
         {
             Json::Value root;
@@ -278,6 +304,7 @@ namespace AppInstaller::Settings
         WINGET_VALIDATE_PASS_THROUGH(UninstallPurgePortablePackage)
         WINGET_VALIDATE_PASS_THROUGH(NetworkWingetAlternateSourceURL)
         WINGET_VALIDATE_PASS_THROUGH(MaxResumes)
+        WINGET_VALIDATE_PASS_THROUGH(Experiments)
 
 #ifndef AICLI_DISABLE_TEST_HOOKS
         WINGET_VALIDATE_PASS_THROUGH(EnableSelfInitiatedMinidump)
diff --git a/src/AppInstallerSharedLib/JsonUtil.cpp b/src/AppInstallerSharedLib/JsonUtil.cpp
index 00d598b9db..4373c6de96 100644
--- a/src/AppInstallerSharedLib/JsonUtil.cpp
+++ b/src/AppInstallerSharedLib/JsonUtil.cpp
@@ -67,6 +67,27 @@ namespace AppInstaller::JSON
 
         return std::nullopt;
     }
+
+    template<>
+    std::optional<std::map<std::string, bool>> GetValue(const Json::Value& node)
+    {
+        std::map<std::string, bool> result;
+
+        if (node.isObject())
+        {
+            for (const auto& entry : node.getMemberNames())
+            {
+                if (node[entry].isBool())
+                {
+                    result[entry] = node[entry].asBool();
+                }
+            }
+
+            return result;
+        }
+
+        return std::nullopt;
+    }
 
 #ifndef WINGET_DISABLE_FOR_FUZZING
     utility::string_t GetUtilityString(std::string_view nodeName)
diff --git a/src/AppInstallerSharedLib/Public/winget/JsonUtil.h b/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
index f433417e18..5d77ef0e2f 100644
--- a/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
+++ b/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
@@ -33,6 +33,9 @@ namespace AppInstaller::JSON
 
     template<>
     std::optional<std::vector<std::string>> GetValue<std::vector<std::string>>(const Json::Value& node);
+
+    template<>
+    std::optional<std::map<std::string, bool>> GetValue(const Json::Value& node);
 
 #ifndef WINGET_DISABLE_FOR_FUZZING
     // For cpprestsdk JSON

From f95c26c48ba2e8983529c33fa8f8ecce99bd4be3 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:58:07 -0800
Subject: [PATCH 04/18] Added logs

---
 src/AppInstallerCommonCore/Experiment.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 803f8b9f39..64eac7bc38 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -20,8 +20,8 @@ namespace AppInstaller::Settings
             if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
             {
                 AICLI_LOG(Core, Info, <<
-                    "Experiments '" << Experiment::GetExperiment(key).Name() <<
-                    "' is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
+                    "Experiment " << Experiment::GetExperiment(key).Name() <<
+                    " is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
                 return false;
             }
 
@@ -30,10 +30,18 @@ namespace AppInstaller::Settings
             auto jsonName = std::string(experiment.JsonName());
             if (experiments.find(jsonName) != experiments.end())
             {
-                return experiments[jsonName];
+                auto isEnabled = experiments[jsonName];
+                AICLI_LOG(Core, Info, <<
+                    "Experiment " << Experiment::GetExperiment(key).Name() <<
+                    " is set to " << isEnabled << " in user settings");
+                return isEnabled;
             }
 
-            return AppInstaller::Experiment::IsEnabled(experiment.GetKey());
+            auto isEnabled = AppInstaller::Experiment::IsEnabled(experiment.GetKey());
+            AICLI_LOG(Core, Info, <<
+                "Experiment " << Experiment::GetExperiment(key).Name() <<
+                " is set to " << isEnabled);
+            return isEnabled;
         }
     }
 

From 1d7fcd0d1214a70499dbc0c47aecf6ef5fc5e44b Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Mon, 2 Dec 2024 17:07:09 -0800
Subject: [PATCH 05/18] Add CDN exp

---
 src/AppInstallerCommonCore/Experiment.cpp      | 12 +++++++++++-
 .../Public/AppInstallerTelemetry.h             |  2 ++
 .../Public/winget/Experiment.h                 |  2 ++
 src/AppInstallerRepositoryCore/SourceList.cpp  | 18 +++++++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 64eac7bc38..b934df5216 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -45,9 +45,19 @@ namespace AppInstaller::Settings
         }
     }
 
+    // Define static members
+    std::map<Experiment::Key, bool> Experiment::m_isEnabledCache;
+    std::mutex Experiment::m_mutex;
+
     bool Experiment::IsEnabled(Key key)
     {
-        return IsEnabledInternal(key, User());
+        std::lock_guard lock(m_mutex);
+        if (m_isEnabledCache.find(key) == m_isEnabledCache.end())
+        {
+            m_isEnabledCache[key] = IsEnabledInternal(key, User());
+        }
+
+        return m_isEnabledCache[key];
     }
 
     Experiment Experiment::GetExperiment(Key key)
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
index 9d7452e0ff..1ff5962426 100644
--- a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
+++ b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
@@ -128,6 +128,8 @@ namespace AppInstaller::Logging
         // LogNonFatalDOError
         std::string DOUrl;
         HRESULT DOHResult = S_OK;
+
+        // TODO Add experiments telemetry
     };
 
     // This type contains the registration lifetime of the telemetry trace logging provider.
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 37f10cb8b8..ea6ac149ea 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -36,5 +36,7 @@ namespace AppInstaller::Settings
         Utility::LocIndView m_jsonName;
         std::string_view m_link;
         std::string m_key;
+        static std::map<Key, bool> m_isEnabledCache;
+        static std::mutex m_mutex;
     };
 }
diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
index 1eb0e8ba95..37fa778dbe 100644
--- a/src/AppInstallerRepositoryCore/SourceList.cpp
+++ b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -8,6 +8,7 @@
 
 #include <winget/AdminSettings.h>
 #include <winget/Certificates.h>
+#include <winget/Experiment.h>
 #include <CertificateResources.h>
 
 using namespace AppInstaller::Settings;
@@ -36,6 +37,7 @@ namespace AppInstaller::Repository
 
         constexpr std::string_view s_Source_WingetCommunityDefault_Name = "winget"sv;
         constexpr std::string_view s_Source_WingetCommunityDefault_Arg = "https://cdn.winget.microsoft.com/cache"sv;
+        constexpr std::string_view s_Source_WingetCommunityExperimental_Arg = "https://cdn2.winget.microsoft.com/cache"sv;
         constexpr std::string_view s_Source_WingetCommunityDefault_Data = "Microsoft.Winget.Source_8wekyb3d8bbwe"sv;
         constexpr std::string_view s_Source_WingetCommunityDefault_Identifier = "Microsoft.Winget.Source_8wekyb3d8bbwe"sv;
 
@@ -207,6 +209,16 @@ namespace AppInstaller::Repository
         {
             return details.IsTombstone || details.Origin == SourceOrigin::Metadata || !details.IsVisible;
         }
+
+        std::string_view GetWingetCommunitySource()
+        {
+            if (Settings::Experiment::IsEnabled(Settings::Experiment::Key::CDN))
+            {
+                return s_Source_WingetCommunityExperimental_Arg;
+            }
+
+            return s_Source_WingetCommunityDefault_Arg;
+        }
     }
 
     void SourceDetailsInternal::CopyMetadataFieldsTo(SourceDetailsInternal& target)
@@ -251,7 +263,7 @@ namespace AppInstaller::Repository
         switch (source)
         {
         case WellKnownSource::WinGet:
-            return s_Source_WingetCommunityDefault_Arg;
+            return GetWingetCommunitySource();
         case WellKnownSource::MicrosoftStore:
             return s_Source_MSStoreDefault_Arg;
         case WellKnownSource::DesktopFrameworks:
@@ -278,7 +290,7 @@ namespace AppInstaller::Repository
 
     std::optional<WellKnownSource> CheckForWellKnownSourceMatch(std::string_view name, std::string_view arg, std::string_view type)
     {
-        if (name == s_Source_WingetCommunityDefault_Name && arg == s_Source_WingetCommunityDefault_Arg && type == Microsoft::PreIndexedPackageSourceFactory::Type())
+        if (name == s_Source_WingetCommunityDefault_Name && arg == GetWingetCommunitySource() && type == Microsoft::PreIndexedPackageSourceFactory::Type())
         {
             return WellKnownSource::WinGet;
         }
@@ -306,7 +318,7 @@ namespace AppInstaller::Repository
             details.Origin = SourceOrigin::Default;
             details.Name = s_Source_WingetCommunityDefault_Name;
             details.Type = Microsoft::PreIndexedPackageSourceFactory::Type();
-            details.Arg = s_Source_WingetCommunityDefault_Arg;
+            details.Arg = GetWingetCommunitySource();
             details.Data = s_Source_WingetCommunityDefault_Data;
             details.Identifier = s_Source_WingetCommunityDefault_Identifier;
             details.TrustLevel = SourceTrustLevel::Trusted | SourceTrustLevel::StoreOrigin;

From 1720e20ff1dabf110c758861e004c62ad54645fc Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Tue, 3 Dec 2024 14:12:28 -0800
Subject: [PATCH 06/18] Added UT

---
 .../AppInstallerCLITests.vcxproj              |  1 +
 .../AppInstallerCLITests.vcxproj.filters      |  3 +
 src/AppInstallerCLITests/Experiment.cpp       | 76 +++++++++++++++++++
 src/AppInstallerCLITests/GroupPolicy.cpp      |  1 +
 src/AppInstallerCLITests/TestSettings.h       |  3 +-
 src/AppInstallerCommonCore/Experiment.cpp     | 12 ++-
 .../Public/winget/Experiment.h                |  5 ++
 src/Internal/Experiment/Experiment.cpp        | 15 +++-
 8 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 src/AppInstallerCLITests/Experiment.cpp

diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
index 7500b2c1bb..bbbd089e74 100644
--- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
+++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
@@ -279,6 +279,7 @@
     <ClCompile Include="Downloader.cpp" />
     <ClCompile Include="DownloadFlow.cpp" />
     <ClCompile Include="Errors.cpp" />
+    <ClCompile Include="Experiment.cpp" />
     <ClCompile Include="ExperimentalFeature.cpp" />
     <ClCompile Include="ExportFlow.cpp" />
     <ClCompile Include="FileCache.cpp" />
diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
index 5d28140d17..4463aea5f5 100644
--- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
+++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
@@ -371,6 +371,9 @@
     <ClCompile Include="Fonts.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
+    <ClCompile Include="Experiment.cpp">
+      <Filter>Source Files\Repository</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />
diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
new file mode 100644
index 0000000000..b8b5b6e25c
--- /dev/null
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -0,0 +1,76 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "TestCommon.h"
+#include "TestSettings.h"
+#include <winget/Experiment.h>
+#include <AppInstallerStrings.h>
+
+using namespace TestCommon;
+using namespace AppInstaller::Settings;
+
+#define SET_POLICY_STATE(_policy_, _state_) \
+    GroupPolicyTestOverride policies; \
+    policies.SetState(_policy_, _state_);
+
+#define SET_USER_SETTINGS(_enabled_, _disabled_) \
+    TestUserSettings settings; \
+    settings.Set<Setting::Experiments>({ \
+        {"TestExperimentEnabledByDefault", _enabled_}, \
+        {"TestExperimentDisabledByDefault", _disabled_} \
+    });
+
+#define ASSERT_EXPERIMENTS(_enabled_, _disabled_) \
+    REQUIRE(_enabled_ == Experiment::IsEnabled(Experiment::Key::TestExperimentEnabledByDefault)); \
+    REQUIRE(_disabled_ == Experiment::IsEnabled(Experiment::Key::TestExperimentDisabledByDefault));
+
+TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
+{
+    SECTION("Not configured")
+    {
+        SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::NotConfigured);
+        ASSERT_EXPERIMENTS(true, false);
+    }
+
+    SECTION("Enabled")
+    {
+        SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
+        ASSERT_EXPERIMENTS(true, false);
+    }
+
+    SECTION("Disabled")
+    {
+        SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
+        ASSERT_EXPERIMENTS(false, false);
+    }
+}
+
+TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
+{
+    // If the policy is disabled, then also the user settings should be ignored.
+    SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
+    SET_USER_SETTINGS(true, true);
+    ASSERT_EXPERIMENTS(false, false);
+}
+
+TEST_CASE("Experiment_UserSettingsControl", "[experiment]")
+{
+    SECTION("Experiments not configured in user settings")
+    {
+        // Default values are used
+        ASSERT_EXPERIMENTS(true, false);
+    }
+
+    SECTION("Experiments enabled in user settings")
+    {
+        SET_USER_SETTINGS(true, true);
+        ASSERT_EXPERIMENTS(true, true);
+    }
+
+    SECTION("Experiments disabled in user settings")
+    {
+        SET_USER_SETTINGS(false, false);
+        ASSERT_EXPERIMENTS(false, false);
+    }
+}
diff --git a/src/AppInstallerCLITests/GroupPolicy.cpp b/src/AppInstallerCLITests/GroupPolicy.cpp
index 907c55969e..1ad1ead717 100644
--- a/src/AppInstallerCLITests/GroupPolicy.cpp
+++ b/src/AppInstallerCLITests/GroupPolicy.cpp
@@ -402,6 +402,7 @@ TEST_CASE("GroupPolicy_AllEnabled", "[groupPolicy]")
     SetRegistryValue(policiesKey.get(), EnableWindowsPackageManagerCommandLineInterfaces, 1);
     SetRegistryValue(policiesKey.get(), ConfigurationPolicyValueName, 1);
     SetRegistryValue(policiesKey.get(), ProxyCommandLineOptionsPolicyValueName, 1);
+    SetRegistryValue(policiesKey.get(), EnableExperimentsPolicyValueName , 1);
 
     GroupPolicy groupPolicy{ policiesKey.get() };
     for (const auto& policy : TogglePolicy::GetAllPolicies())
diff --git a/src/AppInstallerCLITests/TestSettings.h b/src/AppInstallerCLITests/TestSettings.h
index 7da1a728ef..f100a9f0b2 100644
--- a/src/AppInstallerCLITests/TestSettings.h
+++ b/src/AppInstallerCLITests/TestSettings.h
@@ -23,6 +23,7 @@ namespace TestCommon
     const std::wstring EnableWindowsPackageManagerCommandLineInterfaces = L"EnableWindowsPackageManagerCommandLineInterfaces";
     const std::wstring ConfigurationPolicyValueName = L"EnableWindowsPackageManagerConfiguration";
     const std::wstring ProxyCommandLineOptionsPolicyValueName = L"EnableWindowsPackageManagerProxyCommandLineOptions";
+    const std::wstring EnableExperimentsPolicyValueName = L"EnableExperiments";
 
     const std::wstring SourceUpdateIntervalPolicyValueName = L"SourceAutoUpdateInterval";
     const std::wstring SourceUpdateIntervalPolicyOldValueName = L"SourceAutoUpdateIntervalInMinutes";
@@ -90,4 +91,4 @@ namespace TestCommon
     };
 
 #define REQUIRE_POLICY_EXCEPTION(_expr_, _policy_)     REQUIRE_THROWS_MATCHES(_expr_, AppInstaller::Settings::GroupPolicyException, TestCommon::GroupPolicyExceptionMatcher(_policy_))
-}
\ No newline at end of file
+}
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index b934df5216..0ecb71a707 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -52,6 +52,11 @@ namespace AppInstaller::Settings
     bool Experiment::IsEnabled(Key key)
     {
         std::lock_guard lock(m_mutex);
+
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        m_isEnabledCache.clear();
+#endif
+
         if (m_isEnabledCache.find(key) == m_isEnabledCache.end())
         {
             m_isEnabledCache[key] = IsEnabledInternal(key, User());
@@ -66,7 +71,12 @@ namespace AppInstaller::Settings
         {
         case Key::CDN:
             return Experiment{ "CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
-            
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        case Key::TestExperimentDisabledByDefault:
+            return Experiment{ "Test experiment disabled by default", "TestExperimentDisabledByDefault", "https://aka.ms/winget-settings", "TestExperimentDisabledByDefault" };
+        case Key::TestExperimentEnabledByDefault:
+            return Experiment{ "Test experiment enabled by default", "TestExperimentEnabledByDefault", "https://aka.ms/winget-settings", "TestExperimentEnabledByDefault" };
+#endif
         default:
             THROW_HR(E_UNEXPECTED);
         }
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index ea6ac149ea..42c30d8398 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -14,6 +14,11 @@ namespace AppInstaller::Settings
             None = 0x0,
             CDN = 0x1,
             Max,
+
+#ifndef AICLI_DISABLE_TEST_HOOKS
+            TestExperimentDisabledByDefault = 0xFFFFFFFE,
+            TestExperimentEnabledByDefault = 0xFFFFFFFF,
+#endif
         };
 
         using Key_t = std::underlying_type_t<Key>;
diff --git a/src/Internal/Experiment/Experiment.cpp b/src/Internal/Experiment/Experiment.cpp
index b2a3d166df..dc4316c85b 100644
--- a/src/Internal/Experiment/Experiment.cpp
+++ b/src/Internal/Experiment/Experiment.cpp
@@ -5,8 +5,19 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string&)
+    bool IsEnabled(const std::string& key)
     {
-        return true;
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        if (key == "TestExperimentEnabledByDefault")
+        {
+            return true;
+        }
+
+        if (key == "TestExperimentDisabledByDefault")
+        {
+            return false;
+        }
+#endif
+        return false;
     }
 }

From 207272142fb435682323e39c70b869edf8ce1c71 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:02:13 -0800
Subject: [PATCH 07/18] Store the toggle source

---
 src/AppInstallerCLITests/Experiment.cpp       | 34 +++++++++----------
 src/AppInstallerCommonCore/Experiment.cpp     | 28 +++++++--------
 .../Public/winget/Experiment.h                | 28 +++++++++++----
 src/AppInstallerRepositoryCore/SourceList.cpp |  2 +-
 src/Internal/Experiment/Experiment.cpp        |  7 +---
 5 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index b8b5b6e25c..b861a97943 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -14,35 +14,35 @@ using namespace AppInstaller::Settings;
     GroupPolicyTestOverride policies; \
     policies.SetState(_policy_, _state_);
 
-#define SET_USER_SETTINGS(_enabled_, _disabled_) \
+#define SET_USER_SETTINGS(_value_) \
     TestUserSettings settings; \
     settings.Set<Setting::Experiments>({ \
-        {"TestExperimentEnabledByDefault", _enabled_}, \
-        {"TestExperimentDisabledByDefault", _disabled_} \
+        {"TestExperiment", _value_} \
     });
 
-#define ASSERT_EXPERIMENTS(_enabled_, _disabled_) \
-    REQUIRE(_enabled_ == Experiment::IsEnabled(Experiment::Key::TestExperimentEnabledByDefault)); \
-    REQUIRE(_disabled_ == Experiment::IsEnabled(Experiment::Key::TestExperimentDisabledByDefault));
+#define ASSERT_EXPERIMENT(_isEnabled_, _toggleSource_) \
+    auto testExperimentState = Experiment::GetState(Experiment::Key::TestExperiment); \
+    REQUIRE(_isEnabled_ == testExperimentState.IsEnabled()); \
+    REQUIRE(_toggleSource_ == testExperimentState.ToggleSource());
 
 TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 {
     SECTION("Not configured")
     {
         SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::NotConfigured);
-        ASSERT_EXPERIMENTS(true, false);
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Enabled")
     {
         SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
-        ASSERT_EXPERIMENTS(true, false);
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Disabled")
     {
         SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
-        ASSERT_EXPERIMENTS(false, false);
+        ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
     }
 }
 
@@ -50,27 +50,27 @@ TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
 {
     // If the policy is disabled, then also the user settings should be ignored.
     SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
-    SET_USER_SETTINGS(true, true);
-    ASSERT_EXPERIMENTS(false, false);
+    SET_USER_SETTINGS(true);
+    ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
 }
 
 TEST_CASE("Experiment_UserSettingsControl", "[experiment]")
 {
     SECTION("Experiments not configured in user settings")
     {
-        // Default values are used
-        ASSERT_EXPERIMENTS(true, false);
+        // Default value are used
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Experiments enabled in user settings")
     {
-        SET_USER_SETTINGS(true, true);
-        ASSERT_EXPERIMENTS(true, true);
+        SET_USER_SETTINGS(true);
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSetting);
     }
 
     SECTION("Experiments disabled in user settings")
     {
-        SET_USER_SETTINGS(false, false);
-        ASSERT_EXPERIMENTS(false, false);
+        SET_USER_SETTINGS(false);
+        ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSetting);
     }
 }
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 0ecb71a707..9b01743a72 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -10,11 +10,11 @@ namespace AppInstaller::Settings
 {
     namespace
     {
-        bool IsEnabledInternal(Experiment::Key key, const UserSettings& userSettings)
+        ExperimentState GetExperimentStateInternal(Experiment::Key key, const UserSettings& userSettings)
         {
             if (key == Experiment::Key::None)
             {
-                return true;
+                return { true, ExperimentToggleSource::Default };
             }
 
             if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
@@ -22,7 +22,7 @@ namespace AppInstaller::Settings
                 AICLI_LOG(Core, Info, <<
                     "Experiment " << Experiment::GetExperiment(key).Name() <<
                     " is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
-                return false;
+                return { false, ExperimentToggleSource::Policy };
             }
 
             auto experiments = userSettings.Get<Setting::Experiments>();
@@ -34,35 +34,35 @@ namespace AppInstaller::Settings
                 AICLI_LOG(Core, Info, <<
                     "Experiment " << Experiment::GetExperiment(key).Name() <<
                     " is set to " << isEnabled << " in user settings");
-                return isEnabled;
+                return { isEnabled, ExperimentToggleSource::UserSetting };
             }
 
             auto isEnabled = AppInstaller::Experiment::IsEnabled(experiment.GetKey());
             AICLI_LOG(Core, Info, <<
                 "Experiment " << Experiment::GetExperiment(key).Name() <<
                 " is set to " << isEnabled);
-            return isEnabled;
+            return { isEnabled, ExperimentToggleSource::Default };
         }
     }
 
     // Define static members
-    std::map<Experiment::Key, bool> Experiment::m_isEnabledCache;
+    std::map<Experiment::Key, ExperimentState> Experiment::m_experimentStateCache;
     std::mutex Experiment::m_mutex;
 
-    bool Experiment::IsEnabled(Key key)
+    ExperimentState Experiment::GetState(Key key)
     {
         std::lock_guard lock(m_mutex);
 
 #ifndef AICLI_DISABLE_TEST_HOOKS
-        m_isEnabledCache.clear();
+        m_experimentStateCache.clear();
 #endif
 
-        if (m_isEnabledCache.find(key) == m_isEnabledCache.end())
+        if (m_experimentStateCache.find(key) == m_experimentStateCache.end())
         {
-            m_isEnabledCache[key] = IsEnabledInternal(key, User());
+            m_experimentStateCache[key] = GetExperimentStateInternal(key, User());
         }
 
-        return m_isEnabledCache[key];
+        return m_experimentStateCache[key];
     }
 
     Experiment Experiment::GetExperiment(Key key)
@@ -72,10 +72,8 @@ namespace AppInstaller::Settings
         case Key::CDN:
             return Experiment{ "CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
 #ifndef AICLI_DISABLE_TEST_HOOKS
-        case Key::TestExperimentDisabledByDefault:
-            return Experiment{ "Test experiment disabled by default", "TestExperimentDisabledByDefault", "https://aka.ms/winget-settings", "TestExperimentDisabledByDefault" };
-        case Key::TestExperimentEnabledByDefault:
-            return Experiment{ "Test experiment enabled by default", "TestExperimentEnabledByDefault", "https://aka.ms/winget-settings", "TestExperimentEnabledByDefault" };
+        case Key::TestExperiment:
+            return Experiment{ "Test experiment", "TestExperiment", "https://aka.ms/winget-settings", "TestExperiment" };
 #endif
         default:
             THROW_HR(E_UNEXPECTED);
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 42c30d8398..f8def7177f 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -7,6 +7,24 @@
 
 namespace AppInstaller::Settings
 {
+    enum ExperimentToggleSource
+    {
+        Default,
+        Policy,
+        UserSetting
+    };
+
+    struct ExperimentState
+    {
+        ExperimentState() = default;
+        ExperimentState(bool isEnabled, ExperimentToggleSource toggleSource) : m_isEnabled(isEnabled), m_toggleSource(toggleSource) {}
+        bool IsEnabled() const { return m_isEnabled; }
+        ExperimentToggleSource ToggleSource() const { return m_toggleSource; }
+    private:
+        ExperimentToggleSource m_toggleSource;
+        bool m_isEnabled;
+    };
+
     struct Experiment
     {
         enum class Key : unsigned
@@ -16,8 +34,7 @@ namespace AppInstaller::Settings
             Max,
 
 #ifndef AICLI_DISABLE_TEST_HOOKS
-            TestExperimentDisabledByDefault = 0xFFFFFFFE,
-            TestExperimentEnabledByDefault = 0xFFFFFFFF,
+            TestExperiment = 0xFFFFFFFF,
 #endif
         };
 
@@ -26,9 +43,8 @@ namespace AppInstaller::Settings
         Experiment(std::string_view name, std::string_view jsonName, std::string_view link, std::string key) :
             m_name(name), m_jsonName(jsonName), m_link(link), m_key(key) {}
 
-        static bool IsEnabled(Key feature);
-
-        static Experiment GetExperiment(Experiment::Key key);
+        static ExperimentState GetState(Key feature);
+        static Experiment GetExperiment(Key key);
         static std::vector<Experiment> GetAllExperiments();
 
         std::string_view Name() const { return m_name; }
@@ -41,7 +57,7 @@ namespace AppInstaller::Settings
         Utility::LocIndView m_jsonName;
         std::string_view m_link;
         std::string m_key;
-        static std::map<Key, bool> m_isEnabledCache;
+        static std::map<Key, ExperimentState> m_experimentStateCache;
         static std::mutex m_mutex;
     };
 }
diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
index 37fa778dbe..fb5866987f 100644
--- a/src/AppInstallerRepositoryCore/SourceList.cpp
+++ b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -212,7 +212,7 @@ namespace AppInstaller::Repository
 
         std::string_view GetWingetCommunitySource()
         {
-            if (Settings::Experiment::IsEnabled(Settings::Experiment::Key::CDN))
+            if (Settings::Experiment::GetState(Settings::Experiment::Key::CDN).IsEnabled())
             {
                 return s_Source_WingetCommunityExperimental_Arg;
             }
diff --git a/src/Internal/Experiment/Experiment.cpp b/src/Internal/Experiment/Experiment.cpp
index dc4316c85b..91a288d34f 100644
--- a/src/Internal/Experiment/Experiment.cpp
+++ b/src/Internal/Experiment/Experiment.cpp
@@ -8,15 +8,10 @@ namespace AppInstaller::Experiment
     bool IsEnabled(const std::string& key)
     {
 #ifndef AICLI_DISABLE_TEST_HOOKS
-        if (key == "TestExperimentEnabledByDefault")
+        if (key == "TestExperiment")
         {
             return true;
         }
-
-        if (key == "TestExperimentDisabledByDefault")
-        {
-            return false;
-        }
 #endif
         return false;
     }

From 9a41fffcb9141457e40d16bf6831fbf3afa8844b Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Fri, 6 Dec 2024 14:20:39 -0800
Subject: [PATCH 08/18] draft

---
 .../AppInstallerTelemetry.cpp                 | 44 +++++++++++++++++--
 src/AppInstallerCommonCore/Experiment.cpp     | 29 ++++++------
 .../Public/AppInstallerTelemetry.h            |  6 ++-
 .../Public/winget/Experiment.h                |  4 +-
 4 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
index 448e33d52b..afd190cac2 100644
--- a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
+++ b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
@@ -11,6 +11,7 @@
 
 #define AICLI_TraceLoggingStringView(_sv_,_name_) TraceLoggingCountedUtf8String(_sv_.data(), static_cast<ULONG>(_sv_.size()), _name_)
 #define AICLI_TraceLoggingWStringView(_sv_,_name_) TraceLoggingCountedWideString(_sv_.data(), static_cast<ULONG>(_sv_.size()), _name_)
+#define AICLI_TraceLoggingJsonWString(_sv_, _name_) TraceLoggingPackedFieldEx(_sv_.c_str(), static_cast<ULONG>((_sv_.size() + 1) * sizeof(wchar_t)), TlgInUNICODESTRING, TlgOutJSON, _name_)
 
 #define AICLI_TraceLoggingWriteActivity(_eventName_,...) TraceLoggingWriteActivity(\
 g_hTraceProvider,\
@@ -18,12 +19,13 @@ _eventName_,\
 s_useGlobalTelemetryActivityId ? &s_globalTelemetryLoggerActivityId : GetActivityId(),\
 nullptr,\
 TraceLoggingCountedUtf8String(m_caller.c_str(),  static_cast<ULONG>(m_caller.size()), "Caller"),\
-TraceLoggingPackedFieldEx(m_telemetryCorrelationJsonW.c_str(), static_cast<ULONG>((m_telemetryCorrelationJsonW.size() + 1) * sizeof(wchar_t)), TlgInUNICODESTRING, TlgOutJSON, "CvJson"),\
+AICLI_TraceLoggingJsonWString(m_telemetryCorrelationJsonW, "CvJson"),\
 __VA_ARGS__)
 
 namespace AppInstaller::Logging
 {
     using namespace Utility;
+    using namespace Settings;
 
     namespace
     {
@@ -77,6 +79,25 @@ namespace AppInstaller::Logging
                 return "unknown"sv;
             }
         }
+
+        std::wstring GetExperimentsJson(const std::map<Experiment::Key, ExperimentState>& experiments)
+        {
+            std::wstringstream ss;
+            ss << "{";
+            auto first = 0;
+            for (const auto& experiment : experiments)
+            {
+                if (first++ != 0)
+                {
+                    ss << L",";
+                }
+
+                ss << L"\"" << Utility::ConvertToUTF16(Experiment::GetExperiment(experiment.first).JsonName())
+                    << L"\":" << experiment.second.ToJson();
+            }
+            ss << L"}";
+            return ss.str();
+        }
     }
 
     TelemetrySummary::TelemetrySummary(const TelemetrySummary& other)
@@ -760,6 +781,20 @@ namespace AppInstaller::Logging
         AICLI_LOG(CLI, Error, << type << " repair failed: " << errorCode);
     }
 
+    Settings::ExperimentState TelemetryTraceLogger::GetExperimentState(Experiment::Key key)
+    {
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        m_summary.Experiments.clear();
+#endif
+
+        if (m_summary.Experiments.find(key) == m_summary.Experiments.end())
+        {
+            m_summary.Experiments[key] =  Experiment::GetStateInternal(key);
+        }
+
+        return m_summary.Experiments[key];
+    }
+
     TelemetryTraceLogger::~TelemetryTraceLogger()
     {
         if (IsTelemetryEnabled())
@@ -773,6 +808,8 @@ namespace AppInstaller::Logging
 
             if (m_useSummary)
             {
+                auto experimentsJson = GetExperimentsJson(m_summary.Experiments);
+
                 TraceLoggingWriteActivity(
                     g_hTraceProvider,
                     "SummaryV2",
@@ -780,7 +817,7 @@ namespace AppInstaller::Logging
                     GetParentActivityId(),
                     // From member fields or program info.
                     AICLI_TraceLoggingStringView(m_caller, "Caller"),
-                    TraceLoggingPackedFieldEx(m_telemetryCorrelationJsonW.c_str(), static_cast<ULONG>((m_telemetryCorrelationJsonW.size() + 1) * sizeof(wchar_t)), TlgInUNICODESTRING, TlgOutJSON, "CvJson"),
+                    AICLI_TraceLoggingJsonWString(m_telemetryCorrelationJsonW, "CvJson"),
                     TraceLoggingCountedString(version->c_str(), static_cast<ULONG>(version->size()), "ClientVersion"),
                     TraceLoggingCountedString(packageVersion->c_str(), static_cast<ULONG>(packageVersion->size()), "ClientPackageVersion"),
                     TraceLoggingBool(Runtime::IsReleaseBuild(), "IsReleaseBuild"),
@@ -838,7 +875,8 @@ namespace AppInstaller::Logging
                     AICLI_TraceLoggingStringView(m_summary.RepairExecutionType, "RepairExecutionType"),
                     TraceLoggingUInt32(m_summary.RepairErrorCode, "RepairErrorCode"),
                     TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance | PDT_ProductAndServiceUsage | PDT_SoftwareSetupAndInventory),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
+                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+                    AICLI_TraceLoggingJsonWString(experimentsJson, "ExperimentsJson"));
             }
         }
     }
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 9b01743a72..8a9c006fb4 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -5,6 +5,7 @@
 #include "winget/Experiment.h"
 #include "winget/UserSettings.h"
 #include "Experiment/Experiment.h"
+#include "AppInstallerTelemetry.h"
 
 namespace AppInstaller::Settings
 {
@@ -45,24 +46,22 @@ namespace AppInstaller::Settings
         }
     }
 
-    // Define static members
-    std::map<Experiment::Key, ExperimentState> Experiment::m_experimentStateCache;
-    std::mutex Experiment::m_mutex;
-
-    ExperimentState Experiment::GetState(Key key)
+    std::wstring ExperimentState::ToJson() const
     {
-        std::lock_guard lock(m_mutex);
-
-#ifndef AICLI_DISABLE_TEST_HOOKS
-        m_experimentStateCache.clear();
-#endif
+        std::wstringstream ss;
+        ss << L"{\"IsEnabled\":" << (m_isEnabled ? L"true" : L"false")
+            << L",\"ToggleSource\":" << m_toggleSource << L"}";
+        return ss.str();
+    }
 
-        if (m_experimentStateCache.find(key) == m_experimentStateCache.end())
-        {
-            m_experimentStateCache[key] = GetExperimentStateInternal(key, User());
-        }
+    ExperimentState Experiment::GetStateInternal(Key key)
+    {
+        return GetExperimentStateInternal(key, User());
+    }
 
-        return m_experimentStateCache[key];
+    ExperimentState Experiment::GetState(Key key)
+    {
+        return Logging::Telemetry().GetExperimentState(key);
     }
 
     Experiment Experiment::GetExperiment(Key key)
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
index 1ff5962426..cc5bb759c4 100644
--- a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
+++ b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
@@ -3,6 +3,7 @@
 #pragma once
 #include <AppInstallerLanguageUtilities.h>
 #include <wil/result_macros.h>
+#include <winget/Experiment.h>
 
 #include <string_view>
 #include <vector>
@@ -129,7 +130,8 @@ namespace AppInstaller::Logging
         std::string DOUrl;
         HRESULT DOHResult = S_OK;
 
-        // TODO Add experiments telemetry
+        // LogExperiment
+        std::map<Settings::Experiment::Key, Settings::ExperimentState> Experiments;
     };
 
     // This type contains the registration lifetime of the telemetry trace logging provider.
@@ -269,6 +271,8 @@ namespace AppInstaller::Logging
 
         void LogNonFatalDOError(std::string_view url, HRESULT hr) const noexcept;
 
+        Settings::ExperimentState GetExperimentState(Settings::Experiment::Key key);
+
     protected:
         bool IsTelemetryEnabled() const noexcept;
 
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index f8def7177f..85981d0a47 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -20,6 +20,7 @@ namespace AppInstaller::Settings
         ExperimentState(bool isEnabled, ExperimentToggleSource toggleSource) : m_isEnabled(isEnabled), m_toggleSource(toggleSource) {}
         bool IsEnabled() const { return m_isEnabled; }
         ExperimentToggleSource ToggleSource() const { return m_toggleSource; }
+        std::wstring ToJson() const;
     private:
         ExperimentToggleSource m_toggleSource;
         bool m_isEnabled;
@@ -44,6 +45,7 @@ namespace AppInstaller::Settings
             m_name(name), m_jsonName(jsonName), m_link(link), m_key(key) {}
 
         static ExperimentState GetState(Key feature);
+        static ExperimentState GetStateInternal(Key feature);
         static Experiment GetExperiment(Key key);
         static std::vector<Experiment> GetAllExperiments();
 
@@ -57,7 +59,5 @@ namespace AppInstaller::Settings
         Utility::LocIndView m_jsonName;
         std::string_view m_link;
         std::string m_key;
-        static std::map<Key, ExperimentState> m_experimentStateCache;
-        static std::mutex m_mutex;
     };
 }

From ff0ac7b460473ef331ea931b3eb13f88129efa92 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:24:47 -0800
Subject: [PATCH 09/18] Addressed offline comments

---
 .../AppInstallerTelemetry.cpp                 | 23 +++++++---------
 src/AppInstallerCommonCore/Experiment.cpp     | 26 +++++++++++++++----
 .../Public/winget/Experiment.h                |  8 +++---
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
index afd190cac2..9c7378a9d4 100644
--- a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
+++ b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
@@ -12,6 +12,7 @@
 #define AICLI_TraceLoggingStringView(_sv_,_name_) TraceLoggingCountedUtf8String(_sv_.data(), static_cast<ULONG>(_sv_.size()), _name_)
 #define AICLI_TraceLoggingWStringView(_sv_,_name_) TraceLoggingCountedWideString(_sv_.data(), static_cast<ULONG>(_sv_.size()), _name_)
 #define AICLI_TraceLoggingJsonWString(_sv_, _name_) TraceLoggingPackedFieldEx(_sv_.c_str(), static_cast<ULONG>((_sv_.size() + 1) * sizeof(wchar_t)), TlgInUNICODESTRING, TlgOutJSON, _name_)
+#define AICLI_TraceLoggingJsonString(_sv_, _name_) TraceLoggingPackedFieldEx(_sv_.c_str(), static_cast<ULONG>((_sv_.size() + 1) * sizeof(char)), TlgInUNICODESTRING, TlgOutJSON, _name_)
 
 #define AICLI_TraceLoggingWriteActivity(_eventName_,...) TraceLoggingWriteActivity(\
 g_hTraceProvider,\
@@ -80,23 +81,17 @@ namespace AppInstaller::Logging
             }
         }
 
-        std::wstring GetExperimentsJson(const std::map<Experiment::Key, ExperimentState>& experiments)
+        std::string GetExperimentsJson(const std::map<Experiment::Key, ExperimentState>& experiments)
         {
-            std::wstringstream ss;
-            ss << "{";
-            auto first = 0;
+            Json::Value root;
             for (const auto& experiment : experiments)
             {
-                if (first++ != 0)
-                {
-                    ss << L",";
-                }
-
-                ss << L"\"" << Utility::ConvertToUTF16(Experiment::GetExperiment(experiment.first).JsonName())
-                    << L"\":" << experiment.second.ToJson();
+                auto name = std::string(Experiment::GetExperiment(experiment.first).JsonName());
+                root[name] = experiment.second.ToJson();
             }
-            ss << L"}";
-            return ss.str();
+
+            Json::StreamWriterBuilder builder;
+            return Json::writeString(builder, root);
         }
     }
 
@@ -876,7 +871,7 @@ namespace AppInstaller::Logging
                     TraceLoggingUInt32(m_summary.RepairErrorCode, "RepairErrorCode"),
                     TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance | PDT_ProductAndServiceUsage | PDT_SoftwareSetupAndInventory),
                     TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    AICLI_TraceLoggingJsonWString(experimentsJson, "ExperimentsJson"));
+                    AICLI_TraceLoggingJsonString(experimentsJson, "ExperimentsJson"));
             }
         }
     }
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 8a9c006fb4..47c805ecaf 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -44,14 +44,30 @@ namespace AppInstaller::Settings
                 " is set to " << isEnabled);
             return { isEnabled, ExperimentToggleSource::Default };
         }
+
+        std::string ExperimentToggleSourceToString(ExperimentToggleSource source)
+        {
+            switch (source)
+            {
+            case ExperimentToggleSource::Default:
+                return "Default";
+            case ExperimentToggleSource::Policy:
+                return "Policy";
+            case ExperimentToggleSource::UserSetting:
+                return "UserSetting";
+            default:
+                return "Unknown";
+            }
+        }
     }
 
-    std::wstring ExperimentState::ToJson() const
+    std::string ExperimentState::ToJson() const
     {
-        std::wstringstream ss;
-        ss << L"{\"IsEnabled\":" << (m_isEnabled ? L"true" : L"false")
-            << L",\"ToggleSource\":" << m_toggleSource << L"}";
-        return ss.str();
+        Json::Value root;
+        root["IsEnabled"] = m_isEnabled;
+        root["ToggleSource"] = ExperimentToggleSourceToString(m_toggleSource);
+        Json::StreamWriterBuilder builder;
+        return Json::writeString(builder, root);
     }
 
     ExperimentState Experiment::GetStateInternal(Key key)
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 85981d0a47..6e6e6f9a74 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -9,9 +9,9 @@ namespace AppInstaller::Settings
 {
     enum ExperimentToggleSource
     {
-        Default,
-        Policy,
-        UserSetting
+        Default = 0,
+        Policy = 1,
+        UserSetting = 2,
     };
 
     struct ExperimentState
@@ -20,7 +20,7 @@ namespace AppInstaller::Settings
         ExperimentState(bool isEnabled, ExperimentToggleSource toggleSource) : m_isEnabled(isEnabled), m_toggleSource(toggleSource) {}
         bool IsEnabled() const { return m_isEnabled; }
         ExperimentToggleSource ToggleSource() const { return m_toggleSource; }
-        std::wstring ToJson() const;
+        std::string ToJson() const;
     private:
         ExperimentToggleSource m_toggleSource;
         bool m_isEnabled;

From bdf8c90ca87757ab94c85a9df705b5839981f008 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:09:27 -0800
Subject: [PATCH 10/18] Addressing comments

---
 .../AppInstallerCLITests.vcxproj.filters      |  2 +-
 src/AppInstallerCLITests/Experiment.cpp       |  1 -
 .../AppInstallerTelemetry.cpp                 |  9 ++++----
 src/AppInstallerCommonCore/Experiment.cpp     | 21 +++++++------------
 .../Public/AppInstallerTelemetry.h            |  1 -
 .../Public/winget/Experiment.h                |  8 +++----
 6 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
index 59ebacc92c..6ac87335f5 100644
--- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
+++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
@@ -375,7 +375,7 @@
       <Filter>Source Files\Common</Filter>
     </ClCompile>
     <ClCompile Include="Experiment.cpp">
-      <Filter>Source Files\Repository</Filter>
+      <Filter>Source Files\Common</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index b861a97943..96c1df941d 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -1,4 +1,3 @@
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 #include "pch.h"
diff --git a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
index 9c7378a9d4..7f2a70e3c4 100644
--- a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
+++ b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
@@ -12,7 +12,6 @@
 #define AICLI_TraceLoggingStringView(_sv_,_name_) TraceLoggingCountedUtf8String(_sv_.data(), static_cast<ULONG>(_sv_.size()), _name_)
 #define AICLI_TraceLoggingWStringView(_sv_,_name_) TraceLoggingCountedWideString(_sv_.data(), static_cast<ULONG>(_sv_.size()), _name_)
 #define AICLI_TraceLoggingJsonWString(_sv_, _name_) TraceLoggingPackedFieldEx(_sv_.c_str(), static_cast<ULONG>((_sv_.size() + 1) * sizeof(wchar_t)), TlgInUNICODESTRING, TlgOutJSON, _name_)
-#define AICLI_TraceLoggingJsonString(_sv_, _name_) TraceLoggingPackedFieldEx(_sv_.c_str(), static_cast<ULONG>((_sv_.size() + 1) * sizeof(char)), TlgInUNICODESTRING, TlgOutJSON, _name_)
 
 #define AICLI_TraceLoggingWriteActivity(_eventName_,...) TraceLoggingWriteActivity(\
 g_hTraceProvider,\
@@ -81,7 +80,7 @@ namespace AppInstaller::Logging
             }
         }
 
-        std::string GetExperimentsJson(const std::map<Experiment::Key, ExperimentState>& experiments)
+        std::wstring GetExperimentsJson(const std::map<Experiment::Key, ExperimentState>& experiments)
         {
             Json::Value root;
             for (const auto& experiment : experiments)
@@ -91,7 +90,7 @@ namespace AppInstaller::Logging
             }
 
             Json::StreamWriterBuilder builder;
-            return Json::writeString(builder, root);
+            return Utility::ConvertToUTF16(Json::writeString(builder, root));
         }
     }
 
@@ -870,8 +869,8 @@ namespace AppInstaller::Logging
                     AICLI_TraceLoggingStringView(m_summary.RepairExecutionType, "RepairExecutionType"),
                     TraceLoggingUInt32(m_summary.RepairErrorCode, "RepairErrorCode"),
                     TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance | PDT_ProductAndServiceUsage | PDT_SoftwareSetupAndInventory),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    AICLI_TraceLoggingJsonString(experimentsJson, "ExperimentsJson"));
+                    AICLI_TraceLoggingJsonWString(experimentsJson, "ExperimentsJson"),
+                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
             }
         }
     }
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 47c805ecaf..37bff5e704 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -18,30 +18,25 @@ namespace AppInstaller::Settings
                 return { true, ExperimentToggleSource::Default };
             }
 
+            auto experiment = Experiment::GetExperiment(key);
             if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
             {
-                AICLI_LOG(Core, Info, <<
-                    "Experiment " << Experiment::GetExperiment(key).Name() <<
+                AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() <<
                     " is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
                 return { false, ExperimentToggleSource::Policy };
             }
 
-            auto experiments = userSettings.Get<Setting::Experiments>();
-            auto experiment = Experiment::GetExperiment(key);
+            auto userSettingsExperiments = userSettings.Get<Setting::Experiments>();
             auto jsonName = std::string(experiment.JsonName());
-            if (experiments.find(jsonName) != experiments.end())
+            if (userSettingsExperiments.find(jsonName) != userSettingsExperiments.end())
             {
-                auto isEnabled = experiments[jsonName];
-                AICLI_LOG(Core, Info, <<
-                    "Experiment " << Experiment::GetExperiment(key).Name() <<
-                    " is set to " << isEnabled << " in user settings");
+                auto isEnabled = userSettingsExperiments[jsonName];
+                AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false") << " in user settings");
                 return { isEnabled, ExperimentToggleSource::UserSetting };
             }
 
             auto isEnabled = AppInstaller::Experiment::IsEnabled(experiment.GetKey());
-            AICLI_LOG(Core, Info, <<
-                "Experiment " << Experiment::GetExperiment(key).Name() <<
-                " is set to " << isEnabled);
+            AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false"));
             return { isEnabled, ExperimentToggleSource::Default };
         }
 
@@ -99,7 +94,7 @@ namespace AppInstaller::Settings
     {
         std::vector<Experiment> result;
 
-        for (Key_t i = 0x1; i < static_cast<Key_t>(Key::Max); i = i << 1)
+        for (Key_t i = 0x1; i < static_cast<Key_t>(Key::Max); ++i)
         {
             result.emplace_back(GetExperiment(static_cast<Key>(i)));
         }
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
index cc5bb759c4..6a176add50 100644
--- a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
+++ b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
@@ -130,7 +130,6 @@ namespace AppInstaller::Logging
         std::string DOUrl;
         HRESULT DOHResult = S_OK;
 
-        // LogExperiment
         std::map<Settings::Experiment::Key, Settings::ExperimentState> Experiments;
     };
 
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 6e6e6f9a74..3678b3fbee 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -10,8 +10,8 @@ namespace AppInstaller::Settings
     enum ExperimentToggleSource
     {
         Default = 0,
-        Policy = 1,
-        UserSetting = 2,
+        Policy,
+        UserSetting,
     };
 
     struct ExperimentState
@@ -30,8 +30,8 @@ namespace AppInstaller::Settings
     {
         enum class Key : unsigned
         {
-            None = 0x0,
-            CDN = 0x1,
+            None = 0,
+            CDN,
             Max,
 
 #ifndef AICLI_DISABLE_TEST_HOOKS

From dee65a91fbdbb4b2011c079da5dd060b200d4586 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:18:50 -0800
Subject: [PATCH 11/18] Addressing comments

---
 src/AppInstallerCommonCore/Experiment.cpp        | 16 ++++++++--------
 .../Public/winget/Experiment.h                   | 12 ++++++------
 src/AppInstallerSharedLib/JsonUtil.cpp           |  5 +++--
 .../Public/winget/JsonUtil.h                     |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 37bff5e704..e7f12a8b15 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -13,19 +13,19 @@ namespace AppInstaller::Settings
     {
         ExperimentState GetExperimentStateInternal(Experiment::Key key, const UserSettings& userSettings)
         {
-            if (key == Experiment::Key::None)
-            {
-                return { true, ExperimentToggleSource::Default };
-            }
-
-            auto experiment = Experiment::GetExperiment(key);
             if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
             {
-                AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() <<
+                AICLI_LOG(Core, Info, << "Experiment " << Experiment::GetExperiment(key).Name() <<
                     " is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
                 return { false, ExperimentToggleSource::Policy };
             }
 
+            if (key == Experiment::Key::None)
+            {
+                return { false, ExperimentToggleSource::Default };
+            }
+
+            auto experiment = Experiment::GetExperiment(key);
             auto userSettingsExperiments = userSettings.Get<Setting::Experiments>();
             auto jsonName = std::string(experiment.JsonName());
             if (userSettingsExperiments.find(jsonName) != userSettingsExperiments.end())
@@ -80,7 +80,7 @@ namespace AppInstaller::Settings
         switch (key)
         {
         case Key::CDN:
-            return Experiment{ "CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
+            return Experiment{ "winget source CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
 #ifndef AICLI_DISABLE_TEST_HOOKS
         case Key::TestExperiment:
             return Experiment{ "Test experiment", "TestExperiment", "https://aka.ms/winget-settings", "TestExperiment" };
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 3678b3fbee..3d9a805e65 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -41,23 +41,23 @@ namespace AppInstaller::Settings
 
         using Key_t = std::underlying_type_t<Key>;
 
-        Experiment(std::string_view name, std::string_view jsonName, std::string_view link, std::string key) :
-            m_name(name), m_jsonName(jsonName), m_link(link), m_key(key) {}
+        Experiment(std::string name, std::string jsonName, std::string link, std::string key) :
+            m_name(std::move(name)), m_jsonName(jsonName), m_link(std::move(link)), m_key(std::move((key))) {}
 
         static ExperimentState GetState(Key feature);
         static ExperimentState GetStateInternal(Key feature);
         static Experiment GetExperiment(Key key);
         static std::vector<Experiment> GetAllExperiments();
 
-        std::string_view Name() const { return m_name; }
+        std::string Name() const { return m_name; }
         Utility::LocIndView JsonName() const { return m_jsonName; }
-        std::string_view Link() const { return m_link; }
+        std::string Link() const { return m_link; }
         std::string GetKey() const { return m_key; }
 
     private:
-        std::string_view m_name;
+        std::string m_name;
         Utility::LocIndView m_jsonName;
-        std::string_view m_link;
+        std::string m_link;
         std::string m_key;
     };
 }
diff --git a/src/AppInstallerSharedLib/JsonUtil.cpp b/src/AppInstallerSharedLib/JsonUtil.cpp
index 4373c6de96..221eccba6d 100644
--- a/src/AppInstallerSharedLib/JsonUtil.cpp
+++ b/src/AppInstallerSharedLib/JsonUtil.cpp
@@ -77,9 +77,10 @@ namespace AppInstaller::JSON
         {
             for (const auto& entry : node.getMemberNames())
             {
-                if (node[entry].isBool())
+                auto& value = node[entry];
+                if (value.isBool())
                 {
-                    result[entry] = node[entry].asBool();
+                    result[entry] = value.asBool();
                 }
             }
 
diff --git a/src/AppInstallerSharedLib/Public/winget/JsonUtil.h b/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
index 5d77ef0e2f..559252c223 100644
--- a/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
+++ b/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
@@ -35,7 +35,7 @@ namespace AppInstaller::JSON
     std::optional<std::vector<std::string>> GetValue<std::vector<std::string>>(const Json::Value& node);
 
     template<>
-    std::optional<std::map<std::string, bool>> GetValue(const Json::Value& node);
+    std::optional<std::map<std::string, bool>> GetValue<std::map<std::string, bool>>(const Json::Value& node);
 
 #ifndef WINGET_DISABLE_FOR_FUZZING
     // For cpprestsdk JSON

From f26ae41c73634a2106e65ee2e80c8eb2dbbcb589 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Tue, 17 Dec 2024 11:08:28 -0800
Subject: [PATCH 12/18] Addressing comments

---
 .../AppInstallerCLICore.vcxproj               | 24 +++++++-------
 .../AppInstallerCLITests.vcxproj              | 12 +++----
 src/AppInstallerCLITests/Experiment.cpp       |  3 +-
 .../AppInstallerTelemetry.cpp                 |  9 +++---
 src/AppInstallerCommonCore/Experiment.cpp     | 30 +++++++++---------
 .../Public/AppInstallerTelemetry.h            |  4 +--
 .../Public/winget/Experiment.h                | 30 ++++++------------
 .../AppInstallerRepositoryCore.vcxproj        | 24 +++++++-------
 src/AppInstallerRepositoryCore/SourceList.cpp |  3 +-
 src/Internal/Experiment/Experiment.cpp        |  4 +--
 src/Internal/Experiment/Experiment.h          | 13 +++++++-
 src/Internal/Experiment/Experiment.vcxproj    | 31 +++----------------
 .../Microsoft.Management.Deployment.vcxproj   |  2 +-
 ...soft.Management.Deployment.vcxproj.filters |  3 ++
 .../WindowsPackageManager.vcxproj             | 29 ++++++++---------
 15 files changed, 105 insertions(+), 116 deletions(-)

diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
index 45c9c0fa04..53dac4ec2d 100644
--- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
+++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
@@ -223,9 +223,9 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
@@ -249,7 +249,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</SDLCheck>
       <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnablePREfast>
@@ -265,10 +265,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>
@@ -302,10 +302,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</TreatWarningAsError>
diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
index 8ae18e60e0..e5882e02e9 100644
--- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
+++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
@@ -167,8 +167,8 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
       <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
@@ -192,7 +192,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
     </ClCompile>
@@ -212,9 +212,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\SfsClient\sfs-client\client\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index 96c1df941d..8487d62307 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -8,6 +8,7 @@
 
 using namespace TestCommon;
 using namespace AppInstaller::Settings;
+using namespace AppInstaller::Experiment;
 
 #define SET_POLICY_STATE(_policy_, _state_) \
     GroupPolicyTestOverride policies; \
@@ -20,7 +21,7 @@ using namespace AppInstaller::Settings;
     });
 
 #define ASSERT_EXPERIMENT(_isEnabled_, _toggleSource_) \
-    auto testExperimentState = Experiment::GetState(Experiment::Key::TestExperiment); \
+    auto testExperimentState = Experiment::GetState(ExperimentKey::TestExperiment); \
     REQUIRE(_isEnabled_ == testExperimentState.IsEnabled()); \
     REQUIRE(_toggleSource_ == testExperimentState.ToggleSource());
 
diff --git a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
index 7f2a70e3c4..6f7e41f8ce 100644
--- a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
+++ b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
@@ -26,6 +26,7 @@ namespace AppInstaller::Logging
 {
     using namespace Utility;
     using namespace Settings;
+    using namespace Experiment;
 
     namespace
     {
@@ -80,12 +81,12 @@ namespace AppInstaller::Logging
             }
         }
 
-        std::wstring GetExperimentsJson(const std::map<Experiment::Key, ExperimentState>& experiments)
+        std::wstring GetExperimentsJson(const std::map<ExperimentKey, ExperimentState>& experiments)
         {
             Json::Value root;
             for (const auto& experiment : experiments)
             {
-                auto name = std::string(Experiment::GetExperiment(experiment.first).JsonName());
+                auto name = std::string(Settings::Experiment::GetExperiment(experiment.first).JsonName());
                 root[name] = experiment.second.ToJson();
             }
 
@@ -775,7 +776,7 @@ namespace AppInstaller::Logging
         AICLI_LOG(CLI, Error, << type << " repair failed: " << errorCode);
     }
 
-    Settings::ExperimentState TelemetryTraceLogger::GetExperimentState(Experiment::Key key)
+    Settings::ExperimentState TelemetryTraceLogger::GetExperimentState(ExperimentKey key)
     {
 #ifndef AICLI_DISABLE_TEST_HOOKS
         m_summary.Experiments.clear();
@@ -783,7 +784,7 @@ namespace AppInstaller::Logging
 
         if (m_summary.Experiments.find(key) == m_summary.Experiments.end())
         {
-            m_summary.Experiments[key] =  Experiment::GetStateInternal(key);
+            m_summary.Experiments[key] =  Settings::Experiment::GetStateInternal(key);
         }
 
         return m_summary.Experiments[key];
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index e7f12a8b15..57e7bc3908 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -9,9 +9,11 @@
 
 namespace AppInstaller::Settings
 {
+    using namespace Experiment;
+
     namespace
     {
-        ExperimentState GetExperimentStateInternal(Experiment::Key key, const UserSettings& userSettings)
+        ExperimentState GetExperimentStateInternal(ExperimentKey key, const UserSettings& userSettings)
         {
             if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
             {
@@ -20,17 +22,17 @@ namespace AppInstaller::Settings
                 return { false, ExperimentToggleSource::Policy };
             }
 
-            if (key == Experiment::Key::None)
+            if (key == ExperimentKey::None)
             {
                 return { false, ExperimentToggleSource::Default };
             }
 
             auto experiment = Experiment::GetExperiment(key);
             auto userSettingsExperiments = userSettings.Get<Setting::Experiments>();
-            auto jsonName = std::string(experiment.JsonName());
-            if (userSettingsExperiments.find(jsonName) != userSettingsExperiments.end())
+            auto experimentJsonName = experiment.JsonName();
+            if (userSettingsExperiments.find(experimentJsonName) != userSettingsExperiments.end())
             {
-                auto isEnabled = userSettingsExperiments[jsonName];
+                auto isEnabled = userSettingsExperiments[experimentJsonName];
                 AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false") << " in user settings");
                 return { isEnabled, ExperimentToggleSource::UserSetting };
             }
@@ -65,25 +67,25 @@ namespace AppInstaller::Settings
         return Json::writeString(builder, root);
     }
 
-    ExperimentState Experiment::GetStateInternal(Key key)
+    ExperimentState Experiment::GetStateInternal(ExperimentKey key)
     {
         return GetExperimentStateInternal(key, User());
     }
 
-    ExperimentState Experiment::GetState(Key key)
+    ExperimentState Experiment::GetState(ExperimentKey key)
     {
         return Logging::Telemetry().GetExperimentState(key);
     }
 
-    Experiment Experiment::GetExperiment(Key key)
+    Experiment Experiment::GetExperiment(ExperimentKey key)
     {
         switch (key)
         {
-        case Key::CDN:
-            return Experiment{ "winget source CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
+        case ExperimentKey::CDN:
+            return Experiment{ "winget source CDN experiment", "CDN", "https://aka.ms/winget-settings", ExperimentKey::CDN};
 #ifndef AICLI_DISABLE_TEST_HOOKS
-        case Key::TestExperiment:
-            return Experiment{ "Test experiment", "TestExperiment", "https://aka.ms/winget-settings", "TestExperiment" };
+        case ExperimentKey::TestExperiment:
+            return Experiment{ "Test experiment", "TestExperiment", "https://aka.ms/winget-settings", ExperimentKey::TestExperiment };
 #endif
         default:
             THROW_HR(E_UNEXPECTED);
@@ -94,9 +96,9 @@ namespace AppInstaller::Settings
     {
         std::vector<Experiment> result;
 
-        for (Key_t i = 0x1; i < static_cast<Key_t>(Key::Max); ++i)
+        for (Key_t i = 0x1; i < static_cast<Key_t>(ExperimentKey::Max); ++i)
         {
-            result.emplace_back(GetExperiment(static_cast<Key>(i)));
+            result.emplace_back(GetExperiment(static_cast<ExperimentKey>(i)));
         }
 
         return result;
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
index 6a176add50..95bfa344a6 100644
--- a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
+++ b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
@@ -130,7 +130,7 @@ namespace AppInstaller::Logging
         std::string DOUrl;
         HRESULT DOHResult = S_OK;
 
-        std::map<Settings::Experiment::Key, Settings::ExperimentState> Experiments;
+        std::map<AppInstaller::Experiment::ExperimentKey, Settings::ExperimentState> Experiments;
     };
 
     // This type contains the registration lifetime of the telemetry trace logging provider.
@@ -270,7 +270,7 @@ namespace AppInstaller::Logging
 
         void LogNonFatalDOError(std::string_view url, HRESULT hr) const noexcept;
 
-        Settings::ExperimentState GetExperimentState(Settings::Experiment::Key key);
+        Settings::ExperimentState GetExperimentState(AppInstaller::Experiment::ExperimentKey key);
 
     protected:
         bool IsTelemetryEnabled() const noexcept;
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 3d9a805e65..82ca5e2476 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -3,6 +3,7 @@
 #pragma once
 #include <string>
 #include <type_traits>
+#include "Experiment/Experiment.h"
 #include "AppInstallerStrings.h"
 
 namespace AppInstaller::Settings
@@ -28,36 +29,25 @@ namespace AppInstaller::Settings
 
     struct Experiment
     {
-        enum class Key : unsigned
-        {
-            None = 0,
-            CDN,
-            Max,
+        using Key_t = std::underlying_type_t<AppInstaller::Experiment::ExperimentKey>;
 
-#ifndef AICLI_DISABLE_TEST_HOOKS
-            TestExperiment = 0xFFFFFFFF,
-#endif
-        };
-
-        using Key_t = std::underlying_type_t<Key>;
-
-        Experiment(std::string name, std::string jsonName, std::string link, std::string key) :
+        Experiment(std::string name, std::string jsonName, std::string link, AppInstaller::Experiment::ExperimentKey key) :
             m_name(std::move(name)), m_jsonName(jsonName), m_link(std::move(link)), m_key(std::move((key))) {}
 
-        static ExperimentState GetState(Key feature);
-        static ExperimentState GetStateInternal(Key feature);
-        static Experiment GetExperiment(Key key);
+        static ExperimentState GetState(AppInstaller::Experiment::ExperimentKey feature);
+        static ExperimentState GetStateInternal(AppInstaller::Experiment::ExperimentKey feature);
+        static Experiment GetExperiment(AppInstaller::Experiment::ExperimentKey key);
         static std::vector<Experiment> GetAllExperiments();
 
         std::string Name() const { return m_name; }
-        Utility::LocIndView JsonName() const { return m_jsonName; }
+        std::string JsonName() const { return m_jsonName; }
         std::string Link() const { return m_link; }
-        std::string GetKey() const { return m_key; }
+        AppInstaller::Experiment::ExperimentKey GetKey() const { return m_key; }
 
     private:
         std::string m_name;
-        Utility::LocIndView m_jsonName;
+        std::string m_jsonName;
         std::string m_link;
-        std::string m_key;
+        AppInstaller::Experiment::ExperimentKey m_key;
     };
 }
diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj
index d70fb30e56..43cd7411c5 100644
--- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj
+++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj
@@ -222,9 +222,9 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
@@ -248,7 +248,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</SDLCheck>
       <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnablePREfast>
@@ -264,10 +264,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>
@@ -301,10 +301,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</TreatWarningAsError>
diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
index fb5866987f..0e3ef4a73e 100644
--- a/src/AppInstallerRepositoryCore/SourceList.cpp
+++ b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -13,6 +13,7 @@
 
 using namespace AppInstaller::Settings;
 using namespace std::string_view_literals;
+using namespace AppInstaller::Experiment;
 
 namespace AppInstaller::Repository
 {
@@ -212,7 +213,7 @@ namespace AppInstaller::Repository
 
         std::string_view GetWingetCommunitySource()
         {
-            if (Settings::Experiment::GetState(Settings::Experiment::Key::CDN).IsEnabled())
+            if (Settings::Experiment::GetState(ExperimentKey::CDN).IsEnabled())
             {
                 return s_Source_WingetCommunityExperimental_Arg;
             }
diff --git a/src/Internal/Experiment/Experiment.cpp b/src/Internal/Experiment/Experiment.cpp
index 91a288d34f..7ba1d62161 100644
--- a/src/Internal/Experiment/Experiment.cpp
+++ b/src/Internal/Experiment/Experiment.cpp
@@ -5,10 +5,10 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string& key)
+    bool IsEnabled(const ExperimentKey& key)
     {
 #ifndef AICLI_DISABLE_TEST_HOOKS
-        if (key == "TestExperiment")
+        if (key == ExperimentKey::TestExperiment)
         {
             return true;
         }
diff --git a/src/Internal/Experiment/Experiment.h b/src/Internal/Experiment/Experiment.h
index 9d52cef764..a57bb6d59e 100644
--- a/src/Internal/Experiment/Experiment.h
+++ b/src/Internal/Experiment/Experiment.h
@@ -6,5 +6,16 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string& experimentKey);
+    enum class ExperimentKey : unsigned
+    {
+        None = 0,
+        CDN,
+        Max,
+
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        TestExperiment = 0xFFFFFFFF,
+#endif
+    };
+
+    bool IsEnabled(const ExperimentKey& experimentKey);
 }
diff --git a/src/Internal/Experiment/Experiment.vcxproj b/src/Internal/Experiment/Experiment.vcxproj
index 7ab8865e4c..64034b8fb4 100644
--- a/src/Internal/Experiment/Experiment.vcxproj
+++ b/src/Internal/Experiment/Experiment.vcxproj
@@ -102,28 +102,7 @@
     <LinkIncremental>false</LinkIncremental>
     <EnableASAN>true</EnableASAN>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'" Label="Configuration">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'" Label="Configuration">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -238,7 +217,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -264,7 +243,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</SDLCheck>
@@ -280,7 +259,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -317,7 +296,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_NO_ASYNCRTIMP;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_NO_ASYNCRTIMP;NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)..\..\AppInstallerSharedLib;$(ProjectDir)..\..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
index 57f0161936..ecfa8938e2 100644
--- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
+++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj
@@ -127,7 +127,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\AppInstallerCLICore;$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\AppInstallerCLICore;$(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj.filters b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj.filters
index 78c593d394..880a31b634 100644
--- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj.filters
+++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj.filters
@@ -111,4 +111,7 @@
       <UniqueIdentifier>{9c3907ed-84d9-4485-9b15-04c50717f0ab}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj
index 510d07aa61..93ca9c1e4f 100644
--- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj
+++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj
@@ -219,7 +219,8 @@
     <VcpkgEnableManifest>true</VcpkgEnableManifest>
     <VcpkgApplocalDeps>false</VcpkgApplocalDeps>
     <VcpkgInstalledDir>$(ProjectDir)..\vcpkg_installed</VcpkgInstalledDir>
-    <VcpkgUseStatic></VcpkgUseStatic>
+    <VcpkgUseStatic>
+    </VcpkgUseStatic>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
     <VcpkgTriplet>x64-release-static</VcpkgTriplet>
@@ -286,9 +287,9 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
@@ -336,7 +337,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <ControlFlowGuard Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ControlFlowGuard>
       <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdcpp17</LanguageStandard>
@@ -355,10 +356,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>
@@ -425,10 +426,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCLICore\Public\;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\Microsoft.Management.Deployment\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</TreatWarningAsError>
@@ -551,4 +552,4 @@
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

From 0de0174b220463726b38ae14afbd8340d18a2966 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Fri, 20 Dec 2024 10:29:03 -0800
Subject: [PATCH 13/18] Include dir

---
 src/WinGetUtil/WinGetUtil.vcxproj | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj
index c3d82c9872..fc755bb2c5 100644
--- a/src/WinGetUtil/WinGetUtil.vcxproj
+++ b/src/WinGetUtil/WinGetUtil.vcxproj
@@ -162,9 +162,9 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatWarningAsError>
@@ -209,7 +209,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;$(ProjectDir)..\JsonCppLib\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWarningAsError>
       <ControlFlowGuard Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ControlFlowGuard>
       <SDLCheck Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</SDLCheck>
@@ -232,10 +232,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerRepositoryCore\Public;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerSharedLib\Public;$(ProjectDir)..\cpprestsdk\cpprestsdk\Release\include;$(ProjectDir)..\JsonCppLib;$(ProjectDir)..\Internal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</TreatWarningAsError>
       <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TreatWarningAsError>

From e1bafb4650b779774941f55dcc43a9fdd69ddd5c Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Fri, 20 Dec 2024 15:15:56 -0800
Subject: [PATCH 14/18] Added allowExperiments

---
 .../JSON/settings/settings.schema.0.2.json    | 36 +++++++++--
 src/AppInstallerCLITests/Experiment.cpp       | 64 +++++++++++++------
 src/AppInstallerCommonCore/Experiment.cpp     | 18 ++++--
 .../Public/winget/Experiment.h                | 11 +++-
 .../Public/winget/UserSettings.h              |  2 +
 src/AppInstallerCommonCore/UserSettings.cpp   |  1 +
 6 files changed, 103 insertions(+), 29 deletions(-)

diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json
index 099ebe8080..300cab4d92 100644
--- a/schemas/JSON/settings/settings.schema.0.2.json
+++ b/schemas/JSON/settings/settings.schema.0.2.json
@@ -27,7 +27,7 @@
             "accent",
             "rainbow",
             "retro",
-            "sixel",
+            "sixel",
             "disabled"
           ]
         },
@@ -204,8 +204,8 @@
       "properties": {
         "defaultModuleRoot": {
           "description": "The default root directory where PowerShell modules are installed to when applying a configuration.",
-          "type": "string",
-          "maxLength": 32767
+          "type": "string",
+          "maxLength": 32767
         }
       }
     },
@@ -301,10 +301,26 @@
         },
         "fonts": {
           "description": "Enable support for managing fonts",
-          "type": "boolean",
+          "type": "boolean",
           "default":  false
         }
       }
+    },
+    "Experiments": {
+      "description": "Experiments",
+      "type": "object",
+      "properties": {
+        "CDN": {
+          "description": "Enables the use of an alternative CDN for package downloads",
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
+    "AllowExperiments": {
+      "description": "Controls whether experiments are allowed or not",
+      "type": "boolean",
+      "default": true
     }
   },
   "allOf": [
@@ -355,6 +371,18 @@
         "experimentalFeatures": { "$ref": "#/definitions/Experimental" }
       },
       "additionalItems": true
+    },
+    {
+      "properties": {
+        "experiments": { "$ref": "#/definitions/Experiments" }
+      },
+      "additionalItems": true
+    },
+    {
+      "properties": {
+        "allowExperiments": { "$ref": "#/definitions/AllowExperiments" }
+      },
+      "additionalItems": true
     }
   ],
   "additionalProperties": true
diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index 8487d62307..d16b7f0668 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -10,16 +10,6 @@ using namespace TestCommon;
 using namespace AppInstaller::Settings;
 using namespace AppInstaller::Experiment;
 
-#define SET_POLICY_STATE(_policy_, _state_) \
-    GroupPolicyTestOverride policies; \
-    policies.SetState(_policy_, _state_);
-
-#define SET_USER_SETTINGS(_value_) \
-    TestUserSettings settings; \
-    settings.Set<Setting::Experiments>({ \
-        {"TestExperiment", _value_} \
-    });
-
 #define ASSERT_EXPERIMENT(_isEnabled_, _toggleSource_) \
     auto testExperimentState = Experiment::GetState(ExperimentKey::TestExperiment); \
     REQUIRE(_isEnabled_ == testExperimentState.IsEnabled()); \
@@ -29,32 +19,38 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 {
     SECTION("Not configured")
     {
-        SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::NotConfigured);
+        GroupPolicyTestOverride policies;
+        policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::NotConfigured);
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Enabled")
     {
-        SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
+        GroupPolicyTestOverride policies;
+        policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Disabled")
     {
-        SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
+        GroupPolicyTestOverride policies;
+        policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
     }
 }
 
 TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
 {
+    TestUserSettings settings; \
+    settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+
     // If the policy is disabled, then also the user settings should be ignored.
-    SET_POLICY_STATE(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
-    SET_USER_SETTINGS(true);
+    GroupPolicyTestOverride policies;
+    policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
     ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
 }
 
-TEST_CASE("Experiment_UserSettingsControl", "[experiment]")
+TEST_CASE("Experiment_UserSettingsIndividualControl", "[experiment]")
 {
     SECTION("Experiments not configured in user settings")
     {
@@ -64,13 +60,41 @@ TEST_CASE("Experiment_UserSettingsControl", "[experiment]")
 
     SECTION("Experiments enabled in user settings")
     {
-        SET_USER_SETTINGS(true);
-        ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSetting);
+        TestUserSettings settings; \
+        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
     }
 
     SECTION("Experiments disabled in user settings")
     {
-        SET_USER_SETTINGS(false);
-        ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSetting);
+        TestUserSettings settings;
+        settings.Set<Setting::Experiments>({{"TestExperiment", false}});
+        ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingIndividualControl);
+    }
+}
+
+TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
+{
+    SECTION("'Allow experiments' not configured in user settings")
+    {
+        TestUserSettings settings;
+        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
+    }
+
+    SECTION("'Allow experiments' enabled in user settings")
+    {
+        TestUserSettings settings;
+        settings.Set<Setting::AllowExperiments>(true);
+        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
+    }
+
+    SECTION("'Allow experiments' disabled in user settings")
+    {
+        TestUserSettings settings;
+        settings.Set<Setting::AllowExperiments>(false);
+        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingGlobalControl);
     }
 }
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 57e7bc3908..8e4991ccd5 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -28,13 +28,21 @@ namespace AppInstaller::Settings
             }
 
             auto experiment = Experiment::GetExperiment(key);
-            auto userSettingsExperiments = userSettings.Get<Setting::Experiments>();
             auto experimentJsonName = experiment.JsonName();
+
+            if (!userSettings.Get<Setting::AllowExperiments>())
+            {
+                AICLI_LOG(Core, Info, << "Experiment " << Experiment::GetExperiment(key).Name() <<
+                    " is disabled due to experiments not allowed from user settings");
+                return { false, ExperimentToggleSource::UserSettingGlobalControl };
+            }
+
+            auto userSettingsExperiments = userSettings.Get<Setting::Experiments>();
             if (userSettingsExperiments.find(experimentJsonName) != userSettingsExperiments.end())
             {
                 auto isEnabled = userSettingsExperiments[experimentJsonName];
                 AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false") << " in user settings");
-                return { isEnabled, ExperimentToggleSource::UserSetting };
+                return { isEnabled, ExperimentToggleSource::UserSettingIndividualControl };
             }
 
             auto isEnabled = AppInstaller::Experiment::IsEnabled(experiment.GetKey());
@@ -50,8 +58,10 @@ namespace AppInstaller::Settings
                 return "Default";
             case ExperimentToggleSource::Policy:
                 return "Policy";
-            case ExperimentToggleSource::UserSetting:
-                return "UserSetting";
+            case ExperimentToggleSource::UserSettingIndividualControl:
+                return "UserSettingIndividualControl";
+            case ExperimentToggleSource::UserSettingGlobalControl:
+                return "UserSettingGlobalControl";
             default:
                 return "Unknown";
             }
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 82ca5e2476..5fb7ecf9d0 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -12,13 +12,22 @@ namespace AppInstaller::Settings
     {
         Default = 0,
         Policy,
-        UserSetting,
+        UserSettingIndividualControl,
+        UserSettingGlobalControl,
     };
 
     struct ExperimentState
     {
         ExperimentState() = default;
         ExperimentState(bool isEnabled, ExperimentToggleSource toggleSource) : m_isEnabled(isEnabled), m_toggleSource(toggleSource) {}
+
+        /// <summary>
+        /// Gets a value indicating whether the experiment is enabled.
+        /// </summary>
+        /// <returns>True if the experiment is enabled; otherwise, false.</returns>
+        /// <remarks>This API expects an experiment to be disabled by default and will
+        /// always return false if the user opts out of the experiment from the
+        /// user settings or group policy.</remarks>
         bool IsEnabled() const { return m_isEnabled; }
         ExperimentToggleSource ToggleSource() const { return m_toggleSource; }
         std::string ToJson() const;
diff --git a/src/AppInstallerCommonCore/Public/winget/UserSettings.h b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
index 60e46cc7d2..cdacbad18a 100644
--- a/src/AppInstallerCommonCore/Public/winget/UserSettings.h
+++ b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
@@ -114,6 +114,7 @@ namespace AppInstaller::Settings
         InteractivityDisable,
         // Experiments
         Experiments,
+        AllowExperiments,
 #ifndef AICLI_DISABLE_TEST_HOOKS
         // Debug
         EnableSelfInitiatedMinidump,
@@ -210,6 +211,7 @@ namespace AppInstaller::Settings
         // Experiments
         using Experiments_t = std::map<std::string, bool>;
         SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, Experiments_t, Experiments_t, {}, ".experiments"sv);
+        SETTINGMAPPING_SPECIALIZATION(Setting::AllowExperiments, bool, bool, true, ".allowExperiments"sv);
 
         // Used to deduce the SettingVariant type; making a variant that includes std::monostate and all SettingMapping types.
         template <size_t... I>
diff --git a/src/AppInstallerCommonCore/UserSettings.cpp b/src/AppInstallerCommonCore/UserSettings.cpp
index 63765efbd7..750ffcfc36 100644
--- a/src/AppInstallerCommonCore/UserSettings.cpp
+++ b/src/AppInstallerCommonCore/UserSettings.cpp
@@ -305,6 +305,7 @@ namespace AppInstaller::Settings
         WINGET_VALIDATE_PASS_THROUGH(NetworkWingetAlternateSourceURL)
         WINGET_VALIDATE_PASS_THROUGH(MaxResumes)
         WINGET_VALIDATE_PASS_THROUGH(Experiments)
+        WINGET_VALIDATE_PASS_THROUGH(AllowExperiments)
 
 #ifndef AICLI_DISABLE_TEST_HOOKS
         WINGET_VALIDATE_PASS_THROUGH(EnableSelfInitiatedMinidump)

From 7e12f7ff4360b8ee7d06fa1885dbedcdcb751b9f Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Fri, 3 Jan 2025 15:15:27 -0800
Subject: [PATCH 15/18] Addressing comments

---
 src/AppInstallerCLITests/Experiment.cpp       | 14 ++++++--
 .../AppInstallerTelemetry.cpp                 | 21 +++++++-----
 src/AppInstallerCommonCore/Experiment.cpp     | 33 +++++++++++--------
 .../Public/AppInstallerTelemetry.h            |  7 +++-
 .../Public/winget/Experiment.h                |  4 +++
 src/AppInstallerRepositoryCore/SourceList.cpp | 17 +++++-----
 src/AppInstallerRepositoryCore/SourceList.h   |  2 +-
 .../SourcePolicy.cpp                          |  6 ++--
 8 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index d16b7f0668..3fbc06762c 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -19,6 +19,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 {
     SECTION("Not configured")
     {
+        Experiment::ResetStates();
         GroupPolicyTestOverride policies;
         policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::NotConfigured);
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
@@ -26,6 +27,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 
     SECTION("Enabled")
     {
+        Experiment::ResetStates();
         GroupPolicyTestOverride policies;
         policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
@@ -33,6 +35,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 
     SECTION("Disabled")
     {
+        Experiment::ResetStates();
         GroupPolicyTestOverride policies;
         policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
@@ -41,7 +44,8 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 
 TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
 {
-    TestUserSettings settings; \
+    Experiment::ResetStates();
+    TestUserSettings settings;
     settings.Set<Setting::Experiments>({{"TestExperiment", true}});
 
     // If the policy is disabled, then also the user settings should be ignored.
@@ -55,18 +59,21 @@ TEST_CASE("Experiment_UserSettingsIndividualControl", "[experiment]")
     SECTION("Experiments not configured in user settings")
     {
         // Default value are used
+        Experiment::ResetStates();
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Experiments enabled in user settings")
     {
-        TestUserSettings settings; \
+        Experiment::ResetStates();
+        TestUserSettings settings;
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
     }
 
     SECTION("Experiments disabled in user settings")
     {
+        Experiment::ResetStates();
         TestUserSettings settings;
         settings.Set<Setting::Experiments>({{"TestExperiment", false}});
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingIndividualControl);
@@ -77,6 +84,7 @@ TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 {
     SECTION("'Allow experiments' not configured in user settings")
     {
+        Experiment::ResetStates();
         TestUserSettings settings;
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
@@ -84,6 +92,7 @@ TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 
     SECTION("'Allow experiments' enabled in user settings")
     {
+        Experiment::ResetStates();
         TestUserSettings settings;
         settings.Set<Setting::AllowExperiments>(true);
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
@@ -92,6 +101,7 @@ TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 
     SECTION("'Allow experiments' disabled in user settings")
     {
+        Experiment::ResetStates();
         TestUserSettings settings;
         settings.Set<Setting::AllowExperiments>(false);
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
diff --git a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
index 6f7e41f8ce..bf8bfdf332 100644
--- a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
+++ b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
@@ -81,7 +81,7 @@ namespace AppInstaller::Logging
             }
         }
 
-        std::wstring GetExperimentsJson(const std::map<ExperimentKey, ExperimentState>& experiments)
+        std::wstring GetExperimentsJson(const Settings:: ExperimentStateCache& experiments)
         {
             Json::Value root;
             for (const auto& experiment : experiments)
@@ -778,17 +778,20 @@ namespace AppInstaller::Logging
 
     Settings::ExperimentState TelemetryTraceLogger::GetExperimentState(ExperimentKey key)
     {
-#ifndef AICLI_DISABLE_TEST_HOOKS
-        m_summary.Experiments.clear();
-#endif
-
-        if (m_summary.Experiments.find(key) == m_summary.Experiments.end())
+        auto it = m_summary.ExperimentCache.find(key);
+        if (it == m_summary.ExperimentCache.end())
         {
-            m_summary.Experiments[key] =  Settings::Experiment::GetStateInternal(key);
+            it = m_summary.ExperimentCache.emplace(key, Settings::Experiment::GetStateInternal(key)).first;
         }
+        return it->second;
+    }
 
-        return m_summary.Experiments[key];
+#ifndef AICLI_DISABLE_TEST_HOOKS
+    void TelemetryTraceLogger::ResetExperiments()
+    {
+        m_summary.ExperimentCache.clear();
     }
+#endif
 
     TelemetryTraceLogger::~TelemetryTraceLogger()
     {
@@ -803,7 +806,7 @@ namespace AppInstaller::Logging
 
             if (m_useSummary)
             {
-                auto experimentsJson = GetExperimentsJson(m_summary.Experiments);
+                auto experimentsJson = GetExperimentsJson(m_summary.ExperimentCache);
 
                 TraceLoggingWriteActivity(
                     g_hTraceProvider,
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 8e4991ccd5..90df8a54b9 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -15,38 +15,38 @@ namespace AppInstaller::Settings
     {
         ExperimentState GetExperimentStateInternal(ExperimentKey key, const UserSettings& userSettings)
         {
-            if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
-            {
-                AICLI_LOG(Core, Info, << "Experiment " << Experiment::GetExperiment(key).Name() <<
-                    " is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
-                return { false, ExperimentToggleSource::Policy };
-            }
-
             if (key == ExperimentKey::None)
             {
                 return { false, ExperimentToggleSource::Default };
             }
 
             auto experiment = Experiment::GetExperiment(key);
-            auto experimentJsonName = experiment.JsonName();
+            if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
+            {
+                AICLI_LOG(Core, Verbose, << "Experiment " << experiment.Name() <<
+                    " is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
+                return { false, ExperimentToggleSource::Policy };
+            }
 
+            auto experimentJsonName = experiment.JsonName();
             if (!userSettings.Get<Setting::AllowExperiments>())
             {
-                AICLI_LOG(Core, Info, << "Experiment " << Experiment::GetExperiment(key).Name() <<
+                AICLI_LOG(Core, Verbose, << "Experiment " << experiment.Name() <<
                     " is disabled due to experiments not allowed from user settings");
                 return { false, ExperimentToggleSource::UserSettingGlobalControl };
             }
 
             auto userSettingsExperiments = userSettings.Get<Setting::Experiments>();
-            if (userSettingsExperiments.find(experimentJsonName) != userSettingsExperiments.end())
+            auto userSettingsExperimentIter = userSettingsExperiments.find(experimentJsonName);
+            if (userSettingsExperimentIter != userSettingsExperiments.end())
             {
-                auto isEnabled = userSettingsExperiments[experimentJsonName];
-                AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false") << " in user settings");
+                auto isEnabled = userSettingsExperimentIter->second;
+                AICLI_LOG(Core, Verbose, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false") << " in user settings");
                 return { isEnabled, ExperimentToggleSource::UserSettingIndividualControl };
             }
 
             auto isEnabled = AppInstaller::Experiment::IsEnabled(experiment.GetKey());
-            AICLI_LOG(Core, Info, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false"));
+            AICLI_LOG(Core, Verbose, << "Experiment " << experiment.Name() << " is set to " << (isEnabled ? "true" : "false"));
             return { isEnabled, ExperimentToggleSource::Default };
         }
 
@@ -87,6 +87,13 @@ namespace AppInstaller::Settings
         return Logging::Telemetry().GetExperimentState(key);
     }
 
+#ifndef AICLI_DISABLE_TEST_HOOKS
+    void Experiment::ResetStates()
+    {
+        Logging::Telemetry().ResetExperiments();
+    }
+#endif
+
     Experiment Experiment::GetExperiment(ExperimentKey key)
     {
         switch (key)
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
index 95bfa344a6..f8e14b595d 100644
--- a/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
+++ b/src/AppInstallerCommonCore/Public/AppInstallerTelemetry.h
@@ -12,6 +12,7 @@
 namespace AppInstaller::Settings
 {
     struct UserSettings;
+    typedef std::map<AppInstaller::Experiment::ExperimentKey, Settings::ExperimentState> ExperimentStateCache;
 }
 
 namespace AppInstaller::Logging
@@ -130,7 +131,7 @@ namespace AppInstaller::Logging
         std::string DOUrl;
         HRESULT DOHResult = S_OK;
 
-        std::map<AppInstaller::Experiment::ExperimentKey, Settings::ExperimentState> Experiments;
+        Settings::ExperimentStateCache ExperimentCache;
     };
 
     // This type contains the registration lifetime of the telemetry trace logging provider.
@@ -272,6 +273,10 @@ namespace AppInstaller::Logging
 
         Settings::ExperimentState GetExperimentState(AppInstaller::Experiment::ExperimentKey key);
 
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        void ResetExperiments();
+#endif
+
     protected:
         bool IsTelemetryEnabled() const noexcept;
 
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 5fb7ecf9d0..45e9dba36c 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -48,6 +48,10 @@ namespace AppInstaller::Settings
         static Experiment GetExperiment(AppInstaller::Experiment::ExperimentKey key);
         static std::vector<Experiment> GetAllExperiments();
 
+#ifndef AICLI_DISABLE_TEST_HOOKS
+        static void ResetStates();
+#endif
+
         std::string Name() const { return m_name; }
         std::string JsonName() const { return m_jsonName; }
         std::string Link() const { return m_link; }
diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
index 0e3ef4a73e..b7807463fa 100644
--- a/src/AppInstallerRepositoryCore/SourceList.cpp
+++ b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -259,19 +259,18 @@ namespace AppInstaller::Repository
         return {};
     }
 
-    std::string_view GetWellKnownSourceArg(WellKnownSource source)
+    bool IsWellKnownSourceArg(std::string_view arg, WellKnownSource source)
     {
         switch (source)
         {
         case WellKnownSource::WinGet:
-            return GetWingetCommunitySource();
+            return Utility::CaseInsensitiveEquals(arg, s_Source_WingetCommunityDefault_Arg) || Utility::CaseInsensitiveEquals(arg, s_Source_WingetCommunityExperimental_Arg);
         case WellKnownSource::MicrosoftStore:
-            return s_Source_MSStoreDefault_Arg;
+            return Utility::CaseInsensitiveEquals(arg, s_Source_MSStoreDefault_Arg);
         case WellKnownSource::DesktopFrameworks:
-            return s_Source_DesktopFrameworks_Arg;
+            return Utility::CaseInsensitiveEquals(arg, s_Source_DesktopFrameworks_Arg);
         }
-
-        return {};
+        return false;
     }
 
     std::string_view GetWellKnownSourceIdentifier(WellKnownSource source)
@@ -291,17 +290,17 @@ namespace AppInstaller::Repository
 
     std::optional<WellKnownSource> CheckForWellKnownSourceMatch(std::string_view name, std::string_view arg, std::string_view type)
     {
-        if (name == s_Source_WingetCommunityDefault_Name && arg == GetWingetCommunitySource() && type == Microsoft::PreIndexedPackageSourceFactory::Type())
+        if (name == s_Source_WingetCommunityDefault_Name && IsWellKnownSourceArg(arg, WellKnownSource::WinGet) && type == Microsoft::PreIndexedPackageSourceFactory::Type())
         {
             return WellKnownSource::WinGet;
         }
 
-        if (name == s_Source_MSStoreDefault_Name && arg == s_Source_MSStoreDefault_Arg && type == Rest::RestSourceFactory::Type())
+        if (name == s_Source_MSStoreDefault_Name && IsWellKnownSourceArg(arg, WellKnownSource::MicrosoftStore) && type == Rest::RestSourceFactory::Type())
         {
             return WellKnownSource::MicrosoftStore;
         }
 
-        if (name == s_Source_DesktopFrameworks_Name && arg == s_Source_DesktopFrameworks_Arg && type == Microsoft::PreIndexedPackageSourceFactory::Type())
+        if (name == s_Source_DesktopFrameworks_Name && IsWellKnownSourceArg(arg, WellKnownSource::DesktopFrameworks) && type == Microsoft::PreIndexedPackageSourceFactory::Type())
         {
             return WellKnownSource::DesktopFrameworks;
         }
diff --git a/src/AppInstallerRepositoryCore/SourceList.h b/src/AppInstallerRepositoryCore/SourceList.h
index b8808be3c7..29e2dc48b8 100644
--- a/src/AppInstallerRepositoryCore/SourceList.h
+++ b/src/AppInstallerRepositoryCore/SourceList.h
@@ -8,8 +8,8 @@
 namespace AppInstaller::Repository
 {
     // Built-in values for default sources
+    bool IsWellKnownSourceArg(std::string_view arg, WellKnownSource source);
     std::string_view GetWellKnownSourceName(WellKnownSource source);
-    std::string_view GetWellKnownSourceArg(WellKnownSource source);
     std::string_view GetWellKnownSourceIdentifier(WellKnownSource source);
     std::optional<WellKnownSource> CheckForWellKnownSourceMatch(std::string_view name, std::string_view arg, std::string_view type);
 
diff --git a/src/AppInstallerRepositoryCore/SourcePolicy.cpp b/src/AppInstallerRepositoryCore/SourcePolicy.cpp
index 8df191947d..f3d59c9f02 100644
--- a/src/AppInstallerRepositoryCore/SourcePolicy.cpp
+++ b/src/AppInstallerRepositoryCore/SourcePolicy.cpp
@@ -110,14 +110,12 @@ namespace AppInstaller::Repository
         //  - Check only against the source argument and type as the user source may have a different name.
         //  - Do a case-insensitive check as the domain portion of the URL is case-insensitive,
         //    and we don't need case sensitivity for the rest as we control the domain.
-        if (Utility::CaseInsensitiveEquals(arg, GetWellKnownSourceArg(WellKnownSource::WinGet)) &&
-            Utility::CaseInsensitiveEquals(type, Microsoft::PreIndexedPackageSourceFactory::Type()))
+        if (IsWellKnownSourceArg(arg, WellKnownSource::WinGet) && Utility::CaseInsensitiveEquals(type, Microsoft::PreIndexedPackageSourceFactory::Type()))
         {
             return IsWellKnownSourceEnabled(WellKnownSource::WinGet) ? TogglePolicy::Policy::None : TogglePolicy::Policy::DefaultSource;
         }
 
-        if (Utility::CaseInsensitiveEquals(arg, GetWellKnownSourceArg(WellKnownSource::MicrosoftStore)) &&
-            Utility::CaseInsensitiveEquals(type, Rest::RestSourceFactory::Type()))
+        if (IsWellKnownSourceArg(arg, WellKnownSource::MicrosoftStore) && Utility::CaseInsensitiveEquals(type, Rest::RestSourceFactory::Type()))
         {
             return IsWellKnownSourceEnabled(WellKnownSource::MicrosoftStore) ? TogglePolicy::Policy::None : TogglePolicy::Policy::MSStoreSource;
         }

From c76d4d7e329848cb197a86ba4700791284b122d4 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:41:22 -0800
Subject: [PATCH 16/18] Addressing comments

---
 .../JSON/settings/settings.schema.0.2.json    |  2 +-
 src/AppInstallerCLITests/Experiment.cpp       | 20 +++++++++----------
 src/AppInstallerCLITests/TestSettings.cpp     |  8 +++++++-
 src/AppInstallerCLITests/TestSettings.h       |  6 ++++++
 src/AppInstallerCommonCore/Experiment.cpp     |  7 -------
 .../Public/winget/Experiment.h                | 15 ++++----------
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json
index 300cab4d92..7284c3546b 100644
--- a/schemas/JSON/settings/settings.schema.0.2.json
+++ b/schemas/JSON/settings/settings.schema.0.2.json
@@ -311,7 +311,7 @@
       "type": "object",
       "properties": {
         "CDN": {
-          "description": "Enables the use of an alternative CDN for package downloads",
+          "description": "Enables the use of an alternative CDN for the winget source",
           "type": "boolean",
           "default": false
         }
diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index 3fbc06762c..9b970f08a8 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -19,7 +19,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 {
     SECTION("Not configured")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         GroupPolicyTestOverride policies;
         policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::NotConfigured);
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
@@ -27,7 +27,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 
     SECTION("Enabled")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         GroupPolicyTestOverride policies;
         policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
@@ -35,7 +35,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 
     SECTION("Disabled")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         GroupPolicyTestOverride policies;
         policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Disabled);
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
@@ -44,7 +44,7 @@ TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 
 TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
 {
-    Experiment::ResetStates();
+    ExperimentsTest experiments;
     TestUserSettings settings;
     settings.Set<Setting::Experiments>({{"TestExperiment", true}});
 
@@ -59,13 +59,13 @@ TEST_CASE("Experiment_UserSettingsIndividualControl", "[experiment]")
     SECTION("Experiments not configured in user settings")
     {
         // Default value are used
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
     SECTION("Experiments enabled in user settings")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
@@ -73,7 +73,7 @@ TEST_CASE("Experiment_UserSettingsIndividualControl", "[experiment]")
 
     SECTION("Experiments disabled in user settings")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::Experiments>({{"TestExperiment", false}});
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingIndividualControl);
@@ -84,7 +84,7 @@ TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 {
     SECTION("'Allow experiments' not configured in user settings")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
@@ -92,7 +92,7 @@ TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 
     SECTION("'Allow experiments' enabled in user settings")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::AllowExperiments>(true);
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
@@ -101,7 +101,7 @@ TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 
     SECTION("'Allow experiments' disabled in user settings")
     {
-        Experiment::ResetStates();
+        ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::AllowExperiments>(false);
         settings.Set<Setting::Experiments>({{"TestExperiment", true}});
diff --git a/src/AppInstallerCLITests/TestSettings.cpp b/src/AppInstallerCLITests/TestSettings.cpp
index 20613c93fa..f6fa5ce43f 100644
--- a/src/AppInstallerCLITests/TestSettings.cpp
+++ b/src/AppInstallerCLITests/TestSettings.cpp
@@ -4,6 +4,7 @@
 #include "TestCommon.h"
 #include "TestSettings.h"
 #include <winget/Settings.h>
+#include <AppInstallerTelemetry.h>
 
 using namespace AppInstaller::Settings;
 
@@ -71,4 +72,9 @@ namespace TestCommon
     {
         m_toggles[policy] = state;
     }
-}
\ No newline at end of file
+
+    ExperimentsTest::~ExperimentsTest()
+    {
+        AppInstaller::Logging::Telemetry().ResetExperiments();
+    }
+}
diff --git a/src/AppInstallerCLITests/TestSettings.h b/src/AppInstallerCLITests/TestSettings.h
index f100a9f0b2..03f26da6ab 100644
--- a/src/AppInstallerCLITests/TestSettings.h
+++ b/src/AppInstallerCLITests/TestSettings.h
@@ -3,6 +3,7 @@
 #pragma once
 #include <winget/Settings.h>
 #include <winget/UserSettings.h>
+#include <winget/Experiment.h>
 #include <wil/resource.h>
 #include <string>
 
@@ -48,6 +49,11 @@ namespace TestCommon
     {
     };
 
+    struct ExperimentsTest
+    {
+        ~ExperimentsTest();
+    };
+
     struct GroupPolicyTestOverride : AppInstaller::Settings::GroupPolicy
     {
         GroupPolicyTestOverride() : GroupPolicyTestOverride(RegCreateVolatileTestRoot().get()) {}
diff --git a/src/AppInstallerCommonCore/Experiment.cpp b/src/AppInstallerCommonCore/Experiment.cpp
index 90df8a54b9..9d7232899a 100644
--- a/src/AppInstallerCommonCore/Experiment.cpp
+++ b/src/AppInstallerCommonCore/Experiment.cpp
@@ -87,13 +87,6 @@ namespace AppInstaller::Settings
         return Logging::Telemetry().GetExperimentState(key);
     }
 
-#ifndef AICLI_DISABLE_TEST_HOOKS
-    void Experiment::ResetStates()
-    {
-        Logging::Telemetry().ResetExperiments();
-    }
-#endif
-
     Experiment Experiment::GetExperiment(ExperimentKey key)
     {
         switch (key)
diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 45e9dba36c..0a32dc9965 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -21,13 +21,10 @@ namespace AppInstaller::Settings
         ExperimentState() = default;
         ExperimentState(bool isEnabled, ExperimentToggleSource toggleSource) : m_isEnabled(isEnabled), m_toggleSource(toggleSource) {}
 
-        /// <summary>
-        /// Gets a value indicating whether the experiment is enabled.
-        /// </summary>
-        /// <returns>True if the experiment is enabled; otherwise, false.</returns>
-        /// <remarks>This API expects an experiment to be disabled by default and will
-        /// always return false if the user opts out of the experiment from the
-        /// user settings or group policy.</remarks>
+        // Gets a value indicating whether the experiment is enabled.
+        // Note: This API expects an experiment to be disabled by default and will
+        // always return false if the user opts out of the experiment from the
+        // user settings or group policy.
         bool IsEnabled() const { return m_isEnabled; }
         ExperimentToggleSource ToggleSource() const { return m_toggleSource; }
         std::string ToJson() const;
@@ -48,10 +45,6 @@ namespace AppInstaller::Settings
         static Experiment GetExperiment(AppInstaller::Experiment::ExperimentKey key);
         static std::vector<Experiment> GetAllExperiments();
 
-#ifndef AICLI_DISABLE_TEST_HOOKS
-        static void ResetStates();
-#endif
-
         std::string Name() const { return m_name; }
         std::string JsonName() const { return m_jsonName; }
         std::string Link() const { return m_link; }

From f597690cd3d5554c79e86d80d675a89e60b9eb41 Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Tue, 7 Jan 2025 11:25:10 -0800
Subject: [PATCH 17/18] Added UT

---
 src/AppInstallerCLITests/Experiment.cpp | 51 +++++++++++++++++++------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/AppInstallerCLITests/Experiment.cpp b/src/AppInstallerCLITests/Experiment.cpp
index 9b970f08a8..8d07b7bd08 100644
--- a/src/AppInstallerCLITests/Experiment.cpp
+++ b/src/AppInstallerCLITests/Experiment.cpp
@@ -15,6 +15,8 @@ using namespace AppInstaller::Experiment;
     REQUIRE(_isEnabled_ == testExperimentState.IsEnabled()); \
     REQUIRE(_toggleSource_ == testExperimentState.ToggleSource());
 
+const std::string s_TestExperimentName = "TestExperiment";
+
 TEST_CASE("Experiment_GroupPolicyControl", "[experiment]")
 {
     SECTION("Not configured")
@@ -46,7 +48,7 @@ TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
 {
     ExperimentsTest experiments;
     TestUserSettings settings;
-    settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+    settings.Set<Setting::Experiments>({{s_TestExperimentName, true}});
 
     // If the policy is disabled, then also the user settings should be ignored.
     GroupPolicyTestOverride policies;
@@ -54,57 +56,82 @@ TEST_CASE("Experiment_GroupPolicyDisabled_ReturnFalse", "[experiment]")
     ASSERT_EXPERIMENT(false, ExperimentToggleSource::Policy);
 }
 
+TEST_CASE("Experiment_GroupPolicyEnabled", "[experiment]")
+{
+    SECTION("Global experiments disabled in user settings")
+    {
+        GroupPolicyTestOverride policies;
+        policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
+        ExperimentsTest experiments;
+        TestUserSettings settings;
+        settings.Set<Setting::AllowExperiments>(false);
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, true}});
+        ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingGlobalControl);
+    }
+
+    SECTION("Individual experiment disabled in user settings")
+    {
+        GroupPolicyTestOverride policies;
+        policies.SetState(TogglePolicy::Policy::Experiments, PolicyState::Enabled);
+        ExperimentsTest experiments;
+        TestUserSettings settings;
+        settings.Set<Setting::AllowExperiments>(true);
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, false}});
+        ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingIndividualControl);
+    }
+}
+
 TEST_CASE("Experiment_UserSettingsIndividualControl", "[experiment]")
 {
-    SECTION("Experiments not configured in user settings")
+    SECTION("Individual experiment not configured in user settings")
     {
         // Default value are used
         ExperimentsTest experiments;
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::Default);
     }
 
-    SECTION("Experiments enabled in user settings")
+    SECTION("Individual experiment enabled in user settings")
     {
         ExperimentsTest experiments;
         TestUserSettings settings;
-        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
     }
 
-    SECTION("Experiments disabled in user settings")
+    SECTION("Individual experiment disabled in user settings")
     {
         ExperimentsTest experiments;
         TestUserSettings settings;
-        settings.Set<Setting::Experiments>({{"TestExperiment", false}});
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, false}});
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingIndividualControl);
     }
 }
 
 TEST_CASE("Experiment_UserSettingsGlobalControl", "[experiment]")
 {
-    SECTION("'Allow experiments' not configured in user settings")
+    SECTION("Global experiments not configured in user settings")
     {
         ExperimentsTest experiments;
         TestUserSettings settings;
-        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
     }
 
-    SECTION("'Allow experiments' enabled in user settings")
+    SECTION("Global experiments enabled in user settings")
     {
         ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::AllowExperiments>(true);
-        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, true}});
         ASSERT_EXPERIMENT(true, ExperimentToggleSource::UserSettingIndividualControl);
     }
 
-    SECTION("'Allow experiments' disabled in user settings")
+    SECTION("Global experiments disabled in user settings")
     {
         ExperimentsTest experiments;
         TestUserSettings settings;
         settings.Set<Setting::AllowExperiments>(false);
-        settings.Set<Setting::Experiments>({{"TestExperiment", true}});
+        settings.Set<Setting::Experiments>({{s_TestExperimentName, true}});
         ASSERT_EXPERIMENT(false, ExperimentToggleSource::UserSettingGlobalControl);
     }
 }

From 6c877edea62f394b163055ea904482103074b4fa Mon Sep 17 00:00:00 2001
From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com>
Date: Tue, 7 Jan 2025 13:00:56 -0800
Subject: [PATCH 18/18] Addressing comments

---
 src/AppInstallerCommonCore/Public/winget/Experiment.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/AppInstallerCommonCore/Public/winget/Experiment.h b/src/AppInstallerCommonCore/Public/winget/Experiment.h
index 0a32dc9965..5d97046ec4 100644
--- a/src/AppInstallerCommonCore/Public/winget/Experiment.h
+++ b/src/AppInstallerCommonCore/Public/winget/Experiment.h
@@ -38,17 +38,17 @@ namespace AppInstaller::Settings
         using Key_t = std::underlying_type_t<AppInstaller::Experiment::ExperimentKey>;
 
         Experiment(std::string name, std::string jsonName, std::string link, AppInstaller::Experiment::ExperimentKey key) :
-            m_name(std::move(name)), m_jsonName(jsonName), m_link(std::move(link)), m_key(std::move((key))) {}
+            m_name(std::move(name)), m_jsonName(std::move(jsonName)), m_link(std::move(link)), m_key(std::move((key))) {}
 
         static ExperimentState GetState(AppInstaller::Experiment::ExperimentKey feature);
         static ExperimentState GetStateInternal(AppInstaller::Experiment::ExperimentKey feature);
         static Experiment GetExperiment(AppInstaller::Experiment::ExperimentKey key);
         static std::vector<Experiment> GetAllExperiments();
 
-        std::string Name() const { return m_name; }
-        std::string JsonName() const { return m_jsonName; }
-        std::string Link() const { return m_link; }
-        AppInstaller::Experiment::ExperimentKey GetKey() const { return m_key; }
+        const std::string Name() const { return m_name; }
+        const std::string JsonName() const { return m_jsonName; }
+        const std::string Link() const { return m_link; }
+        const AppInstaller::Experiment::ExperimentKey GetKey() const { return m_key; }
 
     private:
         std::string m_name;