Store release preparation

This commit is contained in:
XY Wang 2023-05-17 21:51:13 +08:00
parent 4d4577c7bd
commit 4214c6117d
63 changed files with 333 additions and 66 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 829 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,174 @@
<?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|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|AnyCPU">
<Configuration>Debug</Configuration>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|AnyCPU">
<Configuration>Release</Configuration>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
</PropertyGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup>
<ProjectGuid>225ef170-60e5-471a-86ea-bdca1e6e1a97</ProjectGuid>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<NoWarn>$(NoWarn);NU1702</NoWarn>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<PackageCertificateThumbprint>057530C6878434072B55038A689D18EEF5E50F04</PackageCertificateThumbprint>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>neutral</AppxBundlePlatforms>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<EntryPointProjectUniqueName>..\Ink Canvas\Ink Canvas.csproj</EntryPointProjectUniqueName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<AppxBundle>Always</AppxBundle>
<DefaultLanguage>zh-cn</DefaultLanguage>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Images\LargeTile.scale-100.png" />
<Content Include="Images\LargeTile.scale-125.png" />
<Content Include="Images\LargeTile.scale-150.png" />
<Content Include="Images\LargeTile.scale-200.png" />
<Content Include="Images\LargeTile.scale-400.png" />
<Content Include="Images\SmallTile.scale-100.png" />
<Content Include="Images\SmallTile.scale-125.png" />
<Content Include="Images\SmallTile.scale-150.png" />
<Content Include="Images\SmallTile.scale-200.png" />
<Content Include="Images\SmallTile.scale-400.png" />
<Content Include="Images\SplashScreen.scale-100.png" />
<Content Include="Images\SplashScreen.scale-125.png" />
<Content Include="Images\SplashScreen.scale-150.png" />
<Content Include="Images\SplashScreen.scale-200.png" />
<Content Include="Images\LockScreenLogo.scale-200.png" />
<Content Include="Images\SplashScreen.scale-400.png" />
<Content Include="Images\Square150x150Logo.scale-100.png" />
<Content Include="Images\Square150x150Logo.scale-125.png" />
<Content Include="Images\Square150x150Logo.scale-150.png" />
<Content Include="Images\Square150x150Logo.scale-200.png" />
<Content Include="Images\Square150x150Logo.scale-400.png" />
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
<Content Include="Images\Square44x44Logo.scale-100.png" />
<Content Include="Images\Square44x44Logo.scale-125.png" />
<Content Include="Images\Square44x44Logo.scale-150.png" />
<Content Include="Images\Square44x44Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.scale-400.png" />
<Content Include="Images\Square44x44Logo.targetsize-16.png" />
<Content Include="Images\Square44x44Logo.targetsize-24.png" />
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\Square44x44Logo.targetsize-256.png" />
<Content Include="Images\Square44x44Logo.targetsize-32.png" />
<Content Include="Images\Square44x44Logo.targetsize-48.png" />
<Content Include="Images\StoreLogo.scale-100.png" />
<Content Include="Images\StoreLogo.scale-125.png" />
<Content Include="Images\StoreLogo.scale-150.png" />
<Content Include="Images\StoreLogo.scale-200.png" />
<Content Include="Images\StoreLogo.scale-400.png" />
<Content Include="Images\Wide310x150Logo.scale-100.png" />
<Content Include="Images\Wide310x150Logo.scale-125.png" />
<Content Include="Images\Wide310x150Logo.scale-150.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" />
<Content Include="Images\Wide310x150Logo.scale-400.png" />
<None Include="Ink Canvas Packaging_TemporaryKey.pfx" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Ink Canvas\Ink Canvas.csproj" />
</ItemGroup>
</Project>

View File

@ -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="ff17074d-bc33-4b1c-a21b-8f9af2e1e8cb"
Publisher="CN=wxriw"
Version="3.7.0.0" />
<Properties>
<DisplayName>Ink Canvas</DisplayName>
<PublisherDisplayName>wxriw</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate"/>
</Resources>
<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$">
<uap:VisualElements
DisplayName="Ink Canvas"
Description="Ink Canvas 画板,极致画板体验!"
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
<uap:SplashScreen Image="Images\SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
<Capabilities>
<rescap:Capability Name="runFullTrust" />
</Capabilities>
</Package>

View File

