Skip to content

Commit 3ced7e5

Browse files
committed
Revert unnecessary changes
1 parent ea85db1 commit 3ced7e5

File tree

3 files changed

+1
-31
lines changed

3 files changed

+1
-31
lines changed
Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE. -->
1+
<!-- Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
@@ -21,23 +21,4 @@
2121
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
25-
<CustomAdditionalCompileInputs Remove="Storage\StorageBar\StorageBar.xaml" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<None Remove="Storage\StorageBar\StorageBar.ThemeResources.xaml" />
30-
<None Remove="Storage\StorageBar\StorageBar.xaml" />
31-
</ItemGroup>
32-
33-
<ItemGroup>
34-
<Resource Remove="Storage\StorageBar\StorageBar.xaml" />
35-
</ItemGroup>
36-
37-
<ItemGroup>
38-
<Page Update="Storage\StorageBar\StorageBar.ThemeResources.xaml">
39-
<Generator>MSBuild:Compile</Generator>
40-
</Page>
41-
</ItemGroup>
42-
4324
</Project>

src/Files.App.Controls/Themes/Generic.xaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,17 @@
8080

8181
</ResourceDictionary.ThemeDictionaries>
8282

83-
84-
85-
8683
<ResourceDictionary.MergedDictionaries>
8784

8885
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
8986

90-
9187
<!--#region StorageControls-->
9288
<ResourceDictionary Source="ms-appx:///Files.App.Controls/Storage/StorageRing/StorageRing.ThemeResources.xaml" />
9389
<ResourceDictionary Source="ms-appx:///Files.App.Controls/Storage/StorageRing/StorageRing.xaml" />
9490
<ResourceDictionary Source="ms-appx:///Files.App.Controls/Storage/StorageBar/StorageBar.ThemeResources.xaml" />
9591
<ResourceDictionary Source="ms-appx:///Files.App.Controls/Storage/StorageBar/StorageBar.xaml" />
9692
<!--#endregion-->
9793

98-
9994
<!--#region ThemedIconStyles-->
10095
<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/ThemedIcon.xaml" />
10196
<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/ThemedIconLayer/ThemedIconLayer.xaml" />

tests/Files.App.UITests/Files.App.UITests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
3737
<ProjectCapability Include="Msix" />
3838
</ItemGroup>
39-
<ItemGroup>
40-
<Page Update="Views\StorageControlsPage.xaml">
41-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
42-
<Generator>MSBuild:Compile</Generator>
43-
</Page>
44-
</ItemGroup>
4539
<!-- Allows the Solution Explorer "Package and Publish" context menu entry to be enabled for this project even if the Windows App SDK Nuget package has not yet been restored. -->
4640
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
4741
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>

0 commit comments

Comments
 (0)