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.

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

Reimplement with WinUI 3 and MVVM #1

Merged
merged 1 commit into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vs/
Binary file removed .vs/JoyMouse/v14/.suo
Binary file not shown.
6 changes: 0 additions & 6 deletions App.config

This file was deleted.

86 changes: 0 additions & 86 deletions JoyMouse.csproj

This file was deleted.

58 changes: 49 additions & 9 deletions JoyMouse.sln
Original file line number Diff line number Diff line change
@@ -1,22 +1,62 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31911.196
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JoyMouse", "JoyMouse.csproj", "{6BDEE58A-835F-47E3-A7BC-0FAD90641697}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8607DAB6-096B-4FD4-9A5E-38E80EC99902}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
EndProjectSection
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "JoyMouse (Package)", "JoyMouse\JoyMouse (Package)\JoyMouse (Package).wapproj", "{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JoyMouse", "JoyMouse\JoyMouse\JoyMouse.csproj", "{CA17A67D-EA3B-4300-8489-18804DC73DAB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Debug|arm64 = Debug|arm64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|arm64 = Release|arm64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6BDEE58A-835F-47E3-A7BC-0FAD90641697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BDEE58A-835F-47E3-A7BC-0FAD90641697}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BDEE58A-835F-47E3-A7BC-0FAD90641697}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BDEE58A-835F-47E3-A7BC-0FAD90641697}.Release|Any CPU.Build.0 = Release|Any CPU
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|arm64.ActiveCfg = Debug|arm64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|arm64.Build.0 = Debug|arm64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|arm64.Deploy.0 = Debug|arm64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|x64.ActiveCfg = Debug|x64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|x64.Build.0 = Debug|x64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|x64.Deploy.0 = Debug|x64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|x86.ActiveCfg = Debug|x86
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|x86.Build.0 = Debug|x86
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Debug|x86.Deploy.0 = Debug|x86
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|arm64.ActiveCfg = Release|arm64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|arm64.Build.0 = Release|arm64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|arm64.Deploy.0 = Release|arm64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|x64.ActiveCfg = Release|x64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|x64.Build.0 = Release|x64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|x64.Deploy.0 = Release|x64
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|x86.ActiveCfg = Release|x86
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|x86.Build.0 = Release|x86
{3F4FEB21-6810-4B3F-972D-1E25BB26A2DE}.Release|x86.Deploy.0 = Release|x86
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Debug|arm64.ActiveCfg = Debug|arm64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Debug|arm64.Build.0 = Debug|arm64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Debug|x64.ActiveCfg = Debug|x64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Debug|x64.Build.0 = Debug|x64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Debug|x86.ActiveCfg = Debug|x86
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Debug|x86.Build.0 = Debug|x86
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Release|arm64.ActiveCfg = Release|arm64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Release|arm64.Build.0 = Release|arm64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Release|x64.ActiveCfg = Release|x64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Release|x64.Build.0 = Release|x64
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Release|x86.ActiveCfg = Release|x86
{CA17A67D-EA3B-4300-8489-18804DC73DAB}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C8248041-43C6-4675-9A5E-94D106EE1DEF}
EndGlobalSection
EndGlobal
3 changes: 3 additions & 0 deletions JoyMouse/JoyMouse (Package)/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bin/
obj/
AppPackages/
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added JoyMouse/JoyMouse (Package)/Images/StoreLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 75 additions & 0 deletions JoyMouse/JoyMouse (Package)/JoyMouse (Package).wapproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x86">
<Configuration>Debug</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<Configuration>Release</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|arm64">
<Configuration>Debug</Configuration>
<Platform>arm64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|arm64">
<Configuration>Release</Configuration>
<Platform>arm64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
<PathToXAMLWinRTImplementations>JoyMouse\</PathToXAMLWinRTImplementations>
</PropertyGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup>
<ProjectGuid>3f4feb21-6810-4b3f-972d-1e25bb26a2de</ProjectGuid>
<TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<EntryPointProjectUniqueName>..\JoyMouse\JoyMouse.csproj</EntryPointProjectUniqueName>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Images\SplashScreen.scale-200.png" />
<Content Include="Images\LockScreenLogo.scale-200.png" />
<Content Include="Images\Square150x150Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\StoreLogo.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JoyMouse\JoyMouse.csproj">
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[10.0.22000.194]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
</Project>
4 changes: 4 additions & 0 deletions JoyMouse/JoyMouse (Package)/JoyMouse (Package).wapproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
48 changes: 48 additions & 0 deletions JoyMouse/JoyMouse (Package)/Package.appxmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>

<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap rescap">

<Identity
Name="cc19bfad-7fd2-402b-8a61-18d3cc1ebe0e"
Publisher="CN=minusium"
Version="1.0.0.0" />

<Properties>
<DisplayName>JoyMouse (Package)</DisplayName>
<PublisherDisplayName>minusium</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>

<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
</Dependencies>

<Resources>
<Resource Language="x-generate"/>
</Resources>

<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$">
<uap:VisualElements
DisplayName="JoyMouse (Package)"
Description="JoyMouse (Package)"
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
<uap:SplashScreen Image="Images\SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>

<Capabilities>
<rescap:Capability Name="runFullTrust" />
</Capabilities>
</Package>
2 changes: 2 additions & 0 deletions JoyMouse/JoyMouse/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bin/
obj/
15 changes: 15 additions & 0 deletions JoyMouse/JoyMouse/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Application
x:Class="JoyMouse.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:JoyMouse">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
<!-- Other merged dictionaries here -->
</ResourceDictionary.MergedDictionaries>
<!-- Other app resources here -->
</ResourceDictionary>
</Application.Resources>
</Application>
Loading