@ -5,28 +5,72 @@ VisualStudioVersion = 17.5.33530.505
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ink Canvas", "Ink Canvas\Ink Canvas.csproj", "{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ink Canvas", "Ink Canvas\Ink Canvas.csproj", "{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}"
EndProject EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Ink Canvas Packaging", "Ink Canvas Packaging\Ink Canvas Packaging.wapproj", "{225EF170-60E5-471A-86EA-BDCA1E6E1A97}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64 Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64 Release|ARM64 = Release|ARM64
Release|x64 = Release|x64 Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM.ActiveCfg = Debug|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM.Build.0 = Debug|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.Build.0 = Debug|ARM64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.Build.0 = Debug|ARM64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.ActiveCfg = Debug|x64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.ActiveCfg = Debug|x64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.Build.0 = Debug|x64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.Build.0 = Debug|x64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.ActiveCfg = Debug|x86
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.Build.0 = Debug|x86
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.ActiveCfg = Release|Any CPU {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.Build.0 = Release|Any CPU {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.Build.0 = Release|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM.ActiveCfg = Release|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM.Build.0 = Release|Any CPU
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.ActiveCfg = Release|ARM64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.ActiveCfg = Release|ARM64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.Build.0 = Release|ARM64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.Build.0 = Release|ARM64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.ActiveCfg = Release|x64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.ActiveCfg = Release|x64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.Build.0 = Release|x64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.Build.0 = Release|x64
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.ActiveCfg = Release|x86
{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.Build.0 = Release|x86
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM.ActiveCfg = Debug|ARM
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM.Build.0 = Debug|ARM
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM.Deploy.0 = Debug|ARM
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM64.ActiveCfg = Debug|ARM64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM64.Build.0 = Debug|ARM64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM64.Deploy.0 = Debug|ARM64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x64.ActiveCfg = Debug|x64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x64.Build.0 = Debug|x64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x64.Deploy.0 = Debug|x64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x86.ActiveCfg = Debug|x86
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x86.Build.0 = Debug|x86
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x86.Deploy.0 = Debug|x86
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|Any CPU.Build.0 = Release|Any CPU
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|Any CPU.Deploy.0 = Release|Any CPU
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM.ActiveCfg = Release|ARM
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM.Build.0 = Release|ARM
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM.Deploy.0 = Release|ARM
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM64.ActiveCfg = Release|ARM64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM64.Build.0 = Release|ARM64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM64.Deploy.0 = Release|ARM64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x64.ActiveCfg = Release|x64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x64.Build.0 = Release|x64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x64.Deploy.0 = Release|x64
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x86.ActiveCfg = Release|x86
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x86.Build.0 = Release|x86
{225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -15,6 +15,7 @@ namespace Ink_Canvas
System.Threading.Mutex mutex; System.Threading.Mutex mutex;
public static string[] StartArgs = null; public static string[] StartArgs = null;
public static string RootPath = Environment.GetEnvironmentVariable("APPDATA") + "\\Ink Canvas\\Lyricify for Spotify\\";
public App() public App()
{ {
@ -31,7 +32,7 @@ namespace Ink_Canvas
void App_Startup(object sender, StartupEventArgs e) void App_Startup(object sender, StartupEventArgs e)
{ {
LogHelper.LogFile = AppDomain.CurrentDomain.SetupInformation.ApplicationBase + LogHelper.LogFileName; if (!StoreHelper.IsStoreApp) RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version.ToString())); LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version.ToString()));
@ -47,11 +48,15 @@ namespace Ink_Canvas
} }
StartArgs = e.Args; StartArgs = e.Args;
AutoUpdater.Start($"http://ink.wxriw.cn:1957/update");
AutoUpdater.ApplicationExitEvent += () => if (!StoreHelper.IsStoreApp)
{ {
Environment.Exit(0); AutoUpdater.Start($"http://ink.wxriw.cn:1957/update");
}; AutoUpdater.ApplicationExitEvent += () =>
{
Environment.Exit(0);
};
}
} }
} }
} }

View File

