Skip to content

Commit a0fbe93

Browse files
Nirmal4GNirmal4G
committed
Rearrange lines for better diff
- Rearrange lines so that upcoming patches will have better diff. It will also aid in blame as clean diff makes understanding code easier.
1 parent 4e47faf commit a0fbe93

File tree

8 files changed

+71
-68
lines changed

8 files changed

+71
-68
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0;native</TargetFrameworks>
5-
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
65
<NuspecFile>Microsoft.Toolkit.Uwp.Notifications.nuspec</NuspecFile>
76
</PropertyGroup>
87

@@ -11,6 +10,10 @@
1110
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1211
</PropertyGroup>
1312

13+
<PropertyGroup>
14+
<DefineConstants>$(DefineConstants)NETFX_CORE</DefineConstants>
15+
</PropertyGroup>
16+
1417
<PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows10.0.17763.0'">
1518
<!-- Define the WINDOWS_UWP conditional symbol, since the 'Windows.Data.Xml' and the 'Windows.UI.Notification' namespaces are available -->
1619
<DefineConstants>$(DefineConstants);WINDOWS_UWP;WIN32</DefineConstants>

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,23 @@
2222
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
2323
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
2424
</group>
25-
<group targetFramework="UAP10.0.16299">
26-
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
27-
</group>
2825
<group targetFramework=".NETCoreApp3.1">
2926
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Build,Analyzers" />
3027
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
3128
<dependency id="System.Drawing.Common" version="4.7.0" exclude="Build,Analyzers" />
3229
<dependency id="System.Reflection.Emit" version="4.7.0" exclude="Build,Analyzers" />
3330
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
3431
</group>
32+
<group targetFramework=".NETFramework4.6.1">
33+
<dependency id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.2" exclude="Build,Analyzers" />
34+
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
35+
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
36+
</group>
37+
<group targetFramework="UAP10.0.10240" />
38+
<group targetFramework="UAP10.0.16299">
39+
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
40+
</group>
41+
<group targetFramework="native0.0" />
3542
<group targetFramework="net5.0">
3643
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
3744
</group>
@@ -41,45 +48,38 @@
4148
<dependency id="System.Reflection.Emit" version="4.7.0" exclude="Build,Analyzers" />
4249
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
4350
</group>
44-
<group targetFramework=".NETFramework4.6.1">
45-
<dependency id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.0" exclude="Build,Analyzers" />
46-
<dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" exclude="Build,Analyzers" />
47-
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
48-
</group>
49-
<group targetFramework="native0.0" />
50-
<group targetFramework="UAP10.0.10240" />
5151
</dependencies>
5252
</metadata>
5353
<files>
54-
<file src="..\build\Icon.png" target="" />
5554
<file src="..\License.md" target="" />
55+
<file src="..\build\Icon.png" target="" />
5656
<file src="Microsoft.Toolkit.Uwp.Notifications.targets" target="build\native\Microsoft.Toolkit.Uwp.Notifications.targets" />
57-
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.dll" />
58-
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" />
59-
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.xml" />
60-
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" />
61-
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" />
62-
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" />
63-
<file src="$buildOutput$\net5.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.dll" />
64-
<file src="$buildOutput$\net5.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.pdb" />
65-
<file src="$buildOutput$\net5.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.xml" />
66-
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" />
67-
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" />
68-
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" />
6957
<file src="$buildOutput$\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.dll" />
7058
<file src="$buildOutput$\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.pdb" />
7159
<file src="$buildOutput$\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\netstandard1.4\Microsoft.Toolkit.Uwp.Notifications.xml" />
60+
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.dll" />
61+
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.pdb" />
62+
<file src="$buildOutput$\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\netcoreapp3.1\Microsoft.Toolkit.Uwp.Notifications.xml" />
63+
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.dll" />
64+
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.pdb" />
65+
<file src="$buildOutput$\net461\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net461\Microsoft.Toolkit.Uwp.Notifications.xml" />
7266
<file src="$buildOutput$\uap10.0.19041\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.dll" />
7367
<file src="$buildOutput$\uap10.0.19041\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.pdb" />
7468
<file src="$buildOutput$\uap10.0.19041\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.pri" />
7569
<file src="$buildOutput$\uap10.0.19041\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\uap10.0.16299\Microsoft.Toolkit.Uwp.Notifications.xml" />
76-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pdb" />
77-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pri" />
78-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.winmd" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.winmd" />
79-
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.xml" />
8070
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.pdb" />
8171
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.pri" />
8272
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.winmd" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.winmd" />
8373
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\uap10.0.10240\Microsoft.Toolkit.Uwp.Notifications.xml" />
74+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pdb" />
75+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.pri" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.pri" />
76+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.winmd" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.winmd" />
77+
<file src="$buildOutput$\native\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\native\Microsoft.Toolkit.Uwp.Notifications.xml" />
78+
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.dll" />
79+
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.pdb" />
80+
<file src="$buildOutput$\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0\Microsoft.Toolkit.Uwp.Notifications.xml" />
81+
<file src="$buildOutput$\net5.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.dll" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.dll" />
82+
<file src="$buildOutput$\net5.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.pdb" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.pdb" />
83+
<file src="$buildOutput$\net5.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.xml" target="lib\net5.0-windows10.0.17763\Microsoft.Toolkit.Uwp.Notifications.xml" />
8484
</files>
8585
</package>

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
</PackageReference>
128128
</ItemGroup>
129129
<ItemGroup>
130-
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
131130
<Content Include="Assets\BrushAssets\TileTexture.png" />
132131
<Content Include="Assets\BrushAssets\NoiseTexture.png" />
133132
<Content Include="Assets\checker.png" />
@@ -1493,6 +1492,7 @@
14931492
</ProjectReference>
14941493
</ItemGroup>
14951494
<ItemGroup>
1495+
<!-- A reference to the entire .NET Framework and Windows SDK are automatically included -->
14961496
<SDKReference Include="Microsoft.Services.Store.Engagement, Version=10.0">
14971497
<Name>Microsoft Engagement Framework</Name>
14981498
</SDKReference>

