Skip to content

Commit de4a689

Browse files
committed
Transitioned to Packaging Project
1 parent 45f3404 commit de4a689

File tree

61 files changed

+314
-18
lines changed

Some content is hidden

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

61 files changed

+314
-18
lines changed
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
4+
<VisualStudioVersion>15.0</VisualStudioVersion>
5+
</PropertyGroup>
6+
<ItemGroup Label="ProjectConfigurations">
7+
<ProjectConfiguration Include="Debug|x86">
8+
<Configuration>Debug</Configuration>
9+
<Platform>x86</Platform>
10+
</ProjectConfiguration>
11+
<ProjectConfiguration Include="Release|x86">
12+
<Configuration>Release</Configuration>
13+
<Platform>x86</Platform>
14+
</ProjectConfiguration>
15+
<ProjectConfiguration Include="Debug|x64">
16+
<Configuration>Debug</Configuration>
17+
<Platform>x64</Platform>
18+
</ProjectConfiguration>
19+
<ProjectConfiguration Include="Release|x64">
20+
<Configuration>Release</Configuration>
21+
<Platform>x64</Platform>
22+
</ProjectConfiguration>
23+
<ProjectConfiguration Include="Debug|arm64">
24+
<Configuration>Debug</Configuration>
25+
<Platform>arm64</Platform>
26+
</ProjectConfiguration>
27+
<ProjectConfiguration Include="Release|arm64">
28+
<Configuration>Release</Configuration>
29+
<Platform>arm64</Platform>
30+
</ProjectConfiguration>
31+
</ItemGroup>
32+
<PropertyGroup>
33+
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
34+
<PathToXAMLWinRTImplementations>ClipboardCanvas.Package\</PathToXAMLWinRTImplementations>
35+
</PropertyGroup>
36+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
37+
<PropertyGroup>
38+
<ProjectGuid>eb0170ce-7213-48c2-8340-aeab2a0d40f8</ProjectGuid>
39+
<TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
40+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
41+
<AssetTargetFallback>net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
42+
<DefaultLanguage>en-US</DefaultLanguage>
43+
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
44+
<EntryPointProjectUniqueName>..\..\ClipboardCanvas\ClipboardCanvas.csproj</EntryPointProjectUniqueName>
45+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
46+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
47+
<GenerateTestArtifacts>False</GenerateTestArtifacts>
48+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
49+
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
50+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
53+
<AppxBundle>Always</AppxBundle>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
56+
<AppxBundle>Always</AppxBundle>
57+
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
59+
<AppxBundle>Always</AppxBundle>
60+
</PropertyGroup>
61+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
62+
<AppxBundle>Always</AppxBundle>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
65+
<AppxBundle>Always</AppxBundle>
66+
</PropertyGroup>
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
68+
<AppxBundle>Always</AppxBundle>
69+
</PropertyGroup>
70+
<ItemGroup>
71+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0]">
72+
<IncludeAssets>build</IncludeAssets>
73+
</PackageReference>
74+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[10.0.22000.194]">
75+
<IncludeAssets>build</IncludeAssets>
76+
</PackageReference>
77+
</ItemGroup>
78+
<ItemGroup>
79+
<ProjectReference Include="..\..\ClipboardCanvas\ClipboardCanvas.csproj" />
80+
</ItemGroup>
81+
<ItemGroup>
82+
<Content Include="Images\LargeTile.scale-100.png" />
83+
<Content Include="Images\LargeTile.scale-125.png" />
84+
<Content Include="Images\LargeTile.scale-150.png" />
85+
<Content Include="Images\LargeTile.scale-200.png" />
86+
<Content Include="Images\LargeTile.scale-400.png" />
87+
<Content Include="Images\SmallTile.scale-100.png" />
88+
<Content Include="Images\SmallTile.scale-125.png" />
89+
<Content Include="Images\SmallTile.scale-150.png" />
90+
<Content Include="Images\SmallTile.scale-200.png" />
91+
<Content Include="Images\SmallTile.scale-400.png" />
92+
<Content Include="Images\SplashScreen.scale-100.png" />
93+
<Content Include="Images\SplashScreen.scale-125.png" />
94+
<Content Include="Images\SplashScreen.scale-150.png" />
95+
<Content Include="Images\SplashScreen.scale-200.png" />
96+
<Content Include="Images\SplashScreen.scale-400.png" />
97+
<Content Include="Images\Square150x150Logo.scale-100.png" />
98+
<Content Include="Images\Square150x150Logo.scale-125.png" />
99+
<Content Include="Images\Square150x150Logo.scale-150.png" />
100+
<Content Include="Images\Square150x150Logo.scale-200.png" />
101+
<Content Include="Images\Square150x150Logo.scale-400.png" />
102+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
103+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
104+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
105+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
106+
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
107+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
108+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-24.png" />
109+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
110+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
111+
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
112+
<Content Include="Images\Square44x44Logo.scale-100.png" />
113+
<Content Include="Images\Square44x44Logo.scale-125.png" />
114+
<Content Include="Images\Square44x44Logo.scale-150.png" />
115+
<Content Include="Images\Square44x44Logo.scale-200.png" />
116+
<Content Include="Images\Square44x44Logo.scale-400.png" />
117+
<Content Include="Images\Square44x44Logo.targetsize-16.png" />
118+
<Content Include="Images\Square44x44Logo.targetsize-24.png" />
119+
<Content Include="Images\Square44x44Logo.targetsize-256.png" />
120+
<Content Include="Images\Square44x44Logo.targetsize-32.png" />
121+
<Content Include="Images\Square44x44Logo.targetsize-48.png" />
122+
<Content Include="Images\StoreLogo.scale-100.png" />
123+
<Content Include="Images\StoreLogo.scale-125.png" />
124+
<Content Include="Images\StoreLogo.scale-150.png" />
125+
<Content Include="Images\StoreLogo.scale-200.png" />
126+
<Content Include="Images\StoreLogo.scale-400.png" />
127+
<Content Include="Images\Wide310x150Logo.scale-100.png" />
128+
<Content Include="Images\Wide310x150Logo.scale-125.png" />
129+
<Content Include="Images\Wide310x150Logo.scale-150.png" />
130+
<Content Include="Images\Wide310x150Logo.scale-200.png" />
131+
<Content Include="Images\Wide310x150Logo.scale-400.png" />
132+
<None Include="Package.StoreAssociation.xml" />
133+
</ItemGroup>
134+
<ItemGroup>
135+
<AppxManifest Include="Package.appxmanifest">
136+
<SubType>Designer</SubType>
137+
</AppxManifest>
138+
</ItemGroup>
139+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
140+
</Project>