@ -5,7 +5,6 @@ namespace Ink_Canvas.Helpers
{ {
class LogHelper class LogHelper
{ {
public static string LogFileName = "Log.txt";
public static string LogFile = "Log.txt"; public static string LogFile = "Log.txt";
public static void NewLog(string str) public static void NewLog(string str)
@ -33,9 +32,18 @@ namespace Ink_Canvas.Helpers
strLogType = "Error"; strLogType = "Error";
break; break;
} }
StreamWriter sw = new StreamWriter(LogFile, true); try
sw.WriteLine(string.Format("{0} [{1}] {2}", DateTime.Now.ToString("O"), strLogType, str)); {
sw.Close(); var file = App.RootPath + LogFile;
if (!Directory.Exists(App.RootPath))
{
Directory.CreateDirectory(App.RootPath);
}
StreamWriter sw = new StreamWriter(file, true);
sw.WriteLine(string.Format("{0} [{1}] {2}", DateTime.Now.ToString("O"), strLogType, str));
sw.Close();
}
catch { }
} }
public enum LogType public enum LogType

View File

@ -0,0 +1,26 @@
using Windows.ApplicationModel;
namespace Ink_Canvas.Helpers
{
public static class StoreHelper
{
public static bool IsStoreApp
{
get
{
try
{
if (Package.Current != null)
{
return true;
}
return false;
}
catch
{
return false;
}
}
}
}
}

View File

@ -166,6 +166,7 @@
<Compile Include="Helpers\InkRecognizeHelper.cs" /> <Compile Include="Helpers\InkRecognizeHelper.cs" />
<Compile Include="Helpers\LogHelper.cs" /> <Compile Include="Helpers\LogHelper.cs" />
<Compile Include="Helpers\MultiTouchInput.cs" /> <Compile Include="Helpers\MultiTouchInput.cs" />
<Compile Include="Helpers\StoreHelper.cs" />
<Compile Include="Helpers\TimeMachine.cs" /> <Compile Include="Helpers\TimeMachine.cs" />
<Compile Include="Helpers\Converters.cs" /> <Compile Include="Helpers\Converters.cs" />
<Compile Include="NamesInputWindow.xaml.cs"> <Compile Include="NamesInputWindow.xaml.cs">

View File