‎Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
</PropertyGroup>
5151

5252
<ItemGroup>
53-
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
53+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
5454
</ItemGroup>
5555

5656
<ItemGroup>
57-
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
57+
<PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
5858
</ItemGroup>
5959

6060
</Project>

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<configuration>
22
<packageSources>
3-
<add key="AzureLatest" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" protocolVersion="3" />
43
<add key="MUX-Shared" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Shared/nuget/v3/index.json" />
4+
<add key="MainLatest" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" />
55
</packageSources>
66
</configuration>

‎SmokeTests/NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<configuration>
22
<packageSources>
33
<clear />
4-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
54
<add key="Local" value="..\bin\nupkg" />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
66
</packageSources>
77
</configuration>

‎UITests/UITests.Tests.Shared/UITestBase.cs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace UITests.Tests
2323
{
2424
public abstract class UITestBase
2525
{
26-
private TestSetupHelper helper;
2726

2827
internal static TestApplicationInfo WinUICSharpUWPSampleApp
2928
{
@@ -68,43 +67,14 @@ internal static TestApplicationInfo WinUICSharpUWPSampleApp
6867
}
6968
}
7069

70+
private TestSetupHelper helper;
71+
7172
private static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
7273
=> new()
7374
{
7475
AutomationIdOfSafeItemToClick = string.Empty
7576
};
7677

77-
public TestContext TestContext { get; set; }
78-
79-
[TestInitialize]
80-
public async Task TestInitialize()
81-
{
82-
// This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs)
83-
// We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete
84-
// our loading.
85-
helper = new TestSetupHelper(new string[] { }, TestSetupHelperOptions);
86-
87-
var pageName = GetPageForTest(TestContext);
88-
89-
var rez = await TestAssembly.OpenPage(pageName);
90-
91-
if (!rez)
92-
{
93-
// Error case, we didn't get confirmation of test starting.
94-
throw new InvalidOperationException("Test host didn't confirm test ready to execute page: " + pageName);
95-
}
96-
97-
Log.Comment("[Harness] Received Host Ready with Page: {0}", pageName);
98-
Wait.ForIdle();
99-
Log.Comment("[Harness] Starting Test for {0}...", pageName);
100-
}
101-
102-
[TestCleanup]
103-
public void TestCleanup()
104-
{
105-
helper.Dispose();
106-
}
107-
10878
private static string GetPageForTest(TestContext testContext)
10979
{
11080
#if USING_TAEF
@@ -142,5 +112,35 @@ private static string GetPageForTest(TestContext testContext)
142112

143113
return attribute.XamlFile;
144114
}
115+
116+
public TestContext TestContext { get; set; }
117+
118+
[TestInitialize]
119+
public async Task TestInitialize()
120+
{
121+
// This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs)
122+
// We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete our loading.
123+
helper = new TestSetupHelper(new string[] { }, TestSetupHelperOptions);
124+
125+
var pageName = GetPageForTest(TestContext);
126+
127+
var rez = await TestAssembly.OpenPage(pageName);
128+
129+
if (!rez)
130+
{
131+
// Error case, we didn't get confirmation of test starting.
132+
throw new InvalidOperationException("Test host didn't confirm test ready to execute page: " + pageName);
133+
}
134+
135+
Log.Comment("[Harness] Received Host Ready with Page: {0}", pageName);
136+
Wait.ForIdle();
137+
Log.Comment("[Harness] Starting Test for {0}...", pageName);
138+
}
139+
140+
[TestCleanup]
141+
public void TestCleanup()
142+
{
143+
helper.Dispose();
144+
}
145145
}
146146
}

‎build/Windows.Toolkit.Common.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="$(IsPackable)">
12-
<None Include="$(BuildToolsDirectory)Icon.png" Pack="true" PackagePath="\" />
13-
<None Include="$(RepositoryDirectory)License.md" Pack="true" PackagePath="\" />
14-
<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" />
12+
<None Pack="true" PackagePath="\" Visible="False" Include="$(BuildToolsDirectory)Icon.png" />
13+
<None Pack="true" PackagePath="\" Visible="False" Include="$(RepositoryDirectory)License.md" />
14+
<None Pack="true" PackagePath="\" Visible="False" Include="$(RepositoryDirectory)ThirdPartyNotices.txt" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)