ClipboardCanvas/Package.appxmanifest renamed to ClipboardCanvas.Package/ClipboardCanvas.Package (Package)/Package.appxmanifest

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Properties>
1515
<DisplayName>Clipboard Canvas</DisplayName>
1616
<PublisherDisplayName>d2dyno</PublisherDisplayName>
17-
<Logo>Assets\AppIcon\StoreLogo.png</Logo>
17+
<Logo>Images\StoreLogo.png</Logo>
1818
</Properties>
1919

2020
<Dependencies>
@@ -34,16 +34,16 @@
3434
DisplayName="Clipboard Canvas"
3535
Description="A tool that helps you be productive, preview multiple files on Infinite Canvas, save storage space with smart Reference Files, and work uninterruptedly with Autopaste."
3636
BackgroundColor="transparent"
37-
Square150x150Logo="Assets\AppIcon\Square150x150Logo.png"
38-
Square44x44Logo="Assets\AppIcon\Square44x44Logo.png">
39-
<uap:DefaultTile Wide310x150Logo="Assets\AppIcon\Wide310x150Logo.png" Square71x71Logo="Assets\AppIcon\SmallTile.png" Square310x310Logo="Assets\AppIcon\LargeTile.png">
37+
Square150x150Logo="Images\Square150x150Logo.png"
38+
Square44x44Logo="Images\Square44x44Logo.png">
39+
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png">
4040
<uap:ShowNameOnTiles>
4141
<uap:ShowOn Tile="square150x150Logo"/>
4242
<uap:ShowOn Tile="wide310x150Logo"/>
4343
<uap:ShowOn Tile="square310x310Logo"/>
4444
</uap:ShowNameOnTiles>
4545
</uap:DefaultTile >
46-
<uap:SplashScreen Image="Assets\AppIcon\SplashScreen.png" />
46+
<uap:SplashScreen Image="Images\SplashScreen.png" />
4747
</uap:VisualElements>
4848
</Application>
4949
</Applications>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Application
2+
x:Class="ClipboardCanvas.Package.App"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="using:ClipboardCanvas.Package">
6+
<Application.Resources>
7+
<ResourceDictionary>
8+
<ResourceDictionary.MergedDictionaries>
9+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
10+
<!-- Other merged dictionaries here -->
11+
</ResourceDictionary.MergedDictionaries>
12+
<!-- Other app resources here -->
13+
</ResourceDictionary>
14+
</Application.Resources>
15+
</Application>
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
using Microsoft.UI.Xaml;
2+
using Microsoft.UI.Xaml.Controls;
3+
using Microsoft.UI.Xaml.Controls.Primitives;
4+
using Microsoft.UI.Xaml.Data;
5+
using Microsoft.UI.Xaml.Input;
6+
using Microsoft.UI.Xaml.Media;
7+
using Microsoft.UI.Xaml.Navigation;
8+
using Microsoft.UI.Xaml.Shapes;
9+
using System;
10+
using System.Collections.Generic;
11+
using System.IO;
12+
using System.Linq;
13+
using System.Runtime.InteropServices.WindowsRuntime;
14+
using Windows.ApplicationModel;
15+
using Windows.ApplicationModel.Activation;
16+
using Windows.Foundation;
17+
using Windows.Foundation.Collections;
18+
19+
// To learn more about WinUI, the WinUI project structure,
20+
// and more about our project templates, see: http://aka.ms/winui-project-info.
21+
22+
namespace ClipboardCanvas.Package
23+
{
24+
/// <summary>
25+
/// Provides application-specific behavior to supplement the default Application class.
26+
/// </summary>
27+
public partial class App : Application
28+
{
29+
/// <summary>
30+
/// Initializes the singleton application object. This is the first line of authored code
31+
/// executed, and as such is the logical equivalent of main() or WinMain().
32+
/// </summary>
33+
public App()
34+
{
35+
this.InitializeComponent();
36+
}
37+
38+
/// <summary>
39+
/// Invoked when the application is launched normally by the end user. Other entry points
40+
/// will be used such as when the application is launched to open a specific file.
41+
/// </summary>
42+
/// <param name="args">Details about the launch request and process.</param>
43+
protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
44+
{
45+
m_window = new MainWindow();
46+
m_window.Activate();
47+
}
48+
49+
private Window m_window;
50+
}
51+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
5+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
6+
<RootNamespace>ClipboardCanvas.Package</RootNamespace>
7+
<ApplicationManifest>app.manifest</ApplicationManifest>
8+
<Platforms>x86;x64;arm64</Platforms>
9+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
10+
<UseWinUI>true</UseWinUI>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
15+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
16+
<Manifest Include="$(ApplicationManifest)" />
17+
</ItemGroup>
18+
</Project>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Window
2+
x:Class="ClipboardCanvas.Package.MainWindow"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="using:ClipboardCanvas.Package"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
mc:Ignorable="d">
9+
10+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
11+
<Button x:Name="myButton" Click="myButton_Click">Click Me</Button>
12+
</StackPanel>
13+
</Window>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using Microsoft.UI.Xaml;
2+
using Microsoft.UI.Xaml.Controls;
3+
using Microsoft.UI.Xaml.Controls.Primitives;
4+
using Microsoft.UI.Xaml.Data;
5+
using Microsoft.UI.Xaml.Input;
6+
using Microsoft.UI.Xaml.Media;
7+
using Microsoft.UI.Xaml.Navigation;
8+
using System;
9+
using System.Collections.Generic;
10+
using System.IO;
11+
using System.Linq;
12+
using System.Runtime.InteropServices.WindowsRuntime;
13+
using Windows.Foundation;
14+
using Windows.Foundation.Collections;
15+
16+
// To learn more about WinUI, the WinUI project structure,
17+
// and more about our project templates, see: http://aka.ms/winui-project-info.
18+
19+
namespace ClipboardCanvas.Package
20+
{
21+
/// <summary>
22+
/// An empty window that can be used on its own or navigated to within a Frame.
23+
/// </summary>
24+
public sealed partial class MainWindow : Window
25+
{
26+
public MainWindow()
27+
{
28+
this.InitializeComponent();
29+
}
30+
31+
private void myButton_Click(object sender, RoutedEventArgs e)
32+
{
33+
myButton.Content = "Clicked";
34+
}
35+
}
36+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="1.0.0.0" name="ClipboardCanvas.Package.app"/>
4+
5+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
6+
<windowsSettings>
7+
<!-- The combination of below two tags have the following effect:
8+
1) Per-Monitor for >= Windows 10 Anniversary Update
9+
2) System < Windows 10 Anniversary Update
10+
-->
11+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
12+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
13+
</windowsSettings>
14+
</application>
15+
</assembly>