@ -453,7 +453,7 @@ namespace Ink_Canvas
TextBlockVersion.Text = version.ToString(); TextBlockVersion.Text = version.ToString();
string lastVersion = ""; string lastVersion = "";
if (response.Contains("Special Version") && !File.Exists(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Versions.ini")) if (response.Contains("Special Version") && !File.Exists(App.RootPath + "Versions.ini"))
{ {
LogHelper.WriteLogToFile("Welcome Window Show Dialog", LogHelper.LogType.Event); LogHelper.WriteLogToFile("Welcome Window Show Dialog", LogHelper.LogType.Event);
@ -490,50 +490,7 @@ namespace Ink_Canvas
LogHelper.WriteLogToFile("Change Log Window Show Dialog", LogHelper.LogType.Event); LogHelper.WriteLogToFile("Change Log Window Show Dialog", LogHelper.LogType.Event);
new ChangeLogWindow().ShowDialog(); new ChangeLogWindow().ShowDialog();
lastVersion += "\n" + version.ToString(); lastVersion += "\n" + version.ToString();
File.WriteAllText(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Versions.ini", lastVersion.Trim()); File.WriteAllText(App.RootPath + "Versions.ini", lastVersion.Trim());
}
//第二次启动时才可以进入检查版本更新模式
if (response.Contains("Special Version") || response.Contains("AutoUpdateOnly"))
{
new Thread(new ThreadStart(() =>
{
try
{
if (response.Contains("<update>"))
{
string str = Strings.Mid(response, response.IndexOf("<update>") + 9);
if (str.Contains("<update>"))
{
str = Strings.Left(str, str.IndexOf("<update>")).Trim();
if (str.Length > 0)
{
//string updateIP;
//int updatePort;
//string[] vs = str.Split(':');
//updateIP = vs[0];
//updatePort = int.Parse(vs[1]);
//if (OAUS.Core.VersionHelper.HasNewVersion(GetIp(updateIP), updatePort))
//{
// string updateExePath = AppDomain.CurrentDomain.BaseDirectory + "AutoUpdater\\AutoUpdater.exe";
// System.Diagnostics.Process myProcess = System.Diagnostics.Process.Start(updateExePath);
// LogHelper.WriteLogToFile("Detected new version, closing Ink Canvas for update", LogHelper.LogType.Event);
// Application.Current.Dispatcher.Invoke(() =>
// {
// closeIsFromButton = true;
// Application.Current.Shutdown();
// });
//}
}
}
}
}
catch { }
})).Start();
} }
} }
}); });
@ -587,7 +544,7 @@ namespace Ink_Canvas
private void LoadSettings(bool isStartup = true) private void LoadSettings(bool isStartup = true)
{ {
if (File.Exists(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + settingsFileName)) if (File.Exists(App.RootPath + settingsFileName))
{ {
try try
{ {
@ -2104,9 +2061,9 @@ namespace Ink_Canvas
string defaultFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + string defaultFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) +
@"\Ink Canvas Strokes\Auto Saved\Presentations\"; @"\Ink Canvas Strokes\Auto Saved\Presentations\";
string folderPath = defaultFolderPath + presentation.Name + "_" + presentation.Slides.Count; string folderPath = defaultFolderPath + presentation.Name + "_" + presentation.Slides.Count;
if (File.Exists(folderPath + "/position")) if (File.Exists(folderPath + "/Position"))
{ {
if (int.TryParse(File.ReadAllText(folderPath + "/position"), out var page)) if (int.TryParse(File.ReadAllText(folderPath + "/Position"), out var page))
{ {
if (page <= 0) return; if (page <= 0) return;
new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () => new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () =>
@ -2375,7 +2332,7 @@ namespace Ink_Canvas
{ {
Directory.CreateDirectory(folderPath); Directory.CreateDirectory(folderPath);
} }
File.WriteAllText(folderPath + "/position", previousSlideID.ToString()); File.WriteAllText(folderPath + "/Position", previousSlideID.ToString());
for (int i = 1; i <= Pres.Slides.Count; i++) for (int i = 1; i <= Pres.Slides.Count; i++)
{ {
if (memoryStreams[i] != null) if (memoryStreams[i] != null)

View File

@ -17,9 +17,9 @@ namespace Ink_Canvas
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
{ {
if (File.Exists(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Names.txt")) if (File.Exists(App.RootPath + "Names.txt"))
{ {
TextBoxNames.Text = File.ReadAllText(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Names.txt"); TextBoxNames.Text = File.ReadAllText(App.RootPath + "Names.txt");
originText = TextBoxNames.Text; originText = TextBoxNames.Text;
} }
} }
@ -31,7 +31,7 @@ namespace Ink_Canvas
var result = MessageBox.Show("是否保存?", "名单导入", MessageBoxButton.YesNo); var result = MessageBox.Show("是否保存?", "名单导入", MessageBoxButton.YesNo);
if (result == MessageBoxResult.Yes) if (result == MessageBoxResult.Yes)
{ {
File.WriteAllText(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Names.txt", TextBoxNames.Text); File.WriteAllText(App.RootPath + "Names.txt", TextBoxNames.Text);
} }
} }
} }

View File

@ -187,14 +187,14 @@ namespace Ink_Canvas
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
{ {
Names = new List<string>(); Names = new List<string>();
if (File.Exists(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Names.txt")) if (File.Exists(App.RootPath + "Names.txt"))
{ {
string[] fileNames = File.ReadAllLines(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Names.txt"); string[] fileNames = File.ReadAllLines(App.RootPath + "Names.txt");
string[] replaces = new string[0]; string[] replaces = new string[0];
if (File.Exists(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Replace.txt")) if (File.Exists(App.RootPath + "Replace.txt"))
{ {
replaces = File.ReadAllLines(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Replace.txt"); replaces = File.ReadAllLines(App.RootPath + "Replace.txt");
} }
//Fix emtpy lines //Fix emtpy lines

View File

@ -62,7 +62,11 @@ namespace Ink_Canvas
catch { } catch { }
str = (str + "\n" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + "\n" + "NewWelcomeConfigured").Trim(); str = (str + "\n" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + "\n" + "NewWelcomeConfigured").Trim();
File.WriteAllText("versions.ini", str); try
{
File.WriteAllText("versions.ini", str);
}
catch { }
Process.Start(System.Windows.Forms.Application.ExecutablePath); Process.Start(System.Windows.Forms.Application.ExecutablePath);
MainWindow.CloseIsFromButton = true; MainWindow.CloseIsFromButton = true;