Skip to content

Commit

Permalink
store association
Browse files Browse the repository at this point in the history
- single project for packaged and unpackaged (Directory.Build.props)
- crowdin translation update
  • Loading branch information
rocksdanister committed Aug 17, 2022
1 parent 3e7bcd6 commit 6d7ed77
Show file tree
Hide file tree
Showing 60 changed files with 210 additions and 147 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Lively/Lively.UI.WinUI/Assets/LockScreenLogo.scale-200.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Lively/Lively.UI.WinUI/Assets/SplashScreen.scale-200.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Lively/Lively.UI.WinUI/Assets/Square44x44Logo.scale-200.png
Binary file removed src/Lively/Lively.UI.WinUI/Assets/StoreLogo.png
Diff not rendered.
Binary file modified src/Lively/Lively.UI.WinUI/Assets/Wide310x150Logo.scale-200.png
5 changes: 5 additions & 0 deletions src/Lively/Lively.UI.WinUI/Directory.Build.props
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<IsMsixRelease>false</IsMsixRelease>
</PropertyGroup>
</Project>
37 changes: 33 additions & 4 deletions src/Lively/Lively.UI.WinUI/Lively.UI.WinUI.csproj
Expand Up @@ -8,13 +8,43 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<WindowsPackageType>None</WindowsPackageType>
<ApplicationIcon>appicon.ico</ApplicationIcon>
</PropertyGroup>

<PropertyGroup Condition="'$(IsMsixRelease)' != 'true'">
<WindowsPackageType>None</WindowsPackageType>
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
</PropertyGroup>

<PropertyGroup Condition="'$(IsMsixRelease)' == 'true'">
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86</AppxBundlePlatforms>
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<!-- Create Properties/PublishProfiles for each release, Example: win10-x86.pubxml-->
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<!-- Temporary cert-->
<!--
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<PackageCertificateThumbprint>AFCC4AADFFAC311F4E8090D3AF1B8F278AB907BC</PackageCertificateThumbprint>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-->
</PropertyGroup>

<ItemGroup Condition="'$(IsMsixRelease)' == 'true'">
<!-- Include self-contained core build here (excluding UI plugin.) -->
<Folder Include="Build\" />
<Content Include="Build\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<None Remove="Assets\banner-lively-1080.jpg" />
<None Remove="Assets\icon-lively-48.png" />
Expand Down Expand Up @@ -61,7 +91,6 @@
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\StoreLogo.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
<Content Include="Nlog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -246,5 +275,5 @@
<Page Update="Views\LivelyProperty\LivelyPropertiesView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
</ItemGroup>
</Project>
37 changes: 27 additions & 10 deletions src/Lively/Lively.UI.WinUI/Package.appxmanifest
Expand Up @@ -4,22 +4,27 @@
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">
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
IgnorableNamespaces="uap rescap mp">

<Identity
Name="54913591-f4d3-460d-a176-839e86c2b2d5"
Publisher="CN=rocks"
Version="1.0.0.0" />
Name="12030rocksdanister.LivelyWallpaper"
Publisher="CN=D80CB9E2-21E6-4D9B-8533-660C768F3C5B"
Version="1.0.125.0" />

<mp:PhoneIdentity PhoneProductId="04bfe68a-b076-487d-957e-c3eea0ef5dd3" PhonePublisherId="1decb601-e64f-4088-bc00-0e28637c9926" />

<Properties>
<DisplayName>Lively.UI.WinUI</DisplayName>
<PublisherDisplayName>rocks</PublisherDisplayName>
<DisplayName>Lively Wallpaper</DisplayName>
<PublisherDisplayName>rocksdanister</PublisherDisplayName>
<Logo>Assets\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" />
<PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.24217.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
</Dependencies>

<Resources>
Expand All @@ -28,21 +33,33 @@

<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
Executable="Build\Lively.exe"
EntryPoint="$targetentrypoint$">
<uap:VisualElements
DisplayName="Lively.UI.WinUI"
Description="Lively.UI.WinUI"
DisplayName="Lively Wallpaper"
Description="Free and open-source software that allows users to set animated and interactive desktop wallpapers."
BackgroundColor="transparent"
Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png" ShortName="Lively Wallpaper">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo"/>
<uap:ShowOn Tile="wide310x150Logo"/>
<uap:ShowOn Tile="square310x310Logo"/>
</uap:ShowNameOnTiles>
</uap:DefaultTile >
<uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements>
<Extensions>
<desktop:Extension Category="windows.startupTask" Executable="Build\Lively.exe" EntryPoint="Windows.FullTrustApplication">
<desktop:StartupTask TaskId="AppStartup" Enabled="false" DisplayName="Lively Wallpaper" />
</desktop:Extension>
</Extensions>
</Application>
</Applications>

<Capabilities>
<rescap:Capability Name="runFullTrust" />
</Capabilities>

</Package>

0 comments on commit 6d7ed77

Please sign in to comment.