ClipboardCanvas.sln

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31912.275
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClipboardCanvas", "ClipboardCanvas\ClipboardCanvas.csproj", "{719C97A4-8A77-4B8E-97DF-3B01BA32C16E}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClipboardCanvas", "ClipboardCanvas\ClipboardCanvas.csproj", "{719C97A4-8A77-4B8E-97DF-3B01BA32C16E}"
7+
EndProject
8+
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "ClipboardCanvas.Package (Package)", "ClipboardCanvas.Package\ClipboardCanvas.Package (Package)\ClipboardCanvas.Package (Package).wapproj", "{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}"
79
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,6 +35,24 @@ Global
3335
{719C97A4-8A77-4B8E-97DF-3B01BA32C16E}.Release|x86.ActiveCfg = Release|x86
3436
{719C97A4-8A77-4B8E-97DF-3B01BA32C16E}.Release|x86.Build.0 = Release|x86
3537
{719C97A4-8A77-4B8E-97DF-3B01BA32C16E}.Release|x86.Deploy.0 = Release|x86
38+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|arm64.ActiveCfg = Debug|arm64
39+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|arm64.Build.0 = Debug|arm64
40+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|arm64.Deploy.0 = Debug|arm64
41+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|x64.ActiveCfg = Debug|x64
42+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|x64.Build.0 = Debug|x64
43+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|x64.Deploy.0 = Debug|x64
44+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|x86.ActiveCfg = Debug|x86
45+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|x86.Build.0 = Debug|x86
46+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Debug|x86.Deploy.0 = Debug|x86
47+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|arm64.ActiveCfg = Release|arm64
48+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|arm64.Build.0 = Release|arm64
49+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|arm64.Deploy.0 = Release|arm64
50+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|x64.ActiveCfg = Release|x64
51+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|x64.Build.0 = Release|x64
52+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|x64.Deploy.0 = Release|x64
53+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|x86.ActiveCfg = Release|x86
54+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|x86.Build.0 = Release|x86
55+
{EB0170CE-7213-48C2-8340-AEAB2A0D40F8}.Release|x86.Deploy.0 = Release|x86
3656
EndGlobalSection
3757
GlobalSection(SolutionProperties) = preSolution
3858
HideSolutionNode = FALSE

ClipboardCanvas/ClipboardCanvas.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>
99
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
10-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
1110
<UseWinUI>true</UseWinUI>
12-
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
1311
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
1412
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1513
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>

ClipboardCanvas/Properties/launchSettings.json

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

0 commit comments

Comments
 (0)