diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 5b244596eeb..307d3a242b8 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -12,7 +12,7 @@
-
+
$(DefineConstants);WINDOWS_UWP;WIN32
@@ -42,13 +42,12 @@
-
+
-
-
+
@@ -59,12 +58,15 @@
-
+
-
+
buildOutput=bin\$(Configuration);version=$(Version)
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index f34e1b92be1..87cbc7afd42 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -33,7 +33,7 @@
Condition="'$(NuGetPackageVersion)' == ''">
-
+
@@ -77,10 +77,10 @@
- $(MSBuildThisFileDirectory)..\bin\nupkg
+ $(MSBuildThisFileDirectory)..\bin\nupkg\
-
+
diff --git a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs
index f1672919788..8f9e3da30f2 100644
--- a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs
@@ -25,7 +25,7 @@ public class ColorPickerButtonTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
///
diff --git a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs
index 6a14ceae6d7..663e6707397 100644
--- a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs
@@ -27,7 +27,7 @@ public class ConstrainedBoxTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
index 4e09ea8dbb9..32ab111ea68 100644
--- a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
@@ -33,7 +33,7 @@ public class GridSplitterTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs
index 385271c42ee..3bbea6146ae 100644
--- a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs
@@ -26,7 +26,7 @@ public class RangeSelectorTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
index 6d722bd945d..98679d65e5c 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
@@ -27,7 +27,7 @@ public class RichSuggestBoxTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
index b605debea8e..0dac88cb83d 100644
--- a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
@@ -25,7 +25,7 @@ public class TextBoxMaskTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
index 6576a58bc4c..8e05b9a2d0e 100644
--- a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
+++ b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
@@ -25,7 +25,7 @@ public class SimpleTest : UITestBase
[TestProperty("Platform", "Any")]
public static void ClassInitialize(TestContext testContext)
{
- TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+ TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
}
[TestMethod]
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index e2956adde8e..944580fdf50 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -36,10 +36,10 @@ public static void AssemblyInitialize(TestContext testContext)
[AssemblyCleanup]
public static void AssemblyCleanup()
{
- TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICsUWPSampleApp);
+ TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICSharpUWPSampleApp);
}
- private static async Task InitalizeComService()
+ private static async Task InitializeComService()
{
CommunicationService = new AppServiceConnection();
@@ -84,7 +84,7 @@ internal static async Task SendCustomMessageToApp(ValueSet m
{
if (CommunicationService is null)
{
- await InitalizeComService();
+ await InitializeComService();
}
return await CommunicationService.SendMessageAsync(message);
@@ -94,7 +94,7 @@ private static async Task SendMessageToApp(ValueSet message)
{
if (CommunicationService is null)
{
- await InitalizeComService();
+ await InitializeComService();
}
var response = await CommunicationService.SendMessageAsync(message);
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
index d513a7ca2e6..939a1bc313c 100644
--- a/UITests/UITests.Tests.Shared/UITestBase.cs
+++ b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -25,7 +25,7 @@ public abstract class UITestBase
{
private TestSetupHelper helper;
- internal static TestApplicationInfo WinUICsUWPSampleApp
+ internal static TestApplicationInfo WinUICSharpUWPSampleApp
{
get
{
@@ -132,13 +132,13 @@ private static string GetPageForTest(TestContext testContext)
Log.Comment($"Found {testMethodString}.");
- var testpageAttributeString = $"\"{typeof(TestPageAttribute)}\" on {testMethodString}";
+ var testPageAttributeString = $"\"{typeof(TestPageAttribute)}\" on {testMethodString}";
if (method.GetCustomAttribute(typeof(TestPageAttribute), true) is not TestPageAttribute attribute)
{
- throw new Exception($"Could not find {testpageAttributeString}.");
+ throw new Exception($"Could not find {testPageAttributeString}.");
}
- Log.Comment($"Found {testpageAttributeString}. {nameof(TestPageAttribute.XamlFile)}: {attribute.XamlFile}.");
+ Log.Comment($"Found {testPageAttributeString}. {nameof(TestPageAttribute.XamlFile)}: {attribute.XamlFile}.");
return attribute.XamlFile;
}
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs
index af541ba311a..f8b93ca482e 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_DispatcherQueueExtensions.cs
@@ -16,7 +16,7 @@
namespace UnitTests.Extensions
{
[TestClass]
- [Ignore("Ignored until issue on .Net Native is fixed. These are working.")]
+ [Ignore("Ignored until issue on .NET Native is fixed. These are working.")]
public class Test_DispatcherQueueExtensions
{
private const int TIME_OUT = 5000;
diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props
index b81d49aadd3..0c943341a97 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.props
+++ b/build/Windows.Toolkit.VisualStudio.Design.props
@@ -15,7 +15,7 @@
-
+