Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update js to use dynamic cssClass instead of initial static disabled state #943 #944

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Don't know what Blazor is? Read [here](https://github.com/aspnet/Blazor)

Complete all Blazor dependencies.

- .NET Core 3.1
- Visual Studio 2019 with the ASP.NET and web development workload selected.
- .NET 6.0
- Visual Studio 2022 with the ASP.NET and web development workload selected.
- Requires access to internet for CSS download

## Installation
Expand Down Expand Up @@ -143,7 +143,10 @@ functionality in Demo for the component you are editing. Not only will this allo



#### MatBlazor 2.9.0 (develop)
#### MatBlazor 2.10.0
- Supports .NET 6.0

#### MatBlazor 2.9.0
- Supports net5.0;netstandard2.1
- PR: MatTreeView - new component #788 (Thanks to adameste)
- PR: Fix MatAutocompleteList re-render list on items update #857 (Thanks to Ogglas)
Expand Down Expand Up @@ -663,4 +666,4 @@ This project is licensed under the terms of the [MIT license](LICENSE).
- [Blazor](https://blazor.net)
- [MDC Web](https://material.io/components/)
- [flatpickr.js](https://flatpickr.js.org/)
- [toast](https://github.com/sotsera/sotsera.blazor.toaster)
- [toast](https://github.com/sotsera/sotsera.blazor.toaster)
25 changes: 25 additions & 0 deletions src/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/.idea
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
10 changes: 5 additions & 5 deletions src/MatBlazor.Demo.ClientApp/MatBlazor.Demo.ClientApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<PropertyGroup>
<LangVersion>9</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<TargetFramework>net5.0</TargetFramework>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.14" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web.Extensions" Version="5.0.0-preview9.20513.1" />
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
22 changes: 22 additions & 0 deletions src/MatBlazor.Demo.ServerApp/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["MatBlazor.Demo.ServerApp/MatBlazor.Demo.ServerApp.csproj", "MatBlazor.Demo.ServerApp/"]
COPY ["MatBlazor.Demo/MatBlazor.Demo.csproj", "MatBlazor.Demo/"]
COPY ["MatBlazor/MatBlazor.csproj", "MatBlazor/"]
RUN dotnet restore "MatBlazor.Demo.ServerApp/MatBlazor.Demo.ServerApp.csproj"
COPY . .
WORKDIR "/src/MatBlazor.Demo.ServerApp"
RUN dotnet build "MatBlazor.Demo.ServerApp.csproj" -c Release -o /app/build

FROM build AS publish
RUN dotnet publish "MatBlazor.Demo.ServerApp.csproj" -c Release -o /app/publish

FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "MatBlazor.Demo.ServerApp.dll"]
6 changes: 5 additions & 1 deletion src/MatBlazor.Demo.ServerApp/MatBlazor.Demo.ServerApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
<PropertyGroup>
<LangVersion>9</LangVersion>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Shared\**" />
<Compile Remove="wwwroot\**" />
<Content Remove="Shared\**" />
<Content Remove="wwwroot\**" />
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
<EmbeddedResource Remove="Shared\**" />
<EmbeddedResource Remove="wwwroot\**" />
<None Remove="Shared\**" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5001;http://localhost:5000"
"applicationUrl": "https://localhost:5002;http://localhost:5001"
}
}
}
13 changes: 4 additions & 9 deletions src/MatBlazor.Demo/MatBlazor.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,14 @@
<LangVersion>9</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>



<ItemGroup Condition="$(TargetFramework) == 'netstandard2.1'">
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net5.0'">
<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.14" />
</ItemGroup>


Expand Down
6 changes: 5 additions & 1 deletion src/MatBlazor.Demo/Shared/News.razor
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
<li><code>MatTreeView</code> - complete new component</li>
<li><code>MatAutocomplete</code> - new implementation of component</li>
</ul>
<h4 class="mat-h4">MatBlazor 2.9.0 (develop)</h4>
<h4 class="mat-h4">MatBlazor 2.10.0</h4>
<ul>
<li>Supports .NET 6.0</li>
</ul>
<h4 class="mat-h4">MatBlazor 2.9.0</h4>
<ul>
<li>Supports net5.0;netstandard2.1</li>
<li>PR: MatTreeView - new component #788 (Thanks to adameste)</li>
Expand Down
2 changes: 1 addition & 1 deletion src/MatBlazor.DevUtils/MatBlazor.DevUtils.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<StartupObject>MatBlazor.DevUtils.Program</StartupObject>
</PropertyGroup>
Expand Down
16 changes: 6 additions & 10 deletions src/MatBlazor/MatBlazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
<Authors>Vladimir Samoilenko</Authors>
<PackageIconUrl>https://raw.githubusercontent.com/SamProf/MatBlazor/master/content/icon.ico</PackageIconUrl>
<Company>SamProf</Company>
<VersionPrefix>2.9.0</VersionPrefix>
<VersionPrefix>2.10.0</VersionPrefix>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
<Version>2.10.0</Version>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -34,14 +35,9 @@
</ItemGroup>


<ItemGroup Condition="$(TargetFramework) == 'netstandard2.1'">
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net5.0'">
<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.14" />
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion src/MatBlazor/wwwroot/dist/matBlazor.js

Large diffs are not rendered by default.