Skip to content

Commit

Permalink
feat: update to bit 8.7.6 #47 (#48)
Browse files Browse the repository at this point in the history
  • Loading branch information
ysmoradi authored Feb 23, 2024
1 parent 228f098 commit a7b3311
Show file tree
Hide file tree
Showing 21 changed files with 163 additions and 71 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -33,4 +33,4 @@
"remoteEnv": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.101",
"rollForward": "disable"
"version": "8.0.201",
"rollForward": "disable"
}
}
14 changes: 7 additions & 7 deletions src/Bit.TemplatePlayground.Iac/AppStack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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})"
}
]
}
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Pulumi.AzureNative" Version="2.27.0" />
<PackageReference Include="Pulumi.AzureNative" Version="2.29.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "8.0.1",
"version": "8.0.2",
"commands": [
"dotnet-ef"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.5">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.5">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand All @@ -23,32 +23,32 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.5.0" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.6.0" />
<PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="8.0.0" />
<PackageReference Include="Riok.Mapperly" Version="3.3.0" />
<PackageReference Include="Riok.Mapperly" Version="3.4.0" />

<Using Include="Microsoft.EntityFrameworkCore.Migrations" />
<Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
Expand Down Expand Up @@ -88,7 +88,7 @@
<PropertyGroup>
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
<EnableSdkContainerDebugging>True</EnableSdkContainerDebugging>
<UserSecretsId>65C62680-719C-4F56-9BF7-88F34AF733EF</UserSecretsId>
<UserSecretsId>44373297-7155-4EFA-9BEB-BB3FA5F85FE9</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.5">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.5">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.1" />
<PackageReference Include="Riok.Mapperly" Version="3.3.0" PrivateAssets="all" ExcludeAssets="runtime">
<PackageReference Include="System.Text.Json" Version="8.0.2" />
<PackageReference Include="Riok.Mapperly" Version="3.4.0" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
18 changes: 18 additions & 0 deletions src/Bit.TemplatePlayground.Shared/Resources/AppStrings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -564,4 +564,10 @@
<data name="ProductsCount" xml:space="preserve">
<value>Les produits comptent</value>
</data>
<data name="NewVersionIsAvailable" xml:space="preserve">
<value>Une nouvelle version est disponible</value>
</data>
<data name="UpdateToNewVersion" xml:space="preserve">
<value>Souhaitez-vous mettre à jour vers la nouvelle version?</value>
</data>
</root>
6 changes: 6 additions & 0 deletions src/Bit.TemplatePlayground.Shared/Resources/AppStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,12 @@ Please confirm your email by clicking on the link.</value>
</data>
<data name="Update" xml:space="preserve">
<value>Update</value>
</data>
<data name="NewVersionIsAvailable" xml:space="preserve">
<value>New version is available</value>
</data>
<data name="UpdateToNewVersion" xml:space="preserve">
<value>Would you like to update to the new version?</value>
</data>
<data name="ProductsCount" xml:space="preserve">
<value>Products count</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
<Content Remove="appsettings*.json" />
<EmbeddedResource Include="appsettings*.json" />

<PackageReference Include="Bit.Butil" Version="8.7.5" />
<PackageReference Include="Bit.BlazorUI" Version="8.7.5" />
<PackageReference Include="Bit.BlazorUI.Icons" Version="8.7.5" />
<PackageReference Include="Bit.BlazorUI.Assets" Version="8.7.5" />
<PackageReference Include="Bit.BlazorUI.Extras" Version="8.7.5" />
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.5">
<PackageReference Include="Bit.Butil" Version="8.7.6" />
<PackageReference Include="Bit.BlazorUI" Version="8.7.6" />
<PackageReference Include="Bit.BlazorUI.Icons" Version="8.7.6" />
<PackageReference Include="Bit.BlazorUI.Assets" Version="8.7.6" />
<PackageReference Include="Bit.BlazorUI.Extras" Version="8.7.6" />
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.5">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />

<Using Include="System.Net.Http.Json" />
<Using Include="System.Collections.Concurrent" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<ApplicationTitle>Bit.TemplatePlayground</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.bitplatform.BP.Template</ApplicationId>
<ApplicationIdGuid>44861962-8347-470D-AC06-050D17A7F686</ApplicationIdGuid>
<ApplicationId>com.companyname.bit.templateplayground</ApplicationId>
<ApplicationIdGuid>AC77D3A3-5437-4DF7-8F4A-1FF3C5F089D3</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
Expand Down Expand Up @@ -82,11 +82,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.5">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.5">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -98,10 +98,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.6" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.6" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.7" />
<PackageReference Include="Oscore.Maui.AppStoreInfo" Version="1.0.4" />
<PackageReference Include="Plugin.StoreReview" Version="6.0.0" />
</ItemGroup>

<!-- Build Properties must be defined within these property groups to ensure successful publishing
Expand All @@ -115,4 +117,7 @@
<UseHardenedRuntime>true</UseHardenedRuntime>
</PropertyGroup>

<Target Name="BeforeBuildTasks" BeforeTargets="BeforeBuild">
<Error Text="Enable long paths in Windows. https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=powershell#enable-long-paths-in-windows-10-version-1607-and-later" Condition=" $([MSBuild]::IsOSPlatform('windows')) AND $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem', 'LongPathsEnabled', null, RegistryView.Registry64)) != '1' " />
</Target>
</Project>
Loading

0 comments on commit a7b3311

Please sign in to comment.