Skip to content

Commit

Permalink
Merge pull request #6533 from bitfoundation/develop
Browse files Browse the repository at this point in the history
Version 8.7.1 (#6531)
  • Loading branch information
msynk authored Jan 9, 2024
2 parents d57b94c + 12b72e1 commit 9a95675
Show file tree
Hide file tree
Showing 69 changed files with 148 additions and 131 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/admin-sample.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ jobs:

- name: Install maui
run: cd src && dotnet workload install maui-android

- name: Install Android Dependencies
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"

- name: Generate CSS/JS files
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/bit.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ jobs:
- name: Install wasm and maui
run: cd src && dotnet workload install maui-android wasm-tools wasm-experimental

- name: Install Android Dependencies
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"

- name: Build
run: dotnet build src/Bit-CI.sln -p:WarningLevel=0 -p:RunCodeAnalysis=false

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/bit.full.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
run: |
dotnet workload install maui-tizen maui-android wasm-tools wasm-experimental
dotnet new bit-bp --name TodoBPSqlite --database sqlite --sample todo --pipeline other
dotnet build TodoBPSqlite/src/Client/TodoBPSqlite.Client.Maui/TodoBPSqlite.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"
cd TodoBPSqlite/src/TodoBPSqlite.Server/
dotnet tool restore
dotnet ef migrations add InitialMigration
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/blazorui.demo.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ jobs:

- name: Install maui
run: cd src && dotnet workload install maui-android

- name: Install Android Dependencies
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"

- name: Generate CSS/JS files
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -c Release
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/todo-sample.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ jobs:

- name: Install maui
run: cd src && dotnet workload install maui-android

- name: Install Android Dependencies
run: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"

- name: Generate CSS/JS files
run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks --no-restore
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 bit platform
Copyright (c) 2024 bit platform

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions src/Bit.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Product>bit platform</Product>
<Title>$(MSBuildProjectName)</Title>
<Description>$(MSBuildProjectName)</Description>
<Copyright>Copyright © bit platform 2023</Copyright>
<Copyright>Copyright © bit platform 2024</Copyright>

<!-- Repo -->
<RepositoryUrl>https://github.com/bitfoundation/bitplatform</RepositoryUrl>
Expand All @@ -25,7 +25,7 @@
<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
<PackageIconUrl>https://avatars.githubusercontent.com/u/22663390</PackageIconUrl>

<ReleaseVersion>8.7.0</ReleaseVersion>
<ReleaseVersion>8.7.1</ReleaseVersion>

<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)</PackageVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<Target Name="BeforeBuildTasks" AfterTargets="CoreCompile" Condition="'$(TargetFramework)' == 'net8.0'">
<Exec Condition="!Exists('node_modules/.bin/sass')" Command="npm install [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Condition="!Exists('node_modules/.bin/sass')" Command="npm install [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="node_modules/.bin/sass Styles/bit.blazorui.assets.scss:wwwroot/styles/bit.blazorui.assets.css --style compressed --load-path=. --update" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
</Target>

Expand Down
4 changes: 2 additions & 2 deletions src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
</ItemGroup>

<Target Name="BeforeBuildTasks" AfterTargets="CoreCompile" Condition="'$(TargetFramework)' == 'net8.0'">
<Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="node_modules/.bin/sass Styles/bit.blazorui.extras.scss:wwwroot/styles/bit.blazorui.extras.css --style compressed --load-path=. --update" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/scripts/bit.blazorui.extras.js --minify --outfile=wwwroot/scripts/bit.blazorui.extras.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
</Target>

Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<Target Name="BeforeBuildTasks" AfterTargets="CoreCompile" Condition="'$(TargetFramework)' == 'net8.0'">
<Exec Condition="!Exists('node_modules/.bin/sass')" Command="npm install [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Condition="!Exists('node_modules/.bin/sass')" Command="npm install [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="node_modules/.bin/sass Styles/bit.blazorui.icons.scss:wwwroot/styles/bit.blazorui.icons.css --style compressed --load-path=. --update" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
</Target>

Expand Down
4 changes: 2 additions & 2 deletions src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
</ItemGroup>

<Target Name="BeforeBuildTasks" AfterTargets="CoreCompile" Condition="'$(TargetFramework)' == 'net8.0'">
<Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="node_modules/.bin/sass Styles/bit.blazorui.scss:wwwroot/styles/bit.blazorui.css Styles/Fluent/bit.blazorui.fluent.scss:wwwroot/styles/bit.blazorui.fluent.css Styles/Fluent/bit.blazorui.fluent-dark.scss:wwwroot/styles/bit.blazorui.fluent-dark.css Styles/Fluent/bit.blazorui.fluent-light.scss:wwwroot/styles/bit.blazorui.fluent-light.css --style compressed --load-path=. --update" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/scripts/bit.blazorui.js --minify --outfile=wwwroot/scripts/bit.blazorui.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
</Target>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ private int _endTimeMinuteView
private string _calloutId = string.Empty;
private string? _labelId;
private string? _inputId;
private string? _activeDescendantId;
private ElementReference _startTimeHourInputRef = default!;
private ElementReference _startTimeMinuteInputRef = default!;
private ElementReference _endTimeHourInputRef = default!;
Expand Down Expand Up @@ -561,7 +560,6 @@ protected override void OnInitialized()
_labelId = $"{_dateRangePickerId}-label";
_calloutId = $"{_dateRangePickerId}-callout";
_inputId = $"{_dateRangePickerId}-input";
_activeDescendantId = $"{_dateRangePickerId}-active-descendant";

base.OnInitialized();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.0">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.0">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.0">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.0">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<Content Remove="appsettings.json" />
<EmbeddedResource Include="appsettings.json" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.0">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.0">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down Expand Up @@ -62,9 +62,9 @@
</ItemGroup>

<Target Name="BeforeBuildTasks" AfterTargets="CoreCompile">
<Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="node_modules/.bin/sass .:. Styles/app.scss:wwwroot/styles/app.css --style compressed --load-path=. --update" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/scripts/app.js --minify --outfile=wwwroot/scripts/app.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
</Target>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<a class="social-link youtube-link" target="_blank" href="https://www.youtube.com/channel/UCtk33NQ91f3GOJG0HAdkdog"></a>
<a class="social-link linkedin-link" target="_blank" href="https://www.linkedin.com/company/bitplatformhq"></a>
</div>
<div class="copy-right-txt">Copyright © 2023 bit platform | All Rights Reserved </div>
<div class="copy-right-txt">Copyright © 2024 bit platform | All Rights Reserved </div>
</div>
</section>
</footer>
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.0">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
<PackageReference Include="Bit.SourceGenerators" Version="8.7.0">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.Bswup" Version="8.7.0" />
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.0">
<PackageReference Include="Bit.Bswup" Version="8.7.1" />
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.7.0">
<PackageReference Include="Bit.SourceGenerators" Version="8.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1
// https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup

self.assetsInclude = [];
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Demo/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-bp template v-8.7.0 -->
<!-- Generated by bit-bp template v-8.7.1 -->
<Project>
<PropertyGroup>
<LangVersion>12.0</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1

self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1

self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1

// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1

self.assetsInclude = [];
self.assetsExclude = [
Expand Down
4 changes: 2 additions & 2 deletions src/Bswup/Bit.Bswup/Bit.Bswup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
</ItemGroup>

<Target Name="BeforeBuildTasks" AfterTargets="CoreCompile" Condition="'$(TargetFramework)' == 'net8.0'">
<Exec Condition="!Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" LogStandardErrorAsError="true" />
<Exec Condition="!Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install [email protected] [email protected] --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/bit-bswup.js --minify --outfile=wwwroot/bit-bswup.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/bit-bswup.progress.js --minify --outfile=wwwroot/bit-bswup.progress.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/bit-bswup.sw.js --minify --outfile=wwwroot/bit-bswup.sw.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window['bit-bswup.progress version'] = '8.7.0';
window['bit-bswup.progress version'] = '8.7.1';

; (function () {
(window as any).startBswupProgress = (autoReload: boolean,
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
self['bit-bswup.sw version'] = '8.7.0';
self['bit-bswup.sw version'] = '8.7.1';

interface Window {
clients: any
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window['bit-bswup version'] = '8.7.0';
window['bit-bswup version'] = '8.7.1';

declare const Blazor: any;

Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/FullDemo/Client/wwwroot/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1

// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.7.0
// bit version: 8.7.1

self.assetsInclude = [];
self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
Expand Down
Loading

0 comments on commit 9a95675

Please sign in to comment.