diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 33fc6f973..d8ff6d30c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -1,145 +1,64 @@ -name: Build Changed C# Projects for PR +name: build on: pull_request: - paths-ignore: - - '**.md' + branches: [ main ] jobs: - build: - strategy: - fail-fast: false - matrix: - os: [windows-latest, macos-26] + build-android: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 10.0.x + + - name: Install MAUI Workload + run: dotnet workload install maui + + - name: Restore dependencies + run: dotnet restore ./10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj + + - name: Build Android + run: dotnet build ./10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj -f net10.0-android --configuration Release --no-restore + + build-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 - runs-on: ${{ matrix.os }} + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 10.0.x # Disamakan ke 10.0 + - name: Install MAUI Workload + run: dotnet workload install maui # Wajib ada + + - name: Restore dependencies + run: dotnet restore ./10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj + + - name: Build Windows + # Tambahkan target framework spesifik jika perlu, contoh: -f net10.0-windows10.0.19041.0 + run: dotnet build ./10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj --configuration Release --no-restore + + build-macos: + runs-on: macos-13 steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - - name: Install .NET SDKs - uses: actions/setup-dotnet@v4 - with: - dotnet-version: | - 9.0.x - 10.0.x - 11.0.x - include-prerelease: true - dotnet-quality: 'preview' - - - name: Install .NET MAUI Workload - run: | - dotnet workload config --update-mode manifests - dotnet workload install maui - - - name: Select Xcode Version - run: sudo xcode-select -s /Applications/Xcode_26.3.app - if: runner.os == 'macOS' - - - name: Find and build changed projects - run: | - $failedProjectCount=0 - $skippedProjectCount=0 - # Get the list of changed files - $changedFiles = git diff --name-only -r --diff-filter=d HEAD^1 HEAD - - $excluded_projects_file="./eng/excluded_projects_" + "${{ runner.os }}".ToLower() + ".txt" - $excluded_projects=@() - $processedProjects=@() - - $jobSummaryFile=$env:GITHUB_STEP_SUMMARY - - if (Test-Path $excluded_projects_file) { - $excluded_projects = Get-Content -Path $excluded_projects_file | Where-Object { $_ -notmatch "^\s*#" -and $_ -match "\S" } - } - - Write-Output "# .NET MAUI Sample Apps Build Status (${{ runner.os }})" | Out-File -FilePath $jobSummaryFile -Append - Write-Output "Only projects that have changes are built." | Out-File -FilePath $jobSummaryFile -Append - Write-Output "| Project | Build Status |" | Out-File -FilePath $jobSummaryFile -Append - Write-Output "|---|---|" | Out-File -FilePath $jobSummaryFile -Append - - # Determine the corresponding project for each changed file - foreach ($file in $changedFiles) { - $projectToBuild="" - - # Check if the file is a .csproj file - if ($file -like '*.csproj') { - $projectToBuild = $file - } else { - $currentFolder = (Get-Item -LiteralPath (Resolve-Path -Path "$file") -Force).Directory - - while ($currentFolder -ne $null -and '' -ne $currentFolder) { - $csprojFiles = Get-ChildItem -Path $currentFolder -Filter '*.csproj' -File - - if ($csprojFiles.Count -gt 0) { - break - } - $currentFolder = Split-Path -Parent $currentFolder - } - - if ($csprojFiles.Count -gt 0) { - $projectToBuild = $csprojFiles[0].FullName - } - } - - if (-not [string]::IsNullOrEmpty($projectToBuild)) { - $projectToBuild = (Resolve-Path -Path $projectToBuild -Relative).Replace("\", "/") - - # Only proceed when this project has not been built yet - if (-not ($processedProjects -contains $projectToBuild)) { - Write-Output "::notice:: $projectToBuild is not in processed builds yet" - - $processedProjects += $projectToBuild - Write-Output "::notice:: Added $projectToBuild to processed builds" - - if ($excluded_projects -contains $projectToBuild) { - Write-Output "::notice:: Skipping build for excluded project: $projectToBuild" - Write-Output "| $projectToBuild | Skipped |" | Out-File -FilePath $jobSummaryFile -Append - - $skippedProjectCount++ - } - else { - Write-Output "::group:: Building $projectToBuild" - - dotnet build $projectToBuild - - if ($LASTEXITCODE -gt 0) { - Write-Output "::error:: Build failed for $projectToBuild" - Write-Output "| $projectToBuild | :x: |" | Out-File -FilePath $jobSummaryFile -Append - - $failedProjectCount++ - } - else { - Write-Output "Build succeeded for $projectToBuild" - Write-Output "| $projectToBuild | :white_check_mark: |" | Out-File -FilePath $jobSummaryFile -Append - } - - $proj_dir = [System.IO.Path]::GetDirectoryName($projectToBuild) - Write-Output "Cleaning up bin & obj in $proj_dir" - - try { - Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force - } catch { - Write-Output "::warning:: Failed to clean up bin & obj in $proj_dir" - } - - Write-Output "::endgroup::" - } - } - } - else { - Write-Output "::warning:: Found no csproj for file $file" - } - } - - if ($failedProjectCount -gt 0) { - Write-Output "" | Out-File -FilePath $jobSummaryFile -Append - Write-Output "# Failed builds: $failedProjectCount" | Out-File -FilePath $jobSummaryFile -Append - Write-Output "# Skipped builds: $skippedProjectCount" | Out-File -FilePath $jobSummaryFile -Append - - exit $failedProjectCount - } - shell: powershell + - uses: actions/checkout@v3 + + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 10.0.x # Disamakan ke 10.0 + + - name: Install MAUI Workload + run: dotnet workload install maui # Wajib ada + + - name: Restore dependencies + run: dotnet restore ./10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj + + - name: Build macOS + run: dotnet build ./10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj -f net10.0-maccatalyst --configuration Release --no-restore diff --git a/10.0/Apps/PointOfSale/src/.github/workflows/build-pr.yml b/10.0/Apps/PointOfSale/src/.github/workflows/build-pr.yml new file mode 100644 index 000000000..e69de29bb diff --git a/10.0/Apps/PointOfSale/src/PointOfSale.API/PointOfSale.API.csproj b/10.0/Apps/PointOfSale/src/PointOfSale.API/PointOfSale.API.csproj index d9037e35b..dfd9b68d5 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale.API/PointOfSale.API.csproj +++ b/10.0/Apps/PointOfSale/src/PointOfSale.API/PointOfSale.API.csproj @@ -1,7 +1,7 @@ - + - net7.0 + net10.0 enable enable @@ -9,14 +9,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/AppShell.xaml b/10.0/Apps/PointOfSale/src/PointOfSale/AppShell.xaml index dc3d903d5..e76dc302f 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/AppShell.xaml +++ b/10.0/Apps/PointOfSale/src/PointOfSale/AppShell.xaml @@ -7,7 +7,7 @@ xmlns:b="clr-namespace:PointOfSale.Common.Behaviors" xmlns:v="clr-namespace:PointOfSale.Pages.Views" x:Class="PointOfSale.AppShell" - FlyoutWidth="104" + FlyoutWidth="240" FlyoutBehavior="Locked"> @@ -46,7 +46,7 @@ StrokeThickness="0" HorizontalOptions="Fill" HeightRequest="70" - Margin="15,0,0,0"> + Margin="8,0,0,0"> @@ -54,7 +54,7 @@ + Margin="0,15,0,15"/> + ToolTipProperties.Text="Home" + b:CursorBehavior.AttachBehavior="True" + CheckedChanged="OnMenuItemChanged"> - + - - - - + ToolTipProperties.Text="Dashboard" + CheckedChanged="OnMenuItemChanged"> + + - - - - + ToolTipProperties.Text="Settings" + CheckedChanged="OnMenuItemChanged"> + + - - - - + ToolTipProperties.Text="Discount" + CheckedChanged="OnMenuItemChanged"> + + - + - - - - - + ToolTipProperties.Text="Messages" + CheckedChanged="OnMenuItemChanged"> + + + - - + ToolTipProperties.Text="Notifications" + CheckedChanged="OnMenuItemChanged"> + + - + @@ -176,23 +144,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/MauiProgram.cs b/10.0/Apps/PointOfSale/src/PointOfSale/MauiProgram.cs index c1acfbde5..fcb6cc8dc 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/MauiProgram.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/MauiProgram.cs @@ -6,6 +6,7 @@ using Plugin.Maui.KeyListener; using SkiaSharp.Views.Maui.Controls.Hosting; using ZXing.Net.Maui; +using ZXing.Net.Maui.Controls; #if WINDOWS using Microsoft.UI; diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardPage.xaml.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardPage.xaml.cs index e9683ffc4..43de390d9 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardPage.xaml.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardPage.xaml.cs @@ -48,6 +48,6 @@ private void DrawChart() async void TapGestureRecognizer_Tapped(System.Object sender, System.EventArgs e) { - await DisplayAlert("Filter", "You are looking for a filter dialog that isn't yet implemented. Come back later", "Okay"); + await DisplayAlertAsync("Filter", "You are looking for a filter dialog that isn't yet implemented. Come back later", "Okay"); } } diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardViewModel.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardViewModel.cs index 52b716ac7..3b60392c8 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardViewModel.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/DashboardViewModel.cs @@ -5,6 +5,6 @@ public partial class DashboardViewModel : ObservableObject [RelayCommand] async Task ViewAll() { - await App.Current.Windows[0].Page.DisplayAlert("Not Implemented", "Wouldn't it be nice tho?", "Okay"); + await App.Current.Windows[0].Page.DisplayAlertAsync ("Not Implemented", "Wouldn't it be nice tho?", "Okay"); } } diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/MobileLoginViewModel.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/MobileLoginViewModel.cs index de2c258bf..e9693ed9f 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/MobileLoginViewModel.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/MobileLoginViewModel.cs @@ -1,4 +1,3 @@ - namespace PointOfSale.Pages.Handheld; public partial class MobileLoginViewModel : ObservableObject @@ -12,9 +11,10 @@ async Task Login() // display the message private async Task ShowMessage(string title, string message) { + // Run on UI thread and call the Page.DisplayAlertAsync method _ = App.Current.Windows[0].Page.Dispatcher.Dispatch(async () => { - await App.Current.Windows[0].Page.DisplayAlert(title, message, "OK").ConfigureAwait(false); + await App.Current.Windows[0].Page.DisplayAlertAsync(title, message, "OK").ConfigureAwait(false); }); } } diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersPage.xaml b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersPage.xaml index b2d5ca8e4..84bd0d098 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersPage.xaml +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersPage.xaml @@ -141,8 +141,8 @@ AlignContent="SpaceAround" JustifyContent="SpaceAround" Background="{StaticResource DarkBg1Transparent}"> - - + diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersViewModel.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersViewModel.cs index 657a88a4e..7c49afba8 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersViewModel.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/OrdersViewModel.cs @@ -25,7 +25,7 @@ public partial class OrdersViewModel : ObservableObject [RelayCommand] public async Task LogOut() { - var result = await App.Current.Windows[0].Page.DisplayAlert("", "Do you want to logout?", "Yes", "Ooops, no"); + var result = await App.Current.Windows[0].Page.DisplayAlertAsync ("", "Do you want to logout?", "Yes", "Ooops, no"); if (!result) return; diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/ScanPage.xaml.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/ScanPage.xaml.cs index 71ecffcb3..0a874fd6a 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/ScanPage.xaml.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Handheld/ScanPage.xaml.cs @@ -1,5 +1,10 @@ -using PointOfSale.Models; +using System; +using System.Linq; +using System.Collections.Generic; +using PointOfSale.Models; using ZXing.Net.Maui; +using ZXing.Net.Maui.Controls; +using Microsoft.Maui.ApplicationModel; namespace PointOfSale.Pages.Handheld; @@ -8,45 +13,112 @@ public partial class ScanPage : ContentPage public ScanPage() { InitializeComponent(); - barcodeView.Options = new BarcodeReaderOptions + + + } + + protected override async void OnAppearing() + { + base.OnAppearing(); + + try + { + // Permission check + var status = await Permissions.CheckStatusAsync(); + if (status != PermissionStatus.Granted) + { + status = await Permissions.RequestAsync(); + } + + if (status != PermissionStatus.Granted) + { + await DisplayAlertAsync("Permission required", "Camera permission is required to scan barcodes.", "OK"); + await Shell.Current.GoToAsync(".."); + return; + } + + // Initialize barcode options safely after view is ready + if (barcodeView != null) + { + barcodeView.Options = new BarcodeReaderOptions + { + Formats = BarcodeFormats.All, + AutoRotate = true, + Multiple = true + }; + } + else + { + System.Diagnostics.Debug.WriteLine("barcodeView is null in OnAppearing"); + } + } + catch (Exception ex) { - Formats = BarcodeFormats.All, - AutoRotate = true, - Multiple = true - }; + System.Diagnostics.Debug.WriteLine($"ScanPage OnAppearing error: {ex}"); + } } protected void BarcodesDetected(object sender, BarcodeDetectionEventArgs e) { - foreach (var barcode in e.Results) - Console.WriteLine($"Barcodes: {barcode.Format} -> {barcode.Value}"); - - Dispatcher.DispatchAsync(async () => + try { - var r = e.Results.First(); + foreach (var barcode in e.Results) + Console.WriteLine($"Barcodes: {barcode.Format} -> {barcode.Value}"); + + Dispatcher.DispatchAsync(async () => + { + try + { + var r = e.Results.FirstOrDefault(); + if (r == null) + return; - await CloseModal(r.Value); - }); + await CloseModal(r.Value); + } + catch (Exception ex) + { + System.Diagnostics.Debug.WriteLine($"Dispatcher handler error: {ex}"); + } + }); + } + catch (Exception ex) + { + System.Diagnostics.Debug.WriteLine($"BarcodesDetected exception: {ex}"); + } } private async Task CloseModal(string value) { - var item = new Item - { - Price = 0, - Quantity = 1, - Title = value - }; - var navigationParameter = new Dictionary + try { + var item = new Item + { + Price = 0, + Quantity = 1, + Title = value + }; + var navigationParameter = new Dictionary + { { "Item", item } }; - await Shell.Current.GoToAsync("..", navigationParameter); + await Shell.Current.GoToAsync("..", navigationParameter); + } + catch (Exception ex) + { + System.Diagnostics.Debug.WriteLine($"CloseModal error: {ex}"); + } } async void ImageButton_Clicked(System.Object sender, System.EventArgs e) { - await Shell.Current.GoToAsync(".."); + try + { + await Shell.Current.GoToAsync(".."); + } + catch (Exception ex) + { + System.Diagnostics.Debug.WriteLine($"ImageButton_Clicked error: {ex}"); + } } } diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/HomePage.xaml.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/HomePage.xaml.cs index 96b386e6c..7befa71ac 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/HomePage.xaml.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/HomePage.xaml.cs @@ -49,9 +49,9 @@ public async void NavSubContent(bool show) Grid.SetRowSpan(addForm, 3); // translate off screen right addForm.TranslationX = displayWidth - addForm.X; - _ = addForm.TranslateTo(0, 0, 800, easing: Easing.CubicOut); + _ = addForm.TranslateToAsync(0, 0, 800, easing: Easing.CubicOut); - _ = BlockScreen.FadeTo(0.8, 800, easing: Easing.CubicOut); + _ = BlockScreen.FadeToAsync(0.8, 800, easing: Easing.CubicOut); BlockScreen.InputTransparent = false; } @@ -62,9 +62,9 @@ public async void NavSubContent(bool show) var view = (AddProductView)PageGrid.Children.Where(v => v.GetType() == typeof(AddProductView)).SingleOrDefault(); var x = DeviceDisplay.Current.MainDisplayInfo.Width; - _ = view.TranslateTo(displayWidth - view.X, 0, 800, easing: Easing.CubicIn); + _ = view.TranslateToAsync(displayWidth - view.X, 0, 800, easing: Easing.CubicIn); - _ = BlockScreen.FadeTo(0, 800, easing: Easing.CubicOut); + _ = BlockScreen.FadeToAsync(0, 800, easing: Easing.CubicOut); BlockScreen.InputTransparent = true; await Task.Delay(800); diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsViewModel.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsViewModel.cs index c2f8f53d7..91ff2859a 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsViewModel.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/SettingsViewModel.cs @@ -15,6 +15,6 @@ public SettingsViewModel() [RelayCommand] async Task NotImplemented() { - await App.Current.Windows[0].Page.DisplayAlert("Not Implemented", "Wouldn't it be nice tho?", "Okay"); + await App.Current.Windows[0].Page.DisplayAlertAsync ("Not Implemented", "Wouldn't it be nice tho?", "Okay"); } } diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Views/OrderCartViewModel.cs b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Views/OrderCartViewModel.cs index 6bad1adb8..2b2c3f712 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Views/OrderCartViewModel.cs +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Pages/Views/OrderCartViewModel.cs @@ -41,7 +41,7 @@ private void AddToOrder(Item item) [RelayCommand] async Task PlaceOrder() { - await App.Current.Windows[0].Page.DisplayAlert("Not Implemented", "Wouldn't it be cool tho?", "Okay"); + await App.Current.Windows[0].Page.DisplayAlertAsync ("Not Implemented", "Wouldn't it be cool tho?", "Okay"); if(index < (AppData.Orders.Count - 1)) index++; else diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Platforms/Android/AndroidManifest.xml b/10.0/Apps/PointOfSale/src/PointOfSale/Platforms/Android/AndroidManifest.xml index e66767c72..1eeb65aab 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/Platforms/Android/AndroidManifest.xml +++ b/10.0/Apps/PointOfSale/src/PointOfSale/Platforms/Android/AndroidManifest.xml @@ -1,7 +1,6 @@  - - + @@ -21,4 +20,5 @@ + \ No newline at end of file diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj b/10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj index 46dd504a7..1204e81fb 100644 --- a/10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj +++ b/10.0/Apps/PointOfSale/src/PointOfSale/PointOfSale.csproj @@ -35,7 +35,7 @@ 15.0 15.0 - 21.0 + 23.0 10.0.17763.0 10.0.17763.0 6.5 @@ -68,21 +68,23 @@ - - + + - - + + - + - - - - + + + + - - + + + + diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/beth.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/beth.png index 8e571030b..db75b98bc 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/beth.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/beth.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/budae_jjigae.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/budae_jjigae.png index e385c93c0..cceaf8475 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/budae_jjigae.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/budae_jjigae.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/card.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/card.png index 69cc4c9ea..f65b70b04 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/card.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/card.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/coffee.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/coffee.png index 7413231b9..c47b12004 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/coffee.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/coffee.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/david.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/david.png index e3e8150de..34747ad86 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/david.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/david.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/dotnet_bot.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/dotnet_bot.png index 1709b39ec..74cd8d4bf 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/dotnet_bot.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/dotnet_bot.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_01.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_01.png index 03f874c2f..8fffb65ff 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_01.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_01.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_02.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_02.png index ee21f4e1e..f808aeee7 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_02.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/food_02.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/hunter.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/hunter.png index be7c7093d..1c7790129 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/hunter.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/hunter.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/iced_tea.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/iced_tea.png index 5122cebf2..90b131414 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/iced_tea.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/iced_tea.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/jajangmyeon.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/jajangmyeon.png index 77c1ba98f..0243b532c 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/jajangmyeon.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/jajangmyeon.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/janchi_guksu.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/janchi_guksu.png index 88e32cb32..146fd9b9f 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/janchi_guksu.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/janchi_guksu.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/japchae.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/japchae.png index b9f09dd6b..9baeaef54 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/japchae.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/japchae.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/juice.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/juice.png index f8e1fb2f5..bdc7621a3 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/juice.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/juice.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/maddy.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/maddy.png index 1b6ae6dd3..fb71d7aaa 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/maddy.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/maddy.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/milk.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/milk.png index b2b31613d..da0925183 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/milk.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/milk.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/naengmyeon.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/naengmyeon.png index f0187fafb..d85b59a02 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/naengmyeon.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/naengmyeon.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/noimage.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/noimage.png index ffd2731b6..82b4ae1fa 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/noimage.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/noimage.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/qr_code.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/qr_code.png index cfea5090d..ba93ec9f6 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/qr_code.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/qr_code.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/rachel.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/rachel.png index 715fc0df7..83e4ca392 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/rachel.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/rachel.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soda.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soda.png index 7c3cfb3cf..a86eecf1b 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soda.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soda.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soup.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soup.png index af932dd3b..251d0e88f 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soup.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/soup.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/sweeky.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/sweeky.png index b6d573307..1d6fa537d 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/sweeky.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/sweeky.png differ diff --git a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/tea.png b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/tea.png index ad6c50f8b..c93ac01b8 100644 Binary files a/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/tea.png and b/10.0/Apps/PointOfSale/src/PointOfSale/Resources/Images/tea.png differ diff --git a/10.0/global.json b/10.0/global.json index fc142ff43..e15758c69 100644 --- a/10.0/global.json +++ b/10.0/global.json @@ -1,7 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.7.25380.108", - "rollForward": "latestFeature", - "allowPrerelease": true + "version": "10.0.202", + "rollForward": "latestPatch" } -} \ No newline at end of file +}