Merge branch 'dev'

GeorgDangl · Aug 25, 2021 · 9ac8c56 · 9ac8c56
2 parents 6f2bb0c + 5dc9662
commit 9ac8c56
Show file tree

Hide file tree

Showing 26 changed files with 26,912 additions and 11,289 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to **LightQuery** are documented here.
 
+## v2.1.0:
+- The Angular client was updated to Angular v12
+
 ## v2.0.0
 - Added a compilation target for `net5.0` and added tests for `net5.0`
 - Dropped support for `netcoreapp3.0` and changed target to `netcoreapp3.1`

diff --git a/build.ps1 b/build.ps1
@@ -56,9 +56,9 @@ else {
     # Install by channel or version
     $DotNetDirectory = "$TempDirectory\dotnet-win"
     if (!(Test-Path variable:DotNetVersion)) {
-        ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
+        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
     } else {
-        ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
+        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
     }
     $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
 }

diff --git a/build/.build.csproj b/build/.build.csproj
@@ -12,15 +12,15 @@
   <ItemGroup>
     <PackageDownload Include="GitVersion.Tool" Version="[5.6.7]" />
     <PackageReference Include="Dangl.Nuke.CoberturaConverter" Version="2.0.0" />
-    <PackageReference Include="Nuke.Common" Version="5.1.1" />
+    <PackageReference Include="Nuke.Common" Version="5.3.0" />
     <PackageReference Include="Nuke.WebDocu" Version="3.0.1" />
     <PackageReference Include="Nuke.GitHub" Version="2.0.0" />
-    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2021.1.2">
+    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2021.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ReportGenerator" Version="4.8.8" />
-    <PackageReference Include="docfx.console" Version="2.57.2">
+    <PackageReference Include="ReportGenerator" Version="4.8.12" />
+    <PackageReference Include="docfx.console" Version="2.58.2">
       <ExcludeAssets>build</ExcludeAssets>
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/LightQuery.NSwag/LightQuery.NSwag.csproj b/src/LightQuery.NSwag/LightQuery.NSwag.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NSwag.AspNetCore" Version="13.11.1" />
+    <PackageReference Include="NSwag.AspNetCore" Version="13.13.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj b/src/LightQuery.Swashbuckle/LightQuery.Swashbuckle.csproj
@@ -21,7 +21,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/ng-lightquery/angular.json b/src/ng-lightquery/angular.json
@@ -10,7 +10,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/ng-lightquery/tsconfig.lib.json",
             "project": "projects/ng-lightquery/ng-package.json"