Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f17fb38
android added
StuartFergusonVme Feb 22, 2022
1e9c543
added windows job
StuartFergusonVme Feb 22, 2022
185b198
oops
StuartFergusonVme Feb 22, 2022
b0185c8
use 64 bit
StuartFergusonVme Feb 22, 2022
118031a
.
StuartFergusonVme Feb 22, 2022
7a8f791
worth a try
StuartFergusonVme Feb 22, 2022
183e0f2
ACTIONS_ALLOW_UNSECURE_COMMANDS
StuartFergusonVme Feb 22, 2022
4519472
another test
StuartFergusonVme Feb 22, 2022
07b974b
:|
StuartFergusonVme Feb 22, 2022
97983b3
...
StuartFergusonVme Feb 23, 2022
399e66e
...
StuartFergusonVme Feb 23, 2022
4dbed0f
:|
StuartFergusonVme Feb 23, 2022
b8451b7
...
StuartFergusonVme Feb 23, 2022
a975d5d
:/
StuartFergusonVme Feb 23, 2022
e61a3ff
:|
StuartFergusonVme Feb 23, 2022
1734f03
prays
StuartFergusonVme Feb 23, 2022
08e4ce0
:|
StuartFergusonVme Feb 23, 2022
4b80b6d
:|
StuartFergusonVme Feb 23, 2022
b487608
:|
StuartFergusonVme Feb 23, 2022
39b3dd5
could it be
StuartFergusonVme Feb 23, 2022
9f8eb19
.
StuartFergusonVme Feb 23, 2022
3a9021d
added working windows
StuartFergusonVme Feb 23, 2022
718d08b
added ios
StuartFergusonVme Feb 24, 2022
b4d6c9f
..
StuartFergusonVme Feb 24, 2022
c4c3b79
.
StuartFergusonVme Feb 24, 2022
94ce78e
...
StuartFergusonVme Feb 24, 2022
b1ef8ea
stab in dark
StuartFergusonVme Feb 24, 2022
0f1fa8b
:|
StuartFergusonVme Feb 24, 2022
551f3c9
..
StuartFergusonVme Feb 24, 2022
2b5c042
...
StuartFergusonVme Feb 25, 2022
8e791c7
:|
StuartFergusonVme Feb 25, 2022
7cd6fb4
...
StuartFergusonVme Feb 25, 2022
84f2753
:|
StuartFergusonVme Feb 25, 2022
197387a
:|
StuartFergusonVme Feb 25, 2022
3fd3750
...
StuartFergusonVme Feb 25, 2022
d495188
just project file
StuartFergusonVme Feb 25, 2022
006cf83
unit tests
StuartFergusonVme Feb 25, 2022
c045b0a
mac catalyst
StuartFergusonVme Feb 25, 2022
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
32 changes: 16 additions & 16 deletions .github/workflows/pullrequest_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ on:
env:
DOTNET_NOLOGO: true # Disable the .NET logo
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience
DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry
DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry

jobs:
# MAUI Android Build
build-android:
runs-on: self-hosted
runs-on: windows-2022
name: Android Build
steps:
- name: Checkout
uses: actions/checkout@v2

#- name: Setup .NET 6
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: 6.0.200-preview.22055.15
# include-prerelease: true
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.200-preview.22055.15
include-prerelease: true

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

#- name: Install MAUI Workloads
# run: |
# dotnet workload install android --ignore-failed-sources
# dotnet workload install maui --ignore-failed-sources
- uses: actions/setup-java@v2
with:
distribution: 'microsoft'
java-version: '11'

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

- name: Restore Dependencies
run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
Expand Down
40 changes: 21 additions & 19 deletions .github/workflows/pullrequest_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,24 @@ jobs:
dotnet-version: 6.0.200-preview.22055.15
include-prerelease: true

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

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

#- name: Build Code
# run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-ios --no-restore

#- name: Run Unit Tests
# run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj

#- name: Upload iOS Artifact
# uses: actions/upload-artifact@v2.3.1
# with:
# name: ios-ci-build
# path: src/MauiBeach/bin/Release/net6.0-ios/**/*.app/
#- run: dotnet tool update -g dotnet-vs

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

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

- name: Build Code
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore

- name: Run Unit Tests
run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj

# #- name: Upload iOS Artifact
# # uses: actions/upload-artifact@v2.3.1
# # with:
# # name: ios-ci-build
# # path: src/MauiBeach/bin/Release/net6.0-ios/**/*.app/
30 changes: 21 additions & 9 deletions .github/workflows/pullrequest_maccatalyst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,31 @@ jobs:
dotnet-version: 6.0.200-preview.22055.15
include-prerelease: true

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

# - name: Restore Dependencies
# run: dotnet restore TransactionMobile.Maui.sln
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
include-prerelease: true

# - name: Build Code
# run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-maccatalyst --no-restore
#- run: dotnet tool update -g dotnet-vs

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

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

- name: Build Code
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-maccatalyst --no-restore

- name: Run Unit Tests
run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj

# #- name: Upload MacCatalyst Artifact
# # uses: actions/upload-artifact@v2.3.1
# # with:
# # name: macos-ci-build
# # path: src/MauiBeach/bin/Release/net6.0-maccatalyst/**/*.app/

38 changes: 22 additions & 16 deletions .github/workflows/pullrequest_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,41 @@ env:
DOTNET_NOLOGO: true # Disable the .NET logo
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience
DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

jobs:
build-windows:
runs-on: self-hosted
runs-on: windows-2022
name: Windows Build
steps:
- name: Checkout
uses: actions/checkout@v2

#- name: Setup .NET 6
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: 6.0.200-preview.22055.15
# include-prerelease: true

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

#- name: Install MAUI Workloads
# run: |
# dotnet workload install maui --ignore-failed-sources
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true
msbuild-architecture: x64

- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.200-preview.22055.15
include-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: |
dotnet workload install maui --ignore-failed-sources

- name: Restore Dependencies
run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json

- name: Build Code
run: msbuild TransactionMobile.Maui.sln -restore -p:Configuration=Release -p:TargetFramework=net6.0-windows10.0.19041 /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
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
6 changes: 0 additions & 6 deletions TransactionMobile.Maui/Platforms/iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
</array>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/appicon.appiconset</string>
<key>CFBundleVersion</key>
<string>1.0.5</string>
<key>CFBundleIdentifier</key>
<string>com.transactionprocessing.pos</string>
<key>CFBundleDisplayName</key>
<string>Transaction Processing POS</string>
<key>CFBundleName</key>
<string>Transaction Processing POS</string>
</dict>
Expand Down
6 changes: 4 additions & 2 deletions TransactionMobile.Maui/TransactionMobile.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@

<!-- Display name -->
<ApplicationTitle>Transaction Processing POS</ApplicationTitle>
<!--<ApplicationTitle>MAUI Beach</ApplicationTitle>-->

<!-- App Identifier -->
<ApplicationId>com.transactionprocessing.pos</ApplicationId>
<!--<ApplicationId>com.taranissoftware.MauiBeach</ApplicationId>-->

<!-- Versions -->
<ApplicationVersion>1</ApplicationVersion>
Expand Down Expand Up @@ -165,7 +167,7 @@
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
<!--<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
</PropertyGroup>
</PropertyGroup>-->
</Project>