Skip to content
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
20 changes: 16 additions & 4 deletions .github/workflows/createrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- uses: actions/setup-java@v2
Expand Down Expand Up @@ -95,21 +95,33 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- uses: actions/setup-java@v2
with:
distribution: 'microsoft'
java-version: '11'

- run: dotnet tool update -g dotnet-vs
- run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools

- name: Install MAUI Workloads
run: |
dotnet workload install maui --ignore-failed-sources

- name: Restore Dependencies
run: dotnet restore TransactionMobile.Maui.sln

#- name: Build Code
# run: msbuild TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true
- name: Build Code
run: |
"C:/Program Files/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=true -p:TargetFramework=net6.0-windows10.0.19041 /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json"

- name: Restore Dependencies
run: dotnet restore TransactionMobile.Maui.sln

- name: Set Application Version
uses: TransactionProcessing/actions@1.0.0
with:
Expand Down Expand Up @@ -152,7 +164,7 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- name: Install MAUI Workloads
Expand Down Expand Up @@ -205,7 +217,7 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- name: Install MAUI Workloads
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- uses: actions/setup-java@v2
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pullrequest_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '13.3'

- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- name: Install MAUI Workloads
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest_maccatalyst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- name: Install MAUI Workloads
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/pullrequest_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true

- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*
dotnet-version: 6.0.300-preview.22204.3
include-prerelease: true

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true
- run: dotnet tool update -g dotnet-vs
- run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools

- name: Install MAUI Workloads
run: |
Expand All @@ -37,8 +40,11 @@ jobs:
- name: Restore Dependencies
run: dotnet restore TransactionMobile.Maui.sln

#- name: Build Code
# run: msbuild TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true
- name: Build Code
run: msbuild TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true
run: |
"C:/Program Files/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=true -p:TargetFramework=net6.0-windows10.0.19041 /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json"

- name: Run Unit Tests
run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<PackageReference Include="SecurityService.Client" Version="1.1.0" />
<PackageReference Include="TransactionProcessorACL.DataTransferObjects" Version="1.1.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.0-pre20220207221914" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.0-pre20220318192836" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.0-pre20220207221914" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.0-pre20220207221914" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.0-pre20220207221914" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.0-pre20220318192836" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.0-pre20220318192836" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion TransactionMobile.Maui/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static class MauiProgram
private static MauiAppBuilder Builder;
public static MauiApp CreateMauiApp()
{
#if ANDROID && DEBUG
#if ANDROID
Platforms.Services.DangerousAndroidMessageHandlerEmitter.Register();
Platforms.Services.DangerousTrustProvider.Register();
#endif
Expand Down
7 changes: 4 additions & 3 deletions TransactionMobile.Maui/TransactionMobile.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
<RunAOTCompilation>False</RunAOTCompilation>
</PropertyGroup>

<ItemGroup>
Expand All @@ -49,12 +50,12 @@

<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<!-- Required - WinUI does not yet have buildTransitive for everything -->
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.2" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="1.0.0-pre8" />
<PackageReference Include="CommunityToolkit.Maui" Version="1.0.0-pre9" />
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="Refractored.MvvmHelpers" Version="1.6.2" />
</ItemGroup>
Expand Down