From a7b33110151ff460b0b7a16e45e812a86efa67c6 Mon Sep 17 00:00:00 2001 From: Yaser Moradi Date: Fri, 23 Feb 2024 16:39:26 +0100 Subject: [PATCH] feat: update to bit 8.7.6 #47 (#48) --- .devcontainer/devcontainer.json | 4 +- .github/workflows/cd.yml | 4 +- global.json | 4 +- src/Bit.TemplatePlayground.Iac/AppStack.cs | 14 ++--- .../Bit.TemplatePlayground.Iac.csproj | 2 +- .../.config/dotnet-tools.json | 2 +- .../Bit.TemplatePlayground.Server.csproj | 30 +++++----- .../Bit.TemplatePlayground.Shared.csproj | 12 ++-- .../Resources/AppStrings.Designer.cs | 18 ++++++ .../Resources/AppStrings.fr.resx | 6 ++ .../Resources/AppStrings.resx | 6 ++ .../Bit.TemplatePlayground.Client.Core.csproj | 20 +++---- .../Bit.TemplatePlayground.Client.Maui.csproj | 21 ++++--- .../MainPage.xaml.cs | 59 ++++++++++++++++++- .../MauiProgram.cs | 2 + .../Platforms/Tizen/tizen-manifest.xml | 4 +- .../Bit.TemplatePlayground.Client.Web.csproj | 10 ++-- .../wwwroot/service-worker.js | 2 +- .../.config/dotnet-tools.json | 2 +- ...t.TemplatePlayground.Client.Windows.csproj | 10 ++-- src/Directory.Build.props | 2 +- 21 files changed, 163 insertions(+), 71 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d158a50..0d4ca99 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "hostRequirements": { "cpus": 4 }, - "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/9454f7dc-b98e-4a64-a96d-4eb08c7b6e66/da76f9c6bc4276332b587b771243ae34/dotnet-sdk-8.0.101-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && dotnet dev-certs https --trust && sudo dotnet workload install wasm-tools wasm-experimental && dotnet tool install --global dotnet-ef --version 8.0.1 && dotnet ef database update --project src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj && dotnet build src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore", + "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/85bcc525-4e9c-471e-9c1d-96259aa1a315/930833ef34f66fe9ee2643b0ba21621a/dotnet-sdk-8.0.201-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && dotnet dev-certs https --trust && sudo dotnet workload install wasm-tools wasm-experimental && dotnet tool install --global dotnet-ef --version 8.0.1 && dotnet ef database update --project src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj && dotnet build src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore", "waitFor": "onCreateCommand", "customizations": { "codespaces": { @@ -33,4 +33,4 @@ "remoteEnv": { "ASPNETCORE_ENVIRONMENT": "Development" } -} \ No newline at end of file +} diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 5126b6a..d2846ea 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -169,7 +169,7 @@ jobs: echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h echo A | xcopy .\bin\publish .\publish-result /s /e /h dotnet tool restore - dotnet vpk pack -u Bit.TemplatePlayground.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Bit.TemplatePlayground.Client.Windows-x86.exe -r win-x86 --framework net8.0.1-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Bit.TemplatePlayground' + dotnet vpk pack -u Bit.TemplatePlayground.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Bit.TemplatePlayground.Client.Windows-x86.exe -r win-x86 --framework net8.0.2-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Bit.TemplatePlayground' - name: Upload artifact uses: actions/upload-artifact@v2 @@ -278,7 +278,7 @@ jobs: - name: Download Apple Provisioning Profiles uses: Apple-Actions/download-provisioning-profiles@v1 with: - bundle-id: 'com.bitplatform.BP.Template' + bundle-id: 'com.companyname.bit.templateplayground' issuer-id: ${{ secrets.APPSTORE_API_KEY_ISSUER_ID }} api-key-id: ${{ secrets.APPSTORE_API_KEY_ID }} api-private-key: ${{ secrets.APPSTORE_API_KEY_PRIVATE_KEY }} diff --git a/global.json b/global.json index 76a1fd4..a5f5e20 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.101", - "rollForward": "disable" + "version": "8.0.201", + "rollForward": "disable" } } \ No newline at end of file diff --git a/src/Bit.TemplatePlayground.Iac/AppStack.cs b/src/Bit.TemplatePlayground.Iac/AppStack.cs index 33c32d1..9c21d9c 100644 --- a/src/Bit.TemplatePlayground.Iac/AppStack.cs +++ b/src/Bit.TemplatePlayground.Iac/AppStack.cs @@ -132,8 +132,8 @@ public AppStack() FtpsState = FtpsState.Disabled, LinuxFxVersion = "DOTNETCORE|8.0", AppCommandLine = "dotnet Bit.TemplatePlayground.Server.dll", - AppSettings = - [ + AppSettings = new() + { new NameValuePairArgs { Name = "ApplicationInsights__InstrumentationKey", Value = appInsights.InstrumentationKey }, new NameValuePairArgs { Name = "APPINSIGHTS_INSTRUMENTATIONKEY", Value = appInsights.InstrumentationKey }, new NameValuePairArgs { Name = "ASPNETCORE_ENVIRONMENT", Value = stackName == "test" ? "Test" : "Production" }, @@ -159,17 +159,17 @@ public AppStack() { Name = "AppSettings__IdentitySettings__IdentityCertificatePassword", Value = $"@Microsoft.KeyVault(VaultName={vaultName};SecretName={identityCertificatePasswordSecretName})" - }, - ], - ConnectionStrings = - [ + } + }, + ConnectionStrings = new() + { new ConnStringInfoArgs { Name = "SqlServerConnectionString", Type = ConnectionStringType.SQLAzure, ConnectionString = $"@Microsoft.KeyVault(VaultName={vaultName};SecretName={sqlDatabaseConnectionStringSecretName})" } - ] + } } }); diff --git a/src/Bit.TemplatePlayground.Iac/Bit.TemplatePlayground.Iac.csproj b/src/Bit.TemplatePlayground.Iac/Bit.TemplatePlayground.Iac.csproj index ea5e208..4dc3a46 100644 --- a/src/Bit.TemplatePlayground.Iac/Bit.TemplatePlayground.Iac.csproj +++ b/src/Bit.TemplatePlayground.Iac/Bit.TemplatePlayground.Iac.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Bit.TemplatePlayground.Server/.config/dotnet-tools.json b/src/Bit.TemplatePlayground.Server/.config/dotnet-tools.json index fd9a39d..9d58272 100644 --- a/src/Bit.TemplatePlayground.Server/.config/dotnet-tools.json +++ b/src/Bit.TemplatePlayground.Server/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "8.0.1", + "version": "8.0.2", "commands": [ "dotnet-ef" ] diff --git a/src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj b/src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj index 2455a7e..371be25 100644 --- a/src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj +++ b/src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj @@ -5,15 +5,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -23,24 +23,24 @@ - + - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -48,7 +48,7 @@ - + @@ -88,7 +88,7 @@ linux-x64 True - 65C62680-719C-4F56-9BF7-88F34AF733EF + 44373297-7155-4EFA-9BEB-BB3FA5F85FE9 Linux ..\.. diff --git a/src/Bit.TemplatePlayground.Shared/Bit.TemplatePlayground.Shared.csproj b/src/Bit.TemplatePlayground.Shared/Bit.TemplatePlayground.Shared.csproj index d0975a6..b22afbf 100644 --- a/src/Bit.TemplatePlayground.Shared/Bit.TemplatePlayground.Shared.csproj +++ b/src/Bit.TemplatePlayground.Shared/Bit.TemplatePlayground.Shared.csproj @@ -5,21 +5,21 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - - + + compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.Designer.cs b/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.Designer.cs index e9f146d..f65dd75 100644 --- a/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.Designer.cs +++ b/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.Designer.cs @@ -763,6 +763,15 @@ public static string NewPassword { } } + /// + /// Looks up a localized string similar to New version is available. + /// + public static string NewVersionIsAvailable { + get { + return ResourceManager.GetString("NewVersionIsAvailable", resourceCulture); + } + } + /// /// Looks up a localized string similar to No. /// @@ -1312,6 +1321,15 @@ public static string UpdateConcurrencyException { } } + /// + /// Looks up a localized string similar to Would you like to update to the new version?. + /// + public static string UpdateToNewVersion { + get { + return ResourceManager.GetString("UpdateToNewVersion", resourceCulture); + } + } + /// /// Looks up a localized string similar to Upload a new profile image. /// diff --git a/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.fr.resx b/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.fr.resx index d9eea8e..618a1a6 100644 --- a/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.fr.resx +++ b/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.fr.resx @@ -564,4 +564,10 @@ Les produits comptent + + Une nouvelle version est disponible + + + Souhaitez-vous mettre à jour vers la nouvelle version? + \ No newline at end of file diff --git a/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.resx b/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.resx index a2f9a28..b442cc0 100644 --- a/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.resx +++ b/src/Bit.TemplatePlayground.Shared/Resources/AppStrings.resx @@ -445,6 +445,12 @@ Please confirm your email by clicking on the link. Update + + + New version is available + + + Would you like to update to the new version? Products count diff --git a/src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj b/src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj index 2ffd4ff..d058c91 100644 --- a/src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj +++ b/src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj @@ -16,22 +16,22 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj b/src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj index edd9f7d..08edafb 100644 --- a/src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj +++ b/src/Client/Bit.TemplatePlayground.Client.Maui/Bit.TemplatePlayground.Client.Maui.csproj @@ -15,8 +15,8 @@ Bit.TemplatePlayground - com.bitplatform.BP.Template - 44861962-8347-470D-AC06-050D17A7F686 + com.companyname.bit.templateplayground + AC77D3A3-5437-4DF7-8F4A-1FF3C5F089D3 1.0 @@ -82,11 +82,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -98,10 +98,12 @@ - - - - + + + + + + + 12.0