From f17fb3853d04c583c77a546c7d5c4a3a96c5ac4d Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 17:28:34 +0000 Subject: [PATCH 01/38] android added --- .github/workflows/pullrequest_android.yml | 30 +++--- .github/workflows/pullrequest_ios.yml | 92 ++++++++--------- .github/workflows/pullrequest_maccatalyst.yml | 86 ++++++++-------- .github/workflows/pullrequest_windows.yml | 98 +++++++++---------- 4 files changed, 153 insertions(+), 153 deletions(-) diff --git a/.github/workflows/pullrequest_android.yml b/.github/workflows/pullrequest_android.yml index 155c4507..31a41028 100644 --- a/.github/workflows/pullrequest_android.yml +++ b/.github/workflows/pullrequest_android.yml @@ -13,27 +13,27 @@ env: 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 diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index c1661bb8..c03e3571 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -1,46 +1,46 @@ -name: Build & Test Pull Requests - -on: - pull_request: - branches: - - main - -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 - -jobs: -# MAUI iOS Build - build-ios: - runs-on: macos-11 - name: iOS 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: 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/ +#name: Build & Test Pull Requests + +#on: +# pull_request: +# branches: +# - main + +#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 + +#jobs: +## MAUI iOS Build +# build-ios: +# runs-on: macos-11 +# name: iOS 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: 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/ diff --git a/.github/workflows/pullrequest_maccatalyst.yml b/.github/workflows/pullrequest_maccatalyst.yml index 82ee16e1..d8f0a1bf 100644 --- a/.github/workflows/pullrequest_maccatalyst.yml +++ b/.github/workflows/pullrequest_maccatalyst.yml @@ -1,43 +1,43 @@ -name: Build & Test Pull Requests - -on: - pull_request: - branches: - - main - -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 - -jobs: - # MAUI MacCatalyst Build - build-mac: - runs-on: macos-11 - name: MacCatalyst 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: 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.sln -c Release -f net6.0-maccatalyst --no-restore - -# #- 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/ +#name: Build & Test Pull Requests + +#on: +# pull_request: +# branches: +# - main + +#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 + +#jobs: +# # MAUI MacCatalyst Build +# build-mac: +# runs-on: macos-11 +# name: MacCatalyst 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: 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.sln -c Release -f net6.0-maccatalyst --no-restore + +## #- 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/ diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index d6b4b2c4..0f8203c5 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -1,49 +1,49 @@ -name: Build & Test Pull Requests - -on: - pull_request: - branches: - - main - -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 - -jobs: - build-windows: - runs-on: self-hosted - 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: 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 - - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - - # #- name: Upload Windows Artifact - # # uses: actions/upload-artifact@v2.3.1 - # # with: - # # name: windows-ci-build - # # path: src/MauiBeach/bin/Release/net6.0-windows*/**/MauiBeach*.msix +#name: Build & Test Pull Requests + +#on: +# pull_request: +# branches: +# - main + +#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 + +#jobs: +# build-windows: +# runs-on: self-hosted +# 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: 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 + +# - name: Run Unit Tests +# run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + +# # #- name: Upload Windows Artifact +# # # uses: actions/upload-artifact@v2.3.1 +# # # with: +# # # name: windows-ci-build +# # # path: src/MauiBeach/bin/Release/net6.0-windows*/**/MauiBeach*.msix From 1e9c5430b09e401bedf56927f29b913c37e055ef Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 17:47:30 +0000 Subject: [PATCH 02/38] added windows job --- .github/workflows/pullrequest_windows.yml | 99 ++++++++++++----------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 0f8203c5..e45dcdee 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -1,49 +1,50 @@ -#name: Build & Test Pull Requests - -#on: -# pull_request: -# branches: -# - main - -#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 - -#jobs: -# build-windows: -# runs-on: self-hosted -# 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: 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 - -# - name: Run Unit Tests -# run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj - -# # #- name: Upload Windows Artifact -# # # uses: actions/upload-artifact@v2.3.1 -# # # with: -# # # name: windows-ci-build -# # # path: src/MauiBeach/bin/Release/net6.0-windows*/**/MauiBeach*.msix +name: Build & Test Pull Requests + +on: + pull_request: + branches: + - main + +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 + +jobs: + build-windows: + 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: 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 src/MauiBeach/MauiBeach.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true + #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 + + - name: Run Unit Tests + run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + + # #- name: Upload Windows Artifact + # # uses: actions/upload-artifact@v2.3.1 + # # with: + # # name: windows-ci-build + # # path: src/MauiBeach/bin/Release/net6.0-windows*/**/MauiBeach*.msix From 185b1983664cbcf6b7974e755032f19730efe433 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 17:56:21 +0000 Subject: [PATCH 03/38] oops --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index e45dcdee..5bb297a5 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -37,7 +37,7 @@ jobs: 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 src/MauiBeach/MauiBeach.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true + 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: 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 - name: Run Unit Tests From b0185c831d8bc6d32cb8accb1ec39e99bf6cc2f7 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 18:06:31 +0000 Subject: [PATCH 04/38] use 64 bit --- .github/workflows/pullrequest_windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 5bb297a5..107251b5 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -28,6 +28,7 @@ jobs: uses: microsoft/setup-msbuild@v1.1 with: vs-prerelease: true + msbuild-architecture: x64 - name: Install MAUI Workloads run: | From 118031a81630e7a7883fc63f079000dcf69fce41 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 18:19:15 +0000 Subject: [PATCH 05/38] . --- .github/workflows/pullrequest_windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 107251b5..959c8d33 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -29,6 +29,7 @@ jobs: with: vs-prerelease: true msbuild-architecture: x64 + vs-version: '[17.2]' - name: Install MAUI Workloads run: | From 7a8f791405f8119e71fa0e41dcd825a1a4246132 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 18:23:28 +0000 Subject: [PATCH 06/38] worth a try --- .github/workflows/pullrequest_windows.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 959c8d33..be77f38a 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -24,12 +24,17 @@ jobs: dotnet-version: 6.0.200-preview.22055.15 include-prerelease: true - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 - with: - vs-prerelease: true - msbuild-architecture: x64 - vs-version: '[17.2]' + #- name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.1 + # with: + # vs-prerelease: true + # msbuild-architecture: x64 + # vs-version: '[17.2]' + - run: dotnet tool update -g dotnet-vs + - run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" + - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools + if: env.MSB == '' + - run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - name: Install MAUI Workloads run: | From 183e0f2fb1e709c362a8ab4bd2164ddc98813d44 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 18:27:27 +0000 Subject: [PATCH 07/38] ACTIONS_ALLOW_UNSECURE_COMMANDS --- .github/workflows/pullrequest_android.yml | 2 +- .github/workflows/pullrequest_windows.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_android.yml b/.github/workflows/pullrequest_android.yml index 31a41028..dbedfad1 100644 --- a/.github/workflows/pullrequest_android.yml +++ b/.github/workflows/pullrequest_android.yml @@ -8,7 +8,7 @@ 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 diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index be77f38a..2b93fd41 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -9,6 +9,7 @@ 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: From 451947259405609cd4620ed9ce7fb582776501d8 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 18:56:35 +0000 Subject: [PATCH 08/38] another test --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 2b93fd41..ce073c50 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -45,7 +45,7 @@ jobs: 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/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=false -p:TargetFramework=net6.0-windows10.0.19041 /p:GenerateAppxPackageOnBuild=true + run: msbuild 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 #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 - name: Run Unit Tests From 07b974b1c5d4bcc8afb50da67795f4e55c8089f4 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 22 Feb 2022 19:13:33 +0000 Subject: [PATCH 09/38] :| --- .github/workflows/pullrequest_windows.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index ce073c50..5f32a17d 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -25,17 +25,17 @@ jobs: dotnet-version: 6.0.200-preview.22055.15 include-prerelease: true - #- name: Setup MSBuild - # uses: microsoft/setup-msbuild@v1.1 - # with: - # vs-prerelease: true - # msbuild-architecture: x64 - # vs-version: '[17.2]' - - run: dotnet tool update -g dotnet-vs - - run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" - - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - if: env.MSB == '' - - run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + msbuild-architecture: x64 + + #- run: dotnet tool update -g dotnet-vs + #- run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" + #- run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools + # if: env.MSB == '' + #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - name: Install MAUI Workloads run: | From 97983b353f13dbf973beb25ffe21a65020bac572 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 08:37:12 +0000 Subject: [PATCH 10/38] ... --- .github/workflows/pullrequest_windows.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 5f32a17d..2527a340 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -19,17 +19,17 @@ jobs: - 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 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: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" From 399e66e89a80358b54d35e26163c3e470a1a2625 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 11:40:06 +0000 Subject: [PATCH 11/38] ... --- .github/workflows/pullrequest_windows.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 2527a340..fd14185b 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -19,6 +19,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Debug1 + run: echo " Print a single environment variable - ${{ MSBuildSDKsPath }} " + - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 with: @@ -43,6 +46,9 @@ jobs: - 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: Debug 2 + run: echo " Print a single environment variable - ${{ MSBuildSDKsPath }} " - name: Build Code run: msbuild 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 From 4dbed0f9b439fc74875ce48e6903e5e5e558ac7e Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 11:46:14 +0000 Subject: [PATCH 12/38] :| --- .github/workflows/pullrequest_windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index fd14185b..88a259f7 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v2 - name: Debug1 - run: echo " Print a single environment variable - ${{ MSBuildSDKsPath }} " + run: env - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 @@ -48,7 +48,7 @@ jobs: 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: Debug 2 - run: echo " Print a single environment variable - ${{ MSBuildSDKsPath }} " + run: env - name: Build Code run: msbuild 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 From b8451b7360c5e6fbdb60e666cf82cd8c7de3d94c Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 18:18:59 +0000 Subject: [PATCH 13/38] ... --- .github/workflows/pullrequest_windows.yml | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 88a259f7..e71ac7ea 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -33,29 +33,31 @@ jobs: with: dotnet-version: 6.0.200-preview.22055.15 include-prerelease: true - - #- run: dotnet tool update -g dotnet-vs + + - run: dotnet tool update -g dotnet-vs #- run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" - #- run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - # if: env.MSB == '' + - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" + - run: echo "::set-env name=MSB::$(echo vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1) + - run: env - - 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: Install MAUI Workloads + # run: | + # dotnet workload install maui --ignore-failed-sources - - name: Debug 2 - run: env + #- 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: Debug 2 + # run: env - - name: Build Code - run: msbuild 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 - #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 + #- name: Build Code + # run: msbuild 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 + # #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 - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + #- name: Run Unit Tests + # run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj # #- name: Upload Windows Artifact # # uses: actions/upload-artifact@v2.3.1 From a975d5d9b88d9f129b7d3cd61b1aced59ba0f062 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 18:27:47 +0000 Subject: [PATCH 14/38] :/ --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index e71ac7ea..568000c3 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -38,7 +38,7 @@ jobs: #- run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - run: echo "::set-env name=MSB::$(echo vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1) + - run: echo "::set-env name=MSB::$(echo vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - run: env From e61a3ffcd4a76df1fdb763e316603b27a2914eb8 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 18:49:44 +0000 Subject: [PATCH 15/38] :| --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 568000c3..45704207 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -38,7 +38,7 @@ jobs: #- run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - run: echo "::set-env name=MSB::$(echo vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" + - run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - run: env From 1734f030609cc2dcfb8eb089f47c03a72fde4807 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 19:20:30 +0000 Subject: [PATCH 16/38] prays --- .github/workflows/pullrequest_windows.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 45704207..e6a99f55 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -40,20 +40,19 @@ jobs: #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - run: env + + - name: Install MAUI Workloads + run: | + dotnet workload install maui --ignore-failed-sources - - #- 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: 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: Debug 2 # run: env - #- name: Build Code - # run: msbuild 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: Build Code + run: $(env.MSB)\msbuild 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 # #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 #- name: Run Unit Tests From 08e4ce062eb36539cde891863c657be2fd3120f7 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 19:39:24 +0000 Subject: [PATCH 17/38] :| --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index e6a99f55..46c32083 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -52,7 +52,7 @@ jobs: # run: env - name: Build Code - run: $(env.MSB)\msbuild 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 + run: "$MSB\\msbuild 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" # #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 #- name: Run Unit Tests From 4b80b6de78c2203573d548d73d11d6fe35daf480 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 20:06:33 +0000 Subject: [PATCH 18/38] :| --- .github/workflows/pullrequest_windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 46c32083..a95a95b2 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -38,8 +38,8 @@ jobs: #- run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - - run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - - run: env + #- run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" + #- run: env - name: Install MAUI Workloads run: | @@ -52,7 +52,7 @@ jobs: # run: env - name: Build Code - run: "$MSB\\msbuild 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" + 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 # #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 #- name: Run Unit Tests From b487608fdd30f6fa76bf233fdd4e7d029e363713 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 21:34:54 +0000 Subject: [PATCH 19/38] :| --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index a95a95b2..f3a7e177 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -52,7 +52,7 @@ jobs: # run: env - 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 + 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" # #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 #- name: Run Unit Tests From 39b3dd50057493032e9cdc6f80cc24b1b183fc59 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 21:52:54 +0000 Subject: [PATCH 20/38] could it be --- .github/workflows/pullrequest_windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index f3a7e177..8770fd5f 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -52,7 +52,8 @@ jobs: # run: env - 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" + 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 # #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 #- name: Run Unit Tests From 9f8eb19fc0e1b6d5aba3c29c9388f6c8fa1c7fe5 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 22:09:35 +0000 Subject: [PATCH 21/38] . --- .github/workflows/pullrequest_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index 8770fd5f..a3771fd6 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -53,7 +53,7 @@ jobs: - 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 + "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" # #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 #- name: Run Unit Tests From 3a9021d31fd9680f961d335c3d8a6899fcc3602f Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 23 Feb 2022 22:37:17 +0000 Subject: [PATCH 22/38] added working windows --- .github/workflows/pullrequest_windows.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml index a3771fd6..5582c4f3 100644 --- a/.github/workflows/pullrequest_windows.yml +++ b/.github/workflows/pullrequest_windows.yml @@ -19,9 +19,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Debug1 - run: env - - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 with: @@ -35,11 +32,7 @@ jobs: include-prerelease: true - run: dotnet tool update -g dotnet-vs - #- run: echo "::set-env name=MSB::$(vs where preview --prop=InstallationPath)" - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - #- run: echo "::add-path::$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" - #- run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - #- run: env - name: Install MAUI Workloads run: | @@ -48,16 +41,12 @@ jobs: - 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: Debug 2 - # run: env - - 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" - # #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 - #- name: Run Unit Tests - # run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj + - name: Run Unit Tests + run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj # #- name: Upload Windows Artifact # # uses: actions/upload-artifact@v2.3.1 From 718d08b12db4c4172cc6542ba9a33d9a53e1e989 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 07:32:49 +0000 Subject: [PATCH 23/38] added ios --- .github/workflows/pullrequest_ios.yml | 80 +++++++++++++-------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index c03e3571..3ad7c92f 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -1,43 +1,43 @@ -#name: Build & Test Pull Requests - -#on: -# pull_request: -# branches: -# - main - -#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 - -#jobs: -## MAUI iOS Build -# build-ios: -# runs-on: macos-11 -# name: iOS 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: 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: Build & Test Pull Requests + +on: + pull_request: + branches: + - main + +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 + +jobs: +# MAUI iOS Build + build-ios: + runs-on: macos-11 + name: iOS 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: 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 From b4d6c9f753fa81792a595f6a0f8f3e9edf06e6b0 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 07:45:19 +0000 Subject: [PATCH 24/38] .. --- .github/workflows/pullrequest_ios.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 3ad7c92f..801be645 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -25,19 +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 + - run: dotnet tool update -g dotnet-vs + - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools + - run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" + - run: env - - name: Restore Dependencies - run: dotnet restore TransactionMobile.Maui.sln + #- name: Install MAUI Workloads + # run: | + # dotnet workload install ios --ignore-failed-sources + # dotnet workload install maui --ignore-failed-sources - - name: Build Code - run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-ios --no-restore + #- name: Restore Dependencies + # run: dotnet restore TransactionMobile.Maui.sln - - name: Run Unit Tests - run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj + #- 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 From c4c3b791dbf1509125e28090ab5973831e80b112 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 08:27:07 +0000 Subject: [PATCH 25/38] . --- .github/workflows/pullrequest_ios.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 801be645..4d90d91f 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -26,7 +26,7 @@ jobs: include-prerelease: true - run: dotnet tool update -g dotnet-vs - - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools + - run: sudo vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - run: env From 94ce78e9eb9a0fdee68ac3eb698499c6a43da301 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 09:21:23 +0000 Subject: [PATCH 26/38] ... --- .github/workflows/pullrequest_ios.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 4d90d91f..bb28f69b 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -25,21 +25,21 @@ jobs: dotnet-version: 6.0.200-preview.22055.15 include-prerelease: true - - run: dotnet tool update -g dotnet-vs - - run: sudo vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - - run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - - run: env + #- run: dotnet tool update -g dotnet-vs + #- run: sudo vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools + #- run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" + #- run: env - #- name: Install MAUI Workloads - # run: | - # dotnet workload install ios --ignore-failed-sources - # dotnet workload install maui --ignore-failed-sources + - 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: 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: 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 From b1ef8ea67bd9ff5b3f6d31b784ec3a4592b6a815 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 19:04:28 +0000 Subject: [PATCH 27/38] stab in dark --- .github/workflows/pullrequest_ios.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index bb28f69b..43726d15 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -29,6 +29,11 @@ jobs: #- run: sudo vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools #- run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" #- run: env + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + msbuild-architecture: x64 - name: Install MAUI Workloads run: | @@ -38,8 +43,10 @@ jobs: - 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: Build Code - run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-ios --no-restore + run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.sln #- name: Run Unit Tests # run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj From 0f1fa8b9e43b0dd668c48e2253b382350d1afa36 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 19:30:11 +0000 Subject: [PATCH 28/38] :| --- .github/workflows/pullrequest_ios.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 43726d15..e49352ef 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -25,15 +25,15 @@ jobs: dotnet-version: 6.0.200-preview.22055.15 include-prerelease: true - #- run: dotnet tool update -g dotnet-vs + - run: dotnet tool update -g dotnet-vs #- run: sudo vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools #- run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" #- run: env - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 - with: - vs-prerelease: true - msbuild-architecture: x64 + #- name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.1 + # with: + # vs-prerelease: true + # msbuild-architecture: x64 - name: Install MAUI Workloads run: | From 551f3c9ca60b29d75530ce932adf2758594c8811 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 24 Feb 2022 21:44:55 +0000 Subject: [PATCH 29/38] .. --- TransactionMobile.Maui/TransactionMobile.Maui.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj index aaa36385..394f1cd5 100644 --- a/TransactionMobile.Maui/TransactionMobile.Maui.csproj +++ b/TransactionMobile.Maui/TransactionMobile.Maui.csproj @@ -14,7 +14,8 @@ Transaction Processing POS - com.transactionprocessing.pos + + com.taranissoftware.MauiBeach 1 From 2b5c04254962e320570ab31bd0d0e14dfe63a32f Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 07:05:14 +0000 Subject: [PATCH 30/38] ... --- .github/workflows/pullrequest_ios.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index e49352ef..b886ccc2 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -43,10 +43,10 @@ jobs: - 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: Build Code - run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.sln + run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-ios --no-restore + #- name: Build Code + # run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.sln #- name: Run Unit Tests # run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj From 8e791c76fef4084ac8496447267b562d9e8f3ed4 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 07:14:16 +0000 Subject: [PATCH 31/38] :| --- .github/workflows/pullrequest_ios.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index b886ccc2..d3c90c78 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.200-preview.22055.15 + dotnet-version: 6.0.x include-prerelease: true - run: dotnet tool update -g dotnet-vs From 7cd6fb43115d45cedd2c927ab35025df7dd261e1 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 08:44:53 +0000 Subject: [PATCH 32/38] ... --- TransactionMobile.Maui/Platforms/iOS/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TransactionMobile.Maui/Platforms/iOS/Info.plist b/TransactionMobile.Maui/Platforms/iOS/Info.plist index d675f560..e9e3ec8f 100644 --- a/TransactionMobile.Maui/Platforms/iOS/Info.plist +++ b/TransactionMobile.Maui/Platforms/iOS/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion 1.0.5 CFBundleIdentifier - com.transactionprocessing.pos + com.taranissoftware.MauiBeach CFBundleDisplayName Transaction Processing POS CFBundleName From 84f27535a52bcb084a03a16bdc410c5d24be9e4a Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 09:22:45 +0000 Subject: [PATCH 33/38] :| --- TransactionMobile.Maui/Platforms/iOS/Info.plist | 4 +--- TransactionMobile.Maui/TransactionMobile.Maui.csproj | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/TransactionMobile.Maui/Platforms/iOS/Info.plist b/TransactionMobile.Maui/Platforms/iOS/Info.plist index e9e3ec8f..896e6664 100644 --- a/TransactionMobile.Maui/Platforms/iOS/Info.plist +++ b/TransactionMobile.Maui/Platforms/iOS/Info.plist @@ -28,12 +28,10 @@ XSAppIconAssets Assets.xcassets/appicon.appiconset - CFBundleVersion - 1.0.5 CFBundleIdentifier com.taranissoftware.MauiBeach CFBundleDisplayName - Transaction Processing POS + MAUI Beach CFBundleName Transaction Processing POS diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj index 394f1cd5..28b864a9 100644 --- a/TransactionMobile.Maui/TransactionMobile.Maui.csproj +++ b/TransactionMobile.Maui/TransactionMobile.Maui.csproj @@ -11,7 +11,8 @@ true - Transaction Processing POS + + MAUI Beach From 197387a0df324cdba5daf39228ad65b321ae4fec Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 09:37:47 +0000 Subject: [PATCH 34/38] :| --- .github/workflows/pullrequest_ios.yml | 6 +++--- TransactionMobile.Maui/Platforms/iOS/Info.plist | 4 ---- TransactionMobile.Maui/TransactionMobile.Maui.csproj | 12 ++++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index d3c90c78..d83c34da 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -43,10 +43,10 @@ jobs: - 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: Build Code - # run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.sln + #run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-ios --no-restore + - name: Build Code + run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.csproj #- name: Run Unit Tests # run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj diff --git a/TransactionMobile.Maui/Platforms/iOS/Info.plist b/TransactionMobile.Maui/Platforms/iOS/Info.plist index 896e6664..450d0647 100644 --- a/TransactionMobile.Maui/Platforms/iOS/Info.plist +++ b/TransactionMobile.Maui/Platforms/iOS/Info.plist @@ -28,10 +28,6 @@ XSAppIconAssets Assets.xcassets/appicon.appiconset - CFBundleIdentifier - com.taranissoftware.MauiBeach - CFBundleDisplayName - MAUI Beach CFBundleName Transaction Processing POS diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj index 28b864a9..8ae0b897 100644 --- a/TransactionMobile.Maui/TransactionMobile.Maui.csproj +++ b/TransactionMobile.Maui/TransactionMobile.Maui.csproj @@ -11,12 +11,12 @@ true - - MAUI Beach + Transaction Processing POS + - - com.taranissoftware.MauiBeach + com.transactionprocessing.pos + 1 @@ -167,7 +167,7 @@ win10-x64 - + From 3fd3750700481745e1fde081e51ef430c274cc8c Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 09:48:05 +0000 Subject: [PATCH 35/38] ... --- .github/workflows/pullrequest_ios.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index d83c34da..c774e422 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -43,10 +43,10 @@ jobs: - 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: Build Code - run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.csproj + run: dotnet build TransactionMobile.Maui.sln -c Debug -f net6.0-ios --no-restore + #- name: Build Code + # run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.csproj #- name: Run Unit Tests # run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj From d495188b3dc901929f7746279aef8a56bef3787a Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 09:52:21 +0000 Subject: [PATCH 36/38] just project file --- .github/workflows/pullrequest_ios.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index c774e422..0882efeb 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -43,8 +43,12 @@ jobs: - name: Restore Dependencies run: dotnet restore TransactionMobile.Maui.sln + #- name: Build Code + # run: dotnet build TransactionMobile.Maui.sln -c Debug -f net6.0-ios --no-restore + - name: Build Code - run: dotnet build TransactionMobile.Maui.sln -c Debug -f net6.0-ios --no-restore + run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore + #- name: Build Code # run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.csproj From 006cf839c4b1014dd420cec9d1e7ccb7c02d93da Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 09:58:11 +0000 Subject: [PATCH 37/38] unit tests --- .github/workflows/pullrequest_ios.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 0882efeb..10d6980e 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -52,8 +52,8 @@ jobs: #- name: Build Code # run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.csproj - #- name: Run Unit Tests - # run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj + - 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 From c045b0aa6e387175b373cf6390d61dcdca6508b0 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 25 Feb 2022 10:16:55 +0000 Subject: [PATCH 38/38] mac catalyst --- .github/workflows/pullrequest_ios.yml | 24 +---- .github/workflows/pullrequest_maccatalyst.yml | 98 +++++++++++-------- 2 files changed, 60 insertions(+), 62 deletions(-) diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml index 10d6980e..07db90f8 100644 --- a/.github/workflows/pullrequest_ios.yml +++ b/.github/workflows/pullrequest_ios.yml @@ -22,19 +22,11 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 6.0.200-preview.22055.15 include-prerelease: true - - run: dotnet tool update -g dotnet-vs - #- run: sudo vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools - #- run: echo "::set-env name=MSB::$(vswhere -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1)" - #- run: env - #- name: Setup MSBuild - # uses: microsoft/setup-msbuild@v1.1 - # with: - # vs-prerelease: true - # msbuild-architecture: x64 - + #- run: dotnet tool update -g dotnet-vs + - name: Install MAUI Workloads run: | dotnet workload install ios --ignore-failed-sources @@ -42,16 +34,10 @@ jobs: - name: Restore Dependencies run: dotnet restore TransactionMobile.Maui.sln - - #- name: Build Code - # run: dotnet build TransactionMobile.Maui.sln -c Debug -f net6.0-ios --no-restore - + - name: Build Code run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore - - #- name: Build Code - # run: msbuild /p:Configuration="Release" /p:Platform="iPhoneSimulator" /t:Build TransactionMobile.Maui/TransactionMobile.Maui.csproj - + - name: Run Unit Tests run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj diff --git a/.github/workflows/pullrequest_maccatalyst.yml b/.github/workflows/pullrequest_maccatalyst.yml index d8f0a1bf..2345c252 100644 --- a/.github/workflows/pullrequest_maccatalyst.yml +++ b/.github/workflows/pullrequest_maccatalyst.yml @@ -1,43 +1,55 @@ -#name: Build & Test Pull Requests - -#on: -# pull_request: -# branches: -# - main - -#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 - -#jobs: -# # MAUI MacCatalyst Build -# build-mac: -# runs-on: macos-11 -# name: MacCatalyst 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: 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.sln -c Release -f net6.0-maccatalyst --no-restore - -## #- 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/ +name: Build & Test Pull Requests + +on: + pull_request: + branches: + - main + +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 + +jobs: + # MAUI MacCatalyst Build + build-mac: + runs-on: macos-11 + name: MacCatalyst 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.x + include-prerelease: true + + #- 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/ +