Skip to content

Commit f2e0af0

Browse files
yaira2lukeblevins
andauthored
Azure Devops (#481)
* Auto-select known sidebar items * Improved pathbar logic * Fixed localization issue with location cards * Refactored file layout * Improve Item Collision Handling when creating new files * Improved rename experience * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update Files.sln * Update azure-pipelines.yml for Azure Pipelines * Update Files.csproj * Changed publisher name * Added assets * Added more assets * Testing a fix for Azure Pipeline * Revert "Testing a fix for Azure Pipeline" This reverts commit c029ef3. * Revert "Revert "Testing a fix for Azure Pipeline"" This reverts commit d41b7f6. * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Added build configuration * Added more build configurations * Added build configurations * Update azure-pipelines.yml for Azure Pipelines * Downgraded WinUI version * Improve Accuracy of Item File Extension Property * Update azure-pipelines.yml for Azure Pipelines * Work around animation bug in pre-release WinUI NavigationView * Upgrade WinUI Version * Update azure-pipelines.yml for Azure Pipelines * Set up CI with Azure Pipelines (#480) [skip ci] Co-authored-by: Luke Blevins <[email protected]>
1 parent 7d50981 commit f2e0af0

File tree

95 files changed

+501
-903
lines changed

Some content is hidden

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

95 files changed

+501
-903
lines changed

Files.Launcher/Files.Launcher.csproj

+44
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,50 @@
4040
<PropertyGroup>
4141
<StartupObject />
4242
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
44+
<DebugSymbols>true</DebugSymbols>
45+
<OutputPath>bin\x64\Debug\</OutputPath>
46+
<DefineConstants>DEBUG;TRACE</DefineConstants>
47+
<DebugType>full</DebugType>
48+
<PlatformTarget>x64</PlatformTarget>
49+
<LangVersion>8.0</LangVersion>
50+
<ErrorReport>prompt</ErrorReport>
51+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
52+
<Prefer32Bit>true</Prefer32Bit>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
55+
<OutputPath>bin\x64\Release\</OutputPath>
56+
<DefineConstants>TRACE</DefineConstants>
57+
<Optimize>true</Optimize>
58+
<DebugType>pdbonly</DebugType>
59+
<PlatformTarget>x64</PlatformTarget>
60+
<LangVersion>8.0</LangVersion>
61+
<ErrorReport>prompt</ErrorReport>
62+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
63+
<Prefer32Bit>true</Prefer32Bit>
64+
</PropertyGroup>
65+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
66+
<DebugSymbols>true</DebugSymbols>
67+
<OutputPath>bin\x86\Debug\</OutputPath>
68+
<DefineConstants>DEBUG;TRACE</DefineConstants>
69+
<DebugType>full</DebugType>
70+
<PlatformTarget>x86</PlatformTarget>
71+
<LangVersion>8.0</LangVersion>
72+
<ErrorReport>prompt</ErrorReport>
73+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
74+
<Prefer32Bit>true</Prefer32Bit>
75+
</PropertyGroup>
76+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
77+
<OutputPath>bin\x86\Release\</OutputPath>
78+
<DefineConstants>TRACE</DefineConstants>
79+
<Optimize>true</Optimize>
80+
<DebugType>pdbonly</DebugType>
81+
<PlatformTarget>x86</PlatformTarget>
82+
<LangVersion>8.0</LangVersion>
83+
<ErrorReport>prompt</ErrorReport>
84+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
85+
<Prefer32Bit>true</Prefer32Bit>
86+
</PropertyGroup>
4387
<ItemGroup>
4488
<Reference Include="System" />
4589
<Reference Include="System.Core" />

Files.Package/Files.Package.wapproj

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
5656
<DisableXbfLineInfo>False</DisableXbfLineInfo>
5757
<GenerateTestArtifacts>True</GenerateTestArtifacts>
58+
<UapAppxPackageBuildMode>StoreAndSideload</UapAppxPackageBuildMode>
5859
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
5960
<EntryPointProjectUniqueName>..\Files\Files.csproj</EntryPointProjectUniqueName>
6061
</PropertyGroup>

Files.Package/Package.appxmanifest

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
3-
<Identity Name="49306atecsolution.FilesUWP" Publisher="CN=Luke Blevins" Version="0.7.2.0" />
3+
<Identity Name="FilesUWP" Publisher="CN=Luke Blevins" Version="0.7.2.0" />
44
<Properties>
55
<DisplayName>Files UWP - Preview</DisplayName>
6-
<PublisherDisplayName>Yair A</PublisherDisplayName>
6+
<PublisherDisplayName>FilesUWP</PublisherDisplayName>
77
<Logo>Assets\StoreLogo.png</Logo>
88
</Properties>
99
<Dependencies>

Files.sln

+10-2
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,32 @@ Global
3535
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|ARM64.Build.0 = Release|Any CPU
3636
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|x64.ActiveCfg = Release|Any CPU
3737
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|x64.Build.0 = Release|Any CPU
38-
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|x86.ActiveCfg = Release|Any CPU
39-
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|x86.Build.0 = Release|Any CPU
38+
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|x86.ActiveCfg = Release|x86
39+
{533F9E86-EE0A-4FCB-B70C-F29532C1B787}.Release|x86.Build.0 = Release|x86
4040
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.ActiveCfg = Debug|ARM
4141
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.Build.0 = Debug|ARM
42+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.Deploy.0 = Debug|ARM
4243
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM64.ActiveCfg = Debug|ARM64
4344
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM64.Build.0 = Debug|ARM64
45+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM64.Deploy.0 = Debug|ARM64
4446
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.ActiveCfg = Debug|x64
4547
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.Build.0 = Debug|x64
48+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.Deploy.0 = Debug|x64
4649
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.ActiveCfg = Debug|x86
4750
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.Build.0 = Debug|x86
51+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.Deploy.0 = Debug|x86
4852
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.ActiveCfg = Release|ARM
4953
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.Build.0 = Release|ARM
54+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.Deploy.0 = Release|ARM
5055
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM64.ActiveCfg = Release|ARM64
5156
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM64.Build.0 = Release|ARM64
57+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM64.Deploy.0 = Release|ARM64
5258
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x64.ActiveCfg = Release|x64
5359
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x64.Build.0 = Release|x64
60+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x64.Deploy.0 = Release|x64
5461
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x86.ActiveCfg = Release|x86
5562
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x86.Build.0 = Release|x86
63+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x86.Deploy.0 = Release|x86
5664
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.ActiveCfg = Debug|ARM
5765
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.Build.0 = Debug|ARM
5866
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.Deploy.0 = Debug|ARM

Files/Assets/LargeTile.scale-100.png

5.62 KB

Files/Assets/LargeTile.scale-125.png

7.05 KB

Files/Assets/LargeTile.scale-150.png

8.75 KB

Files/Assets/LargeTile.scale-200.png

12.3 KB

Files/Assets/LargeTile.scale-400.png

32.6 KB

Files/Assets/SmallTile.scale-100.png

1.66 KB

Files/Assets/SmallTile.scale-125.png

2.06 KB

Files/Assets/SmallTile.scale-150.png

2.44 KB

Files/Assets/SmallTile.scale-200.png

3.38 KB

Files/Assets/SmallTile.scale-400.png

7.01 KB
6.02 KB
7.48 KB
9.47 KB
13.4 KB
37.4 KB
2.58 KB
3.27 KB
3.96 KB
5.49 KB
11.8 KB
1.36 KB
1.74 KB
2.14 KB
2.9 KB
5.89 KB
482 Bytes
768 Bytes
8.95 KB
1.54 KB

Files/Assets/StoreLogo.scale-100.png

2.01 KB

Files/Assets/StoreLogo.scale-125.png

2.59 KB

Files/Assets/StoreLogo.scale-150.png

3.09 KB

Files/Assets/StoreLogo.scale-200.png

4.2 KB

Files/Assets/StoreLogo.scale-400.png

8.55 KB
2.74 KB
3.51 KB
4.29 KB
6.02 KB
13.4 KB

Files/BaseLayout.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -95,24 +95,24 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
9595
InstanceTabsView instanceTabsView = rootFrame.Content as InstanceTabsView;
9696
instanceTabsView.TabStrip_SelectionChanged(null, null);
9797
}
98-
App.CurrentInstance.NavigationControl.CanRefresh = true;
98+
App.CurrentInstance.NavigationToolbar.CanRefresh = true;
9999
(App.CurrentInstance.OperationsControl as RibbonArea).RibbonViewModel.AlwaysPresentCommands.isEnabled = true;
100100
AssociatedViewModel.EmptyTextState.isVisible = Visibility.Collapsed;
101-
App.CurrentInstance.ViewModel.Universal.path = parameters;
101+
App.CurrentInstance.ViewModel.Universal.WorkingDirectory = parameters;
102102

103-
if (App.CurrentInstance.ViewModel.Universal.path == Path.GetPathRoot(App.CurrentInstance.ViewModel.Universal.path))
103+
if (App.CurrentInstance.ViewModel.Universal.WorkingDirectory == Path.GetPathRoot(App.CurrentInstance.ViewModel.Universal.WorkingDirectory))
104104
{
105-
App.CurrentInstance.NavigationControl.CanNavigateToParent = false;
105+
App.CurrentInstance.NavigationToolbar.CanNavigateToParent = false;
106106
}
107107
else
108108
{
109-
App.CurrentInstance.NavigationControl.CanNavigateToParent = true;
109+
App.CurrentInstance.NavigationToolbar.CanNavigateToParent = true;
110110
}
111111

112-
App.CurrentInstance.ViewModel.AddItemsToCollectionAsync(App.CurrentInstance.ViewModel.Universal.path);
112+
App.CurrentInstance.ViewModel.AddItemsToCollectionAsync(App.CurrentInstance.ViewModel.Universal.WorkingDirectory);
113113
App.Clipboard_ContentChanged(null, null);
114114

115-
App.CurrentInstance.NavigationControl.PathControlDisplayText = parameters;
115+
App.CurrentInstance.NavigationToolbar.PathControlDisplayText = parameters;
116116
}
117117

