Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

General Hygiene fixes #1139

Merged
merged 3 commits into from
Dec 15, 2022
Merged

General Hygiene fixes #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c499a66
Add nuget.config. Undo changes made for store publishing
bpulliam Dec 15, 2022
be8ee3f
update for 1.2.2. update build tools
bpulliam Dec 15, 2022
1c12b0c
remove unneeded mux prefix
bpulliam Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions WinUIGallery/ControlPages/TreeViewPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
using System;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using mux = Microsoft.UI.Xaml.Controls;
using System.Collections.ObjectModel;
using System.ComponentModel;

namespace AppUIBasics.ControlPages
{
public sealed partial class TreeViewPage : Page
{
mux.TreeViewNode personalFolder;
mux.TreeViewNode personalFolder2;
TreeViewNode personalFolder;
TreeViewNode personalFolder2;
private ObservableCollection<ExplorerItem> DataSource;

public TreeViewPage()
Expand All @@ -25,23 +24,23 @@ public TreeViewPage()

private void InitializeSampleTreeView()
{
mux.TreeViewNode workFolder = new mux.TreeViewNode() { Content = "Work Documents" };
TreeViewNode workFolder = new TreeViewNode() { Content = "Work Documents" };
workFolder.IsExpanded = true;

workFolder.Children.Add(new mux.TreeViewNode() { Content = "XYZ Functional Spec" });
workFolder.Children.Add(new mux.TreeViewNode() { Content = "Feature Schedule" });
workFolder.Children.Add(new mux.TreeViewNode() { Content = "Overall Project Plan" });
workFolder.Children.Add(new mux.TreeViewNode() { Content = "Feature Resources Allocation" });
workFolder.Children.Add(new TreeViewNode() { Content = "XYZ Functional Spec" });
workFolder.Children.Add(new TreeViewNode() { Content = "Feature Schedule" });
workFolder.Children.Add(new TreeViewNode() { Content = "Overall Project Plan" });
workFolder.Children.Add(new TreeViewNode() { Content = "Feature Resources Allocation" });

mux.TreeViewNode remodelFolder = new mux.TreeViewNode() { Content = "Home Remodel" };
TreeViewNode remodelFolder = new TreeViewNode() { Content = "Home Remodel" };
remodelFolder.IsExpanded = true;

remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Contractor Contact Info" });
remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Paint Color Scheme" });
remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Flooring woodgrain type" });
remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Kitchen cabinet style" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Contractor Contact Info" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Paint Color Scheme" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Flooring woodgrain type" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Kitchen cabinet style" });

personalFolder = new mux.TreeViewNode() { Content = "Personal Documents" };
personalFolder = new TreeViewNode() { Content = "Personal Documents" };
personalFolder.IsExpanded = true;
personalFolder.Children.Add(remodelFolder);

Expand All @@ -50,31 +49,31 @@ private void InitializeSampleTreeView()
}
private void InitializeSampleTreeView2()
{
mux.TreeViewNode workFolder = new mux.TreeViewNode() { Content = "Work Documents" };
TreeViewNode workFolder = new TreeViewNode() { Content = "Work Documents" };
workFolder.IsExpanded = true;

workFolder.Children.Add(new mux.TreeViewNode() { Content = "XYZ Functional Spec" });
workFolder.Children.Add(new mux.TreeViewNode() { Content = "Feature Schedule" });
workFolder.Children.Add(new mux.TreeViewNode() { Content = "Overall Project Plan" });
workFolder.Children.Add(new mux.TreeViewNode() { Content = "Feature Resources Allocation" });
workFolder.Children.Add(new TreeViewNode() { Content = "XYZ Functional Spec" });
workFolder.Children.Add(new TreeViewNode() { Content = "Feature Schedule" });
workFolder.Children.Add(new TreeViewNode() { Content = "Overall Project Plan" });
workFolder.Children.Add(new TreeViewNode() { Content = "Feature Resources Allocation" });

mux.TreeViewNode remodelFolder = new mux.TreeViewNode() { Content = "Home Remodel" };
TreeViewNode remodelFolder = new TreeViewNode() { Content = "Home Remodel" };
remodelFolder.IsExpanded = true;

remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Contractor Contact Info" });
remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Paint Color Scheme" });
remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Flooring woodgrain type" });
remodelFolder.Children.Add(new mux.TreeViewNode() { Content = "Kitchen cabinet style" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Contractor Contact Info" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Paint Color Scheme" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Flooring woodgrain type" });
remodelFolder.Children.Add(new TreeViewNode() { Content = "Kitchen cabinet style" });

personalFolder2 = new mux.TreeViewNode() { Content = "Personal Documents" };
personalFolder2 = new TreeViewNode() { Content = "Personal Documents" };
personalFolder2.IsExpanded = true;
personalFolder2.Children.Add(remodelFolder);

sampleTreeView2.RootNodes.Add(workFolder);
sampleTreeView2.RootNodes.Add(personalFolder2);
}

private void sampleTreeView_ItemInvoked(mux.TreeView sender, mux.TreeViewItemInvokedEventArgs args)
private void sampleTreeView_ItemInvoked(TreeView sender, TreeViewItemInvokedEventArgs args)
{
return;
}
Expand Down
3 changes: 1 addition & 2 deletions WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,10 @@
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
<AppxBundlePlatforms>$(Platform)</AppxBundlePlatforms>
<AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
<PackageCertificateKeyFile>C:\Users\gregwoo\OneDrive - Microsoft\Documents\XCG\testcert.pfx</PackageCertificateKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<AppxBundle>Always</AppxBundle>
Expand Down
6 changes: 3 additions & 3 deletions WinUIGallery/standalone.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<PropertyGroup>
<!-- The NuGet versions of dependencies to build against. -->
<ProjectReunionPackageVersion>1.2.221109.1</ProjectReunionPackageVersion>
<ProjectReunionWinUIPackageVersion>1.2.221109.1</ProjectReunionWinUIPackageVersion>
<ProjectReunionPackageVersion>1.2.221209.1</ProjectReunionPackageVersion>
<ProjectReunionWinUIPackageVersion>1.2.221209.1</ProjectReunionWinUIPackageVersion>
<SamplesTargetFrameworkMoniker>net6.0-windows10.0.18362.0</SamplesTargetFrameworkMoniker>
<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
<GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
<ColorCodeVersion>2.0.13</ColorCodeVersion>
<MicrosoftWindowsSDKBuildToolsNugetPackageVersion>10.0.22621.1</MicrosoftWindowsSDKBuildToolsNugetPackageVersion>
<MicrosoftWindowsSDKBuildToolsNugetPackageVersion>10.0.22621.755</MicrosoftWindowsSDKBuildToolsNugetPackageVersion>
<MicrosoftCsWinRTPackageVersion>2.0.0</MicrosoftCsWinRTPackageVersion>
<!-- We have multiple projects in the same directory, which means we need to separate their output paths-->
<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
Expand Down
21 changes: 21 additions & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<clear />
<add key="repositoryPath" value="$\..\packages" />
</config>
<disabledPackageSources>
<clear />
</disabledPackageSources>
<packageSources>
<!-- For more info, see https://docs.nuget.org/consume/nuget-config-file -->
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />

<!-- a local directory to allow testing nupkg files without pushing to a remote feed -->
<add key="packagestore" value="packagestore" />
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will cause build to fail for those who don't have packagestore locally 🙂

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. I'll submit a PR with a fix.

</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
</configuration>