Merge pull request #67 from EdCharbeneau/issue-62

EdCharbeneau · Nov 10, 2021 · 6f64d06 · 6f64d06
2 parents ba79388 + 73ae267
commit 6f64d06
Show file tree

Hide file tree

Showing 56 changed files with 20,808 additions and 130 deletions.
diff --git a/BlazorSize.ExampleNet5/App.razor → BlazorSize.ExampleNet6/App.razor b/BlazorSize.ExampleNet5/App.razor → BlazorSize.ExampleNet6/App.razor
diff --git a/...ExampleNet5/BlazorSize.ExampleNet5.csproj → ...ExampleNet6/BlazorSize.ExampleNet6.csproj b/...ExampleNet5/BlazorSize.ExampleNet5.csproj → ...ExampleNet6/BlazorSize.ExampleNet6.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...xampleNet5/Data/WeatherForecastService.cs → ...xampleNet6/Data/WeatherForecastService.cs b/...xampleNet5/Data/WeatherForecastService.cs → ...xampleNet6/Data/WeatherForecastService.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using TestComponents;
 
-namespace BlazorSize.ExampleNet5.Data
+namespace BlazorSize.ExampleNet6.Data
 {
     public class WeatherForecastService : IWeatherForecastService
     {

diff --git a/BlazorSize.ExampleNet5/Program.cs → BlazorSize.ExampleNet6/Program.cs b/BlazorSize.ExampleNet5/Program.cs → BlazorSize.ExampleNet6/Program.cs
@@ -1,5 +1,5 @@
 using BlazorPro.BlazorSize;
-using BlazorSize.ExampleNet5.Data;
+using BlazorSize.ExampleNet6.Data;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,7 +11,7 @@
 using System.Threading.Tasks;
 using TestComponents;
 
-namespace BlazorSize.ExampleNet5
+namespace BlazorSize.ExampleNet6
 {
     public class Program
     {

diff --git a/...xampleNet5/Properties/launchSettings.json → ...xampleNet6/Properties/launchSettings.json b/...xampleNet5/Properties/launchSettings.json → ...xampleNet6/Properties/launchSettings.json
diff --git a/...rSize.ExampleNet5/Shared/MainLayout.razor → ...rSize.ExampleNet6/Shared/MainLayout.razor b/...rSize.ExampleNet5/Shared/MainLayout.razor → ...rSize.ExampleNet6/Shared/MainLayout.razor
diff --git a/...e.ExampleNet5/Shared/MainLayout.razor.css → ...e.ExampleNet6/Shared/MainLayout.razor.css b/...e.ExampleNet5/Shared/MainLayout.razor.css → ...e.ExampleNet6/Shared/MainLayout.razor.css
diff --git a/BlazorSize.ExampleNet5/Shared/NavMenu.razor → BlazorSize.ExampleNet6/Shared/NavMenu.razor b/BlazorSize.ExampleNet5/Shared/NavMenu.razor → BlazorSize.ExampleNet6/Shared/NavMenu.razor
@@ -1,5 +1,5 @@
 <div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="">BlazorSize.ExampleNet5</a>
+    <a class="navbar-brand" href="">BlazorSize.ExampleNet6</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>

diff --git a/...Size.ExampleNet5/Shared/NavMenu.razor.css → ...Size.ExampleNet6/Shared/NavMenu.razor.css b/...Size.ExampleNet5/Shared/NavMenu.razor.css → ...Size.ExampleNet6/Shared/NavMenu.razor.css
diff --git a/...ampleNet5/Shared/ScreenSizeReporter.razor → ...ampleNet6/Shared/ScreenSizeReporter.razor b/...ampleNet5/Shared/ScreenSizeReporter.razor → ...ampleNet6/Shared/ScreenSizeReporter.razor
diff --git a/...ize.ExampleNet5/Shared/SurveyPrompt.razor → ...ize.ExampleNet6/Shared/SurveyPrompt.razor b/...ize.ExampleNet5/Shared/SurveyPrompt.razor → ...ize.ExampleNet6/Shared/SurveyPrompt.razor
diff --git a/BlazorSize.ExampleNet5/_Imports.razor → BlazorSize.ExampleNet6/_Imports.razor b/BlazorSize.ExampleNet5/_Imports.razor → BlazorSize.ExampleNet6/_Imports.razor
@@ -6,8 +6,8 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
-@using BlazorSize.ExampleNet5
-@using BlazorSize.ExampleNet5.Shared
+@using BlazorSize.ExampleNet6
+@using BlazorSize.ExampleNet6.Shared
+@using BlazorSize.ExampleNet6.Data
 @using BlazorPro.BlazorSize
-@using BlazorSize.ExampleNet5.Data
 @using TestComponents
diff --git a/BlazorSize.ExampleNet5/wwwroot/css/app.css → BlazorSize.ExampleNet6/wwwroot/css/app.css b/BlazorSize.ExampleNet5/wwwroot/css/app.css → BlazorSize.ExampleNet6/wwwroot/css/app.css
diff --git a/...5/wwwroot/css/bootstrap/bootstrap.min.css → ...6/wwwroot/css/bootstrap/bootstrap.min.css b/...5/wwwroot/css/bootstrap/bootstrap.min.css → ...6/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/...wroot/css/bootstrap/bootstrap.min.css.map → ...wroot/css/bootstrap/bootstrap.min.css.map b/...wroot/css/bootstrap/bootstrap.min.css.map → ...wroot/css/bootstrap/bootstrap.min.css.map
diff --git a/...Net5/wwwroot/css/open-iconic/FONT-LICENSE → ...Net6/wwwroot/css/open-iconic/FONT-LICENSE b/...Net5/wwwroot/css/open-iconic/FONT-LICENSE → ...Net6/wwwroot/css/open-iconic/FONT-LICENSE
diff --git a/...Net5/wwwroot/css/open-iconic/ICON-LICENSE → ...Net6/wwwroot/css/open-iconic/ICON-LICENSE b/...Net5/wwwroot/css/open-iconic/ICON-LICENSE → ...Net6/wwwroot/css/open-iconic/ICON-LICENSE
diff --git a/...pleNet5/wwwroot/css/open-iconic/README.md → ...pleNet6/wwwroot/css/open-iconic/README.md b/...pleNet5/wwwroot/css/open-iconic/README.md → ...pleNet6/wwwroot/css/open-iconic/README.md
diff --git a/...ic/font/css/open-iconic-bootstrap.min.css → ...ic/font/css/open-iconic-bootstrap.min.css b/...ic/font/css/open-iconic-bootstrap.min.css → ...ic/font/css/open-iconic-bootstrap.min.css
diff --git a/...ss/open-iconic/font/fonts/open-iconic.eot → ...ss/open-iconic/font/fonts/open-iconic.eot b/...ss/open-iconic/font/fonts/open-iconic.eot → ...ss/open-iconic/font/fonts/open-iconic.eot
diff --git a/...ss/open-iconic/font/fonts/open-iconic.otf → ...ss/open-iconic/font/fonts/open-iconic.otf b/...ss/open-iconic/font/fonts/open-iconic.otf → ...ss/open-iconic/font/fonts/open-iconic.otf
diff --git a/...ss/open-iconic/font/fonts/open-iconic.svg → ...ss/open-iconic/font/fonts/open-iconic.svg b/...ss/open-iconic/font/fonts/open-iconic.svg → ...ss/open-iconic/font/fonts/open-iconic.svg
diff --git a/...ss/open-iconic/font/fonts/open-iconic.ttf → ...ss/open-iconic/font/fonts/open-iconic.ttf b/...ss/open-iconic/font/fonts/open-iconic.ttf → ...ss/open-iconic/font/fonts/open-iconic.ttf
diff --git a/...s/open-iconic/font/fonts/open-iconic.woff → ...s/open-iconic/font/fonts/open-iconic.woff b/...s/open-iconic/font/fonts/open-iconic.woff → ...s/open-iconic/font/fonts/open-iconic.woff
diff --git a/BlazorSize.ExampleNet5/wwwroot/favicon.ico → BlazorSize.ExampleNet6/wwwroot/favicon.ico b/BlazorSize.ExampleNet5/wwwroot/favicon.ico → BlazorSize.ExampleNet6/wwwroot/favicon.ico
diff --git a/BlazorSize.ExampleNet5/wwwroot/index.html → BlazorSize.ExampleNet6/wwwroot/index.html b/BlazorSize.ExampleNet5/wwwroot/index.html → BlazorSize.ExampleNet6/wwwroot/index.html
@@ -4,11 +4,11 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>BlazorSize.ExampleNet5</title>
+    <title>BlazorSize.ExampleNet6</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/app.css" rel="stylesheet" />
-    <link href="BlazorSize.ExampleNet5.styles.css" rel="stylesheet" />
+    <link href="BlazorSize.ExampleNet6.styles.css" rel="stylesheet" />
     <!-- The following JavaScript can be removed thru JS Isolation -->
 </head>
 

diff --git a/...mpleNet5/wwwroot/sample-data/weather.json → ...mpleNet6/wwwroot/sample-data/weather.json b/...mpleNet5/wwwroot/sample-data/weather.json → ...mpleNet6/wwwroot/sample-data/weather.json
diff --git a/BlazorSize.UnitTesting/BlazorPro.BlazorSize.UnitTesting.csproj b/BlazorSize.UnitTesting/BlazorPro.BlazorSize.UnitTesting.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <LangVersion>latest</LangVersion>
+    <Version>6.0.0</Version>
+    <Authors>Ed Charbeneau</Authors>
+    <Company>EdCharbeneau.com</Company>
+    <Description>A testing library to provide helper extensions for BlazorSize.</Description>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/EdCharbeneau/BlazorSize</PackageProjectUrl>
+    <PackageIcon>blazor-glove-128.jpg</PackageIcon>
+    <PackageIconUrl />
+    <RepositoryUrl>https://github.com/EdCharbeneau/BlazorSize</RepositoryUrl>
+    <PackageTags>Blazor, JavaScript Interop</PackageTags>
+    <PackageReleaseNotes>
+      6.0.0 Added support for bUnit.
+    </PackageReleaseNotes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Package Logo -->
+    <None Include="..\_resources\blazor-glove-128.jpg">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <!-- Package license file -->
+    <None Include="LICENSE.txt">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="bunit.core" Version="1.3.42" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BlazorSize\BlazorPro.BlazorSize.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/BlazorSize/Bunit/BunitExtensions.cs → ...Size.UnitTesting/Bunit/BunitExtensions.cs b/BlazorSize/Bunit/BunitExtensions.cs → ...Size.UnitTesting/Bunit/BunitExtensions.cs
diff --git a/BlazorSize/Bunit/FakeMediaQueryService.cs → ...nitTesting/Bunit/FakeMediaQueryService.cs b/BlazorSize/Bunit/FakeMediaQueryService.cs → ...nitTesting/Bunit/FakeMediaQueryService.cs
@@ -1,15 +1,12 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using BlazorPro.BlazorSize;
-using Bunit;
+using BlazorPro.BlazorSize;
 using Microsoft.JSInterop;
 
 namespace Bunit
 {
     public class FakeMediaQueryService : IMediaQueryService
     {
         private readonly TestContextBase contextBase;
-        private MediaQueryArgs? activeMediaQuery = null;
+        private MediaQueryArgs activeMediaQuery = null!;
 
         public List<MediaQueryCache> MediaQueries { get; } = new();
 
@@ -65,8 +62,7 @@ public void SetActiveBreakPoint(string breakpoint)
 
         public void SetActiveMediaQuery(MediaQueryArgs args)
         {
-            if (args is null)
-                return;
+            if (args.Media == null) return;
 
             activeMediaQuery = args;
 
@@ -86,7 +82,7 @@ public void SetActiveMediaQuery(MediaQueryArgs args)
             });
         }
 
-        private MediaQueryCache GetMediaQueryFromCache(string byMedia)
+        private MediaQueryCache? GetMediaQueryFromCache(string byMedia)
             => MediaQueries?.Find(q => q.MediaRequested == byMedia);
     }
 }
diff --git a/BlazorSize.UnitTesting/LICENSE.txt b/BlazorSize.UnitTesting/LICENSE.txt
@@ -0,0 +1,6 @@
+Copyright 2019 Ed Charbeneau
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/BlazorSize.e2eTests/BlazorSize Size Reverse.imgstore b/BlazorSize.e2eTests/BlazorSize Size Reverse.imgstore