118118
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)

Files/Dialogs/AddItemDialog.xaml.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static async void CreateFile(AddItemType fileType)
5252
string currentPath = null;
5353
if (TabInstance.ContentPage != null)
5454
{
55-
currentPath = TabInstance.ViewModel.Universal.path;
55+
currentPath = TabInstance.ViewModel.Universal.WorkingDirectory;
5656
}
5757
StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);
5858
RenameDialog renameDialog = new RenameDialog();
@@ -65,7 +65,7 @@ public static async void CreateFile(AddItemType fileType)
6565
StorageFolder folder;
6666
if (!string.IsNullOrWhiteSpace(userInput))
6767
{
68-
folder = await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
68+
folder = await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.GenerateUniqueName);
6969
}
7070
else
7171
{
@@ -78,7 +78,7 @@ public static async void CreateFile(AddItemType fileType)
7878
StorageFile item;
7979
if (!string.IsNullOrWhiteSpace(userInput))
8080
{
81-
item = await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
81+
item = await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.GenerateUniqueName);
8282
}
8383
else
8484
{
@@ -91,7 +91,7 @@ public static async void CreateFile(AddItemType fileType)
9191
StorageFile item;
9292
if (!string.IsNullOrWhiteSpace(userInput))
9393
{
94-
item = await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
94+
item = await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.GenerateUniqueName);
9595
}
9696
else
9797
{

0 commit comments

Comments
 (0)