Skip to content
This repository has been archived by the owner on Apr 3, 2023. It is now read-only.

Commit

Permalink
update version numbers on windows-targeted devices
Browse files Browse the repository at this point in the history
  • Loading branch information
@aspriddell
aspriddell committed Feb 8, 2023
1 parent 07cce52 commit 1ceeb1a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
run: dotnet-project-licenses -i DragonFruit.Six.Client.sln -o --output-directory DragonFruit.Six.Client --outfile licenses.md --include-project-file --md --unique

- name: Publish
run: dotnet publish -f ${{ matrix.framework }} -c Release -p:Version=${{ inputs.version || github.ref_name }} -p:ApplicationVersion=$Env:VERSION_NUMBER -p:ApplicationDisplayVersion=${{ inputs.version || github.ref_name }} -p:AndroidSigningStorePass=${{ secrets.KEYSTORE_SECRET || 'dragon6' }} -p:AndroidSigningKeyPass=${{ secrets.KEY_SECRET || 'dragon6' }} DragonFruit.Six.Client.Maui
run: dotnet publish -f ${{ matrix.framework }} -c Release -p:Version=${{ inputs.version || github.ref_name }} -p:AppVersion=$Env:VERSION_NUMBER -p:ApplicationDisplayVersion=${{ inputs.version || github.ref_name }} -p:AndroidSigningStorePass=${{ secrets.KEYSTORE_SECRET || 'dragon6' }} -p:AndroidSigningKeyPass=${{ secrets.KEY_SECRET || 'dragon6' }} DragonFruit.Six.Client.Maui

# upload artifacts
- name: Upload Android Artifacts
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
working-directory: ${{ github.workspace }}/bundle-staging
shell: cmd
run: |
"%ProgramFiles(x86)%\Windows Kits\10\bin\10.0.22000.0\x64\MakeAppx.exe" bundle /v /d . /bv ${{ inputs.version || github.ref_name }}.$Env:VERSION_NUMBER /p DragonFruit.Six.Client.msixbundle
"%ProgramFiles(x86)%\Windows Kits\10\bin\10.0.22000.0\x64\MakeAppx.exe" bundle /v /d . /bv ${{ inputs.version || github.ref_name }}.0 /p DragonFruit.Six.Client.msixbundle
"%ProgramFiles(x86)%\Windows Kits\10\bin\10.0.22000.0\x64\signtool.exe" sign /fd SHA256 DragonFruit.Six.Client.msixbundle
- name: Upload bundle to Release
Expand Down
22 changes: 13 additions & 9 deletions DragonFruit.Six.Client.Maui/DragonFruit.Six.Client.Maui.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,15 @@

<PropertyGroup Label="Android Deployment" Condition="'$(Configuration)' == 'Release' And $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<AndroidKeyStore>true</AndroidKeyStore>
<ApplicationVersion>$(AppVersion)</ApplicationVersion>
<AndroidSigningKeyAlias>dragon6-prod</AndroidSigningKeyAlias>
<AndroidSigningKeyStore>dragonfruit.keystore</AndroidSigningKeyStore>
</PropertyGroup>

<PropertyGroup Label="Windows Deployment" Condition="'$(Configuration)' == 'Release' And $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
<!-- must be set to 0 otherwise cannot deploy to windows store -->
<ApplicationVersion>0</ApplicationVersion>

<WindowsPackageType>MSIX</WindowsPackageType>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
Expand All @@ -54,27 +58,27 @@
</PropertyGroup>

<ItemGroup Label="MAUI Icons">
<MauiIcon Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'android'" Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#BD1818" />
<MauiSplashScreen Include="Resources\Splash\splashscreen.svg" Color="#BD1818" BaseSize="209,392" />
<MauiIcon Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'android'" Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#BD1818"/>
<MauiSplashScreen Include="Resources\Splash\splashscreen.svg" Color="#BD1818" BaseSize="209,392"/>
</ItemGroup>

<ItemGroup Label="Desktop Libraries" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' Or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
<PackageReference Include="DiscordRichPresence" Version="1.1.3.18" />
<PackageReference Include="DiscordRichPresence" Version="1.1.3.18"/>
</ItemGroup>

<ItemGroup Label="Migration-Specific Libraries" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' Or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.2" />
<PackageReference Include="Dapper" Version="2.0.123"/>
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.2"/>
</ItemGroup>

<ItemGroup Label="References">
<PackageReference Include="ReactiveUI.Maui" Version="18.4.1" />
<ProjectReference Include="..\DragonFruit.Six.Client\DragonFruit.Six.Client.csproj" />
<PackageReference Include="ReactiveUI.Maui" Version="18.4.1"/>
<ProjectReference Include="..\DragonFruit.Six.Client\DragonFruit.Six.Client.csproj"/>
</ItemGroup>

<ItemGroup>
<TrimmerRootAssembly Include="DragonFruit.Six.Client" />
<TrimmerRootAssembly Include="DragonFruit.Six.Client.Services" Condition="'$(Configuration)' == 'Release'" />
<TrimmerRootAssembly Include="DragonFruit.Six.Client"/>
<TrimmerRootAssembly Include="DragonFruit.Six.Client.Services" Condition="'$(Configuration)' == 'Release'"/>
</ItemGroup>

</Project>

0 comments on commit 1ceeb1a

Please sign in to comment.