Skip to content

Commit 91dce2a

Browse files
Nirmal4GNirmal4G
committed
trying to fix tests - P1
rebase some fixes from internal branch
1 parent c62d29a commit 91dce2a

16 files changed

+149
-113
lines changed

‎Directory.Build.rsp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-NoLogo
22
-MaxCPUCount
3-
-NodeReuse:True
4-
-Verbosity:Minimal
3+
-BinaryLogger
4+
-NodeReuse:False
5+
-Verbosity:Normal

‎Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs

+2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ private static EnumStringAttribute GetEnumStringAttribute(Enum enumValue)
173173
object[] attrs = memberInfo[0].GetCustomAttributes(typeof(EnumStringAttribute), false);
174174

175175
if (attrs != null && attrs.Length > 0)
176+
{
176177
return attrs[0] as EnumStringAttribute;
178+
}
177179
}
178180

179181
return null;

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<NuspecFile>Microsoft.Toolkit.Uwp.Notifications.nuspec</NuspecFile>
66
</PropertyGroup>
77

8-
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0')) or '$(TargetFramework)' == 'native'">
8+
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0')) or '$(TargetFramework)' == 'native' or $(TargetFramework.Contains('windows10.0'))">
99
<TargetPlatformVersion>10.0.$(TargetPlatformRevision).0</TargetPlatformVersion>
1010
</PropertyGroup>
1111

1212
<PropertyGroup Condition="!$(TargetFramework.StartsWith('uap10.0'))">
13-
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
13+
<DefineConstants>NETFX_CORE</DefineConstants>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netcoreapp3.1' or $(TargetFramework.Contains('windows10.0'))">
@@ -29,10 +29,10 @@
2929
<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
3030
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
3131
<!-- Misc -->
32-
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
3332
<DefineConstants>$(DefineConstants);WINDOWS_UAP;WINRT</DefineConstants>
33+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
3434
<LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
35-
<!-- Workaround for issue NuGet/Home#8388; Restore conflict in VS IDE 2019 during DesignTime vs BuildTime. -->
35+
<!-- Workaround for issue NuGet/Home#5154; Restore conflict in VS IDE during DesignTime vs BuildTime. -->
3636
<NuGetTargetMoniker Condition="'$(DesignTimeBuild)' != 'true'">UAP,Version=v10.0</NuGetTargetMoniker>
3737
<NuGetTargetMoniker Condition="'$(DesignTimeBuild)' == 'true'">Native,Version=v0.0</NuGetTargetMoniker>
3838
</PropertyGroup>

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec

+31-29
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<requireLicenseAcceptance>true</requireLicenseAcceptance>
88
<license type="expression">MIT</license>
99
<projectUrl>https://github.com/CommunityToolkit/WindowsCommunityToolkit</projectUrl>
10-
<iconUrl>https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png</iconUrl>
10+
<readme>ReadMe.md</readme>
1111
<icon>Icon.png</icon>
1212
<description>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.
1313

@@ -23,16 +23,23 @@
2323
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
2424
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
2525
</group>
26-
<group targetFramework="UAP10.0.16299">
27-
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
28-
</group>
2926
<group targetFramework=".NETCoreApp3.1">
3027
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Build,Analyzers" />
3128
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
3229
<dependency id="System.Drawing.Common" version="4.7.0" exclude="Build,Analyzers" />
3330
<dependency id="System.Reflection.Emit" version="4.7.0" exclude="Build,Analyzers" />
3431
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
3532
</group>
33+
<group targetFramework=".NETFramework4.6.1">
34+
<dependency id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.2" exclude="Build,Analyzers" />
35+
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
36+
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
37+
</group>
38+
<group targetFramework="UAP10.0.10240" />
39+
<group targetFramework="UAP10.0.16299">
40+
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
41+
</group>
42+
<group targetFramework="native0.0" />
3643
<group targetFramework="net5.0">
3744
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
3845
</group>
@@ -42,45 +49,40 @@
4249
<dependency id="System.Reflection.Emit" version="4.7.0" exclude="Build,Analyzers" />
4350
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
4451
</group>
45-
<group targetFramework=".NETFramework4.6.1">
46-
<dependency id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.0" exclude="Build,Analyzers" />
47-
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
48-
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
49-
</group>
50-
<group targetFramework="native0.0" />
51-
<group targetFramework="UAP10.0.10240" />
5252
</dependencies>
5353
</metadata>
5454
<files>
55-
<file src="..\build\nuget.png" target="Icon.png" />
56-
<file src="..\license.md" target="" />
55+
<file src="ReadMe.md" target="ReadMe.md" />
56+
<file src="..\License.md" target="License.md" />
57+
<file src="..\build\Icon.png" target="Icon.png" />
58+
<file src="..\ThirdPartyNotices.txt" target="ThirdPartyNotices.txt" />
5759
<file src="Microsoft.Toolkit.Uwp.Notifications.targets" target="build\native\Microsoft.Toolkit.Uwp.Notifications.targets" />
58-
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.dll" />
59-
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" />
60-
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.xml" />
61-
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" />
62-
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" />
63-
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" />
64-
<file src="$buildOutput$\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.dll" />
65-
<file src="$buildOutput$\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.pdb" />
66-
<file src="$buildOutput$\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.xml" />
67-
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" />
68-
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" />
69-
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" />
7060
<file src="$buildOutput$\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.dll" />
7161
<file src="$buildOutput$\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.pdb" />
7262
<file src="$buildOutput$\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.xml" />
63+
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" />
64+
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" />
65+
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" />
66+
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.dll" />
67+
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" />
68+
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.xml" />
7369
<file src="$buildOutput$\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.dll" />
7470
<file src="$buildOutput$\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.pdb" />
7571
<file src="$buildOutput$\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.pri" />
7672
<file src="$buildOutput$\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.xml" />
77-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pdb" />
78-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pri" />
79-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.winmd" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.winmd" />
80-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.xml" />
8173
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.pdb" />
8274
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.pri" />
8375
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.winmd" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.winmd" />
8476
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.xml" />
77+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pdb" />
78+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pri" />
79+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.winmd" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.winmd" />
80+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.xml" />
81+
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" />
82+
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" />
83+
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" />
84+
<file src="$buildOutput$\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.dll" />
85+
<file src="$buildOutput$\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.pdb" />
86+
<file src="$buildOutput$\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.xml" />
8587
</files>
8688
</package>

‎UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ColorPickerButtonTest : UITestBase
2525
[TestProperty("Platform", "Any")]
2626
public static void ClassInitialize(TestContext testContext)
2727
{
28-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
28+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
2929
}
3030

3131
/// <summary>

‎UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class ConstrainedBoxTest : UITestBase
2727
[TestProperty("Platform", "Any")]
2828
public static void ClassInitialize(TestContext testContext)
2929
{
30-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
30+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
3131
}
3232

3333
[TestMethod]

‎UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class GridSplitterTest : UITestBase
3333
[TestProperty("Platform", "Any")]
3434
public static void ClassInitialize(TestContext testContext)
3535
{
36-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
36+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
3737
}
3838

3939
[TestMethod]

‎UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class RangeSelectorTest : UITestBase
2626
[TestProperty("Platform", "Any")]
2727
public static void ClassInitialize(TestContext testContext)
2828
{
29-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
29+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
3030
}
3131

3232
[TestMethod]

‎UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class RichSuggestBoxTest : UITestBase
2727
[TestProperty("Platform", "Any")]
2828
public static void ClassInitialize(TestContext testContext)
2929
{
30-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
30+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
3131
}
3232

3333
[TestMethod]

‎UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TextBoxMaskTest : UITestBase
2525
[TestProperty("Platform", "Any")]
2626
public static void ClassInitialize(TestContext testContext)
2727
{
28-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
28+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
2929
}
3030

3131
[TestMethod]

‎UITests/UITests.Tests.Shared/Examples/SimpleTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class SimpleTest : UITestBase
2525
[TestProperty("Platform", "Any")]
2626
public static void ClassInitialize(TestContext testContext)
2727
{
28-
TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
28+
TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp);
2929
}
3030

3131
[TestMethod]

‎UITests/UITests.Tests.Shared/TestAssembly.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public static void AssemblyInitialize(TestContext testContext)
3636
[AssemblyCleanup]
3737
public static void AssemblyCleanup()
3838
{
39-
TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICsUWPSampleApp);
39+
TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICSharpUWPSampleApp);
4040
}
4141

42-
private static async Task InitalizeComService()
42+
private static async Task InitializeComService()
4343
{
4444
CommunicationService = new AppServiceConnection();
4545

@@ -84,7 +84,7 @@ internal static async Task<AppServiceResponse> SendCustomMessageToApp(ValueSet m
8484
{
8585
if (CommunicationService is null)
8686
{
87-
await InitalizeComService();
87+
await InitializeComService();
8888
}
8989

9090
return await CommunicationService.SendMessageAsync(message);
@@ -94,7 +94,7 @@ private static async Task<bool> SendMessageToApp(ValueSet message)
9494
{
9595
if (CommunicationService is null)
9696
{
97-
await InitalizeComService();
97+
await InitializeComService();
9898
}
9999

100100
var response = await CommunicationService.SendMessageAsync(message);

0 commit comments

Comments
 (0)