Skip to content

Commit 4a8038c

Browse files
authored
Merge branch 'main' into 5bfa/CQ-PreviewHandlerVanaraRemoval
2 parents 1a67dc9 + 114bff3 commit 4a8038c

File tree

114 files changed

+2683
-1051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2683
-1051
lines changed

.github/NOTICE.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -645,36 +645,6 @@ A "contributor" is any person that distributes its contribution under this licen
645645
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
646646
```
647647

648-
## Vanara
649-
650-
**Source**: [https://github.com/dahall/Vanara](https://github.com/dahall/Vanara)
651-
652-
### License
653-
654-
```
655-
MIT License
656-
657-
Copyright (c) 2017 David Hall
658-
659-
Permission is hereby granted, free of charge, to any person obtaining a copy
660-
of this software and associated documentation files (the "Software"), to deal
661-
in the Software without restriction, including without limitation the rights
662-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
663-
copies of the Software, and to permit persons to whom the Software is
664-
furnished to do so, subject to the following conditions:
665-
666-
The above copyright notice and this permission notice shall be included in all
667-
copies or substantial portions of the Software.
668-
669-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
670-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
671-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
672-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
673-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
674-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
675-
SOFTWARE.
676-
```
677-
678648
## WinUIEx
679649

680650
**Source**: [https://github.com/dotMorten/WinUIEx](https://github.com/dotMorten/WinUIEx)

.github/workflows/deploy-stable-legacy.yml

Lines changed: 0 additions & 179 deletions
This file was deleted.

.github/workflows/format-xaml.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ jobs:
8080

8181
- name: Format XAML files
8282
if: env.CAN_RUN == 1
83-
run: xstyler -l None -r -d src/Files.App
83+
run: |
84+
xstyler -l None -r -d src/Files.App
85+
xstyler -l None -r -d src/Files.App.Controls
86+
xstyler -l None -r -d tests/Files.App.UITests
8487
8588
- name: Commit formatted files
8689
if: env.CAN_RUN == 1

src/Files.App (Package)/Files.Package.wapproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</ProjectReference>
108108
</ItemGroup>
109109
<ItemGroup>
110-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" IncludeAssets="build" />
110+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" IncludeAssets="build" />
111111
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" IncludeAssets="build" />
112112
</ItemGroup>
113113
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />

src/Files.App (Package)/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Identity
1717
Name="FilesDev"
1818
Publisher="CN=Files"
19-
Version="3.5.27.0" />
19+
Version="3.6.0.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>

src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.8" />
29+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
3030
</ItemGroup>
3131

3232
</Project>

src/Files.App.Controls/Files.App.Controls.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
20-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
20+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
2121
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
2222
</ItemGroup>
2323

0 commit comments

Comments
 (0)