diff --git a/Directory.Build.rsp b/Directory.Build.rsp
index 8ac4e60c5b2..18185ed66bd 100644
--- a/Directory.Build.rsp
+++ b/Directory.Build.rsp
@@ -1,4 +1,5 @@
-NoLogo
-MaxCPUCount
--NodeReuse:True
--Verbosity:Minimal
\ No newline at end of file
+-BinaryLogger
+-NodeReuse:False
+-Verbosity:Normal
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs
index caa8e9053b7..96ef30e3caf 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs
@@ -173,7 +173,9 @@ private static EnumStringAttribute GetEnumStringAttribute(Enum enumValue)
object[] attrs = memberInfo[0].GetCustomAttributes(typeof(EnumStringAttribute), false);
if (attrs != null && attrs.Length > 0)
+ {
return attrs[0] as EnumStringAttribute;
+ }
}
return null;
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 76f8ab79baf..92f03f79c82 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -5,12 +5,12 @@
Microsoft.Toolkit.Uwp.Notifications.nuspec
-
+
10.0.$(TargetPlatformRevision).0
- $(DefineConstants);NETFX_CORE
+ NETFX_CORE
@@ -29,10 +29,10 @@
.NETCore
v5.0
- false
$(DefineConstants);WINDOWS_UAP;WINRT
+ false
$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets
-
+
UAP,Version=v10.0
Native,Version=v0.0
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec
index 8b96f8a3bd6..d32968bdf10 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec
@@ -7,7 +7,7 @@
true
MIT
https://github.com/CommunityToolkit/WindowsCommunityToolkit
- https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png
+ ReadMe.md
Icon.png
The official way to send toast notifications on Windows 10 via code rather than XML, with the help of IntelliSense. Supports all C# app types, including WPF, UWP, WinForms, and Console, even without packaging your app as MSIX. Also supports C++ UWP apps.
@@ -23,9 +23,6 @@
-
-
-
@@ -33,6 +30,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -42,45 +49,40 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs
index f1672919788..8f9e3da30f2 100644
--- a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs
@@ -25,7 +25,7 @@ public class ColorPickerButtonTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
///
diff --git a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs
index 6a14ceae6d7..663e6707397 100644
--- a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs
@@ -27,7 +27,7 @@ public class ConstrainedBoxTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
index 4e09ea8dbb9..32ab111ea68 100644
--- a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
@@ -33,7 +33,7 @@ public class GridSplitterTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs
index 385271c42ee..3bbea6146ae 100644
--- a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs
@@ -26,7 +26,7 @@ public class RangeSelectorTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
index 6d722bd945d..98679d65e5c 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
@@ -27,7 +27,7 @@ public class RichSuggestBoxTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
index b605debea8e..0dac88cb83d 100644
--- a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
@@ -25,7 +25,7 @@ public class TextBoxMaskTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
index 6576a58bc4c..8e05b9a2d0e 100644
--- a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
+++ b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
@@ -25,7 +25,7 @@ public class SimpleTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index 47d45afbcdd..9fe4b88d565 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -36,10 +36,10 @@ public static void AssemblyInitialize(TestContext testContext)
[AssemblyCleanup]
public static void AssemblyCleanup()
{
- TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICsUWPSampleApp);
+ TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICSharpUWPSampleApp);
}
- private static async Task InitalizeComService()
+ private static async Task InitializeComService()
{
CommunicationService = new AppServiceConnection();
@@ -84,7 +84,7 @@ internal static async Task SendCustomMessageToApp(ValueSet m
{
if (CommunicationService is null)
{
- await InitalizeComService();
+ await InitializeComService();
}
return await CommunicationService.SendMessageAsync(message);
@@ -94,7 +94,7 @@ private static async Task SendMessageToApp(ValueSet message)
{
if (CommunicationService is null)
{
- await InitalizeComService();
+ await InitializeComService();
}
var response = await CommunicationService.SendMessageAsync(message);
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
index d2a43582449..9d84fced5ad 100644
--- a/UITests/UITests.Tests.Shared/UITestBase.cs
+++ b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -25,49 +25,6 @@ public abstract class UITestBase
{
private TestSetupHelper helper;
- internal static TestApplicationInfo WinUICsUWPSampleApp
- {
- get
- {
- string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
- string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App");
-
- Log.Comment($"Base Package Search Directory = \"{baseDirectory}\"");
-
- var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
- var files = Directory.GetFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
-
- if (files.Count() == 0)
- {
- throw new Exception(string.Format("Failed to find '*.msix' in {0}'!", baseDirectory));
- }
-
- string mostRecentlyBuiltPackage = string.Empty;
- DateTime timeMostRecentlyBuilt = DateTime.MinValue;
-
- foreach (string file in files)
- {
- DateTime fileWriteTime = File.GetLastWriteTime(file);
-
- if (fileWriteTime > timeMostRecentlyBuilt)
- {
- timeMostRecentlyBuilt = fileWriteTime;
- mostRecentlyBuiltPackage = file;
- }
- }
-
- return new TestApplicationInfo(
- testAppPackageName: "UITests.App",
- testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
- testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
- testAppMainWindowTitle: "UITests.App",
- processName: "UITests.App.exe",
- installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty),
- certSerialNumber: "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d",
- baseAppxDir: baseDirectory);
- }
- }
-
private static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
=> new()
{
@@ -99,6 +56,68 @@ public async Task TestInitialize()
Log.Comment("[Harness] Starting Test for {0}...", pageName);
}
+ internal static TestApplicationInfo WinUICSharpUWPSampleApp
+ {
+ get
+ {
+ try
+ {
+ string assemblyDir = Path.GetDirectoryName(typeof(TestApplicationInfo).Assembly.Location);
+ var baseDir = Directory.GetParent(assemblyDir);
+
+ for (int i = 0; i < 10; i++)
+ {
+ if (baseDir.EnumerateDirectories().Any(d => d.Name.Equals("~build", StringComparison.OrdinalIgnoreCase)))
+ {
+ break;
+ }
+
+ baseDir = baseDir.Parent;
+ }
+
+ string publishDir = Path.Combine(baseDir.FullName, "~publish", "UITests.App");
+
+ Log.Comment($"Base Package Search Directory = \"{publishDir}\"");
+
+ var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
+ var files = Directory.EnumerateFiles(publishDir, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
+
+ if (!files.Any())
+ {
+ throw new Exception($"Failed to find '*.msix' in {publishDir}'!");
+ }
+
+ string mostRecentlyBuiltPackage = string.Empty;
+ DateTime timeMostRecentlyBuilt = DateTime.MinValue;
+
+ foreach (string file in files)
+ {
+ DateTime fileWriteTime = File.GetLastWriteTime(file);
+
+ if (fileWriteTime > timeMostRecentlyBuilt)
+ {
+ timeMostRecentlyBuilt = fileWriteTime;
+ mostRecentlyBuiltPackage = file;
+ }
+ }
+
+ return new TestApplicationInfo(
+ testAppPackageName: "UITests.App",
+ testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
+ testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
+ testAppMainWindowTitle: "UITests.App",
+ processName: "UITests.App.exe",
+ installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty),
+ certSerialNumber: "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d",
+ baseAppxDir: publishDir);
+ }
+ catch (Exception e)
+ {
+ throw new AggregateException("Can't get Test Application info from the published MSIX packages. Check Output paths.", e);
+ }
+ }
+ }
+
[TestCleanup]
public void TestCleanup()
{
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 4dd2896bfa9..cabea6cfcf4 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -2,16 +2,16 @@
Exe
- x86
- win10-x86
+ x64
+ win10-x64
netcoreapp3.1
true
+ USING_TAEF
false
true
- $(DefineConstants);USING_TAEF
$(PkgTAEF_Redist_Wlk)\build\Binaries\$(PlatformTarget)\CoreClr\
diff --git a/WindowsCommunityToolkit.sln b/WindowsCommunityToolkit.sln
index a0c4a505487..bba613a2403 100644
--- a/WindowsCommunityToolkit.sln
+++ b/WindowsCommunityToolkit.sln
@@ -172,7 +172,7 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -185,7 +185,7 @@ Global
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.ActiveCfg = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86
- {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
+ {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM
@@ -218,8 +218,8 @@ Global
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x64.Build.0 = Release|Any CPU
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.ActiveCfg = Release|Any CPU
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.Build.0 = Release|Any CPU
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x86
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x86
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x64
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.ActiveCfg = Debug|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Build.0 = Debug|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -232,8 +232,8 @@ Global
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.ActiveCfg = Debug|x86
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Build.0 = Debug|x86
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Deploy.0 = Debug|x86
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x86
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x86
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x64
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x64
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.ActiveCfg = Release|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Build.0 = Release|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Deploy.0 = Release|ARM
@@ -326,8 +326,8 @@ Global
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x64.Build.0 = Release|Any CPU
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.ActiveCfg = Release|Any CPU
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.Build.0 = Release|Any CPU
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x86
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x86
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x64
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.ActiveCfg = Debug|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Build.0 = Debug|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -340,8 +340,8 @@ Global
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.ActiveCfg = Debug|x86
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Build.0 = Debug|x86
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Deploy.0 = Debug|x86
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x86
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x86
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x64
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x64
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.ActiveCfg = Release|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Build.0 = Release|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Deploy.0 = Release|ARM
@@ -512,7 +512,7 @@ Global
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU
- {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x64
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -525,7 +525,7 @@ Global
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.ActiveCfg = Debug|x86
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Build.0 = Debug|x86
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Deploy.0 = Debug|x86
- {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x86
+ {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x64
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.ActiveCfg = Release|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Build.0 = Release|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Deploy.0 = Release|ARM
@@ -580,19 +580,23 @@ Global
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU
- {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -605,16 +609,20 @@ Global
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.ActiveCfg = Debug|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Build.0 = Debug|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Deploy.0 = Debug|x86
- {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x86
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.ActiveCfg = Release|ARM
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Build.0 = Release|ARM
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Deploy.0 = Release|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.ActiveCfg = Release|ARM64
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Build.0 = Release|ARM64
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Deploy.0 = Release|ARM64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.ActiveCfg = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Build.0 = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Deploy.0 = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.ActiveCfg = Release|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Build.0 = Release|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Deploy.0 = Release|x86
- {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.ActiveCfg = Debug|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Build.0 = Debug|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -627,9 +635,13 @@ Global
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.ActiveCfg = Debug|x86
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Build.0 = Debug|x86
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Deploy.0 = Debug|x86
- {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x86
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.ActiveCfg = Release|ARM
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Build.0 = Release|ARM
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Deploy.0 = Release|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.ActiveCfg = Release|ARM64
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Build.0 = Release|ARM64
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Deploy.0 = Release|ARM64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.ActiveCfg = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Build.0 = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Deploy.0 = Release|x64
@@ -720,8 +732,8 @@ Global
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|Any CPU
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x86
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x64
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -734,8 +746,8 @@ Global
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x64
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x64
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Build.0 = Release|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Deploy.0 = Release|ARM
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1b015300588..7229bd04c81 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -77,7 +77,7 @@ jobs:
configuration: $(BuildConfiguration)
maximumCpuCount: true
msbuildArchitecture: x64
- msbuildArgs: "-t:Pack -p:NoBuild=true"
+ msbuildArgs: "-t:Pack"
# Sign packages
- pwsh: build\Sign-Package